[Lunar-commits] r21367 - moonbase/trunk/gnome-desktop/control-center2

[Terry Chan]

Author: tchan
Date: 2006-09-09 02:16:42 +0000 (Sat, 09 Sep 2006)
New Revision: 21367

Modified:
   moonbase/trunk/gnome-desktop/control-center2/BUILD
   moonbase/trunk/gnome-desktop/control-center2/DEPENDS
Log:
Cleaned up the DEPENDS file for the implied depends. Made hal an
optional_depends, as control-center2 will compile/install with --disable-hal.
Added a temporary hack as specified by the dbus/README file about defining
DBUS_API_SUBJECT_TO_CHANGE, otherwise control-center2 fails to compile with
a stupid low level dbus compiler error message since it includes dbus.h
somewhere along the way.


Modified: moonbase/trunk/gnome-desktop/control-center2/BUILD
===================================================================
--- moonbase/trunk/gnome-desktop/control-center2/BUILD	2006-09-09 01:24:27 UTC (rev 21366)
+++ moonbase/trunk/gnome-desktop/control-center2/BUILD	2006-09-09 02:16:42 UTC (rev 21367)
@@ -1,12 +1,13 @@
 (
 
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+# temporary hack here to acknowlege that dbus api is not yet to 1.0, remove this later
+   export CPPFLAGS=$CPPFLAGS" -DDBUS_API_SUBJECT_TO_CHANGE=1"
+   ./configure  --prefix=${GNOME210_PREFIX:-/usr} \
                 --build=$BUILD                    \
                 --sysconfdir=/etc                 \
                 --localstatedir=/var              \
                 --infodir=${GNOME210_PREFIX:-/usr}/share/info \
                 --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-								--enable-gstreamer=0.10                   \
                 $OPTS                             &&
     default_make                   
 

Modified: moonbase/trunk/gnome-desktop/control-center2/DEPENDS
===================================================================
--- moonbase/trunk/gnome-desktop/control-center2/DEPENDS	2006-09-09 01:24:27 UTC (rev 21366)
+++ moonbase/trunk/gnome-desktop/control-center2/DEPENDS	2006-09-09 02:16:42 UTC (rev 21367)
@@ -1,21 +1,14 @@
-# dependencies in the README:
-depends intltool           &&
 depends gtk+-2             &&
 depends GConf2             &&
 depends libgnome           &&
-depends libgnomeui         &&
 depends libglade2          &&
-depends libbonobo          &&
-depends libbonoboui        &&
-depends gnome-vfs2         &&
 depends gnome-desktop      &&
 depends gnome-icon-theme   &&
 depends gnome-menus        &&
-# dependencies you have to figure out yourself:
 depends esound             &&
 depends libxklavier        &&
 depends nautilus           &&
 depends metacity           &&
 depends desktop-file-utils &&
 depends gst-plugins-base   &&
-depends gstreamer-10
+optional_depends hal "--enable-hal" "--disable-hal" "for optional hal support"