cheese r1114 - in trunk: . src

[dgsiegel svn gnome org]

Author: dgsiegel
Date: Mon Oct 20 08:49:24 2008
New Revision: 1114
URL: http://svn.gnome.org/viewvc/cheese?rev=1114&view=rev

Log:
remove gnome-vfs dependency from waf


Modified:
   trunk/ChangeLog
   trunk/src/wscript_build
   trunk/wscript

Modified: trunk/src/wscript_build
==============================================================================
--- trunk/src/wscript_build	(original)
+++ trunk/src/wscript_build	Mon Oct 20 08:49:24 2008
@@ -13,10 +13,10 @@
 obj = bld.create_obj('cc', 'program')
 obj.find_sources_in_dirs('.') # take the sources in the current folder
 obj.includes='.'
-obj.uselib='''GLIB GOBJECT GTK LIBGLADE GDK HAL
-              GSTREAMER GSTREAMER_PLUGINS_BASE 
-              GNOME_VFS CAIRO PANGOCAIRO LIBRSVG
-              LIBGNOMEUI LIBEBOOK XXF86VM'''
+obj.uselib='''GLIB GOBJECT GIO GTK GDK
+              LIBGNOMEDESKTOP GCONF GSTREAMER
+              GSTREAMER_PLUGINS_BASE LIBEBOOK
+              CAIRO DBUS DBUSGLIB HAL PANGOCAIRO LIBRSVG'''
 
 obj.target='cheese'
 obj.add_dbus_file('cheese-dbus-infos.xml', 'cheese_dbus', 'glib-server')

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Mon Oct 20 08:49:24 2008
@@ -38,11 +38,10 @@
 	conf.check_pkg('gio-2.0', destvar='GIO', vnum='2.16.0', mandatory=True)
 	conf.check_pkg('gtk+-2.0', destvar='GTK', vnum='2.10.0', mandatory=True)
 	conf.check_pkg('gdk-2.0', destvar='GDK', vnum='2.12.0', mandatory=True)
-	conf.check_pkg('libgnomeui-2.0', destvar='LIBGNOMEUI', vnum='2.20.0', mandatory=True)
+	conf.check_pkg('gnome-desktop-2.0', destvar='LIBGNOMEDESKTOP', vnum='2.25.1', mandatory=True)
 	conf.check_pkg('gconf-2.0', destvar='GCONF', vnum='2.16.0', mandatory=True)
 	conf.check_pkg('gstreamer-0.10', destvar='GSTREAMER', vnum='0.10.20', mandatory=True)
 	conf.check_pkg('gstreamer-plugins-base-0.10', destvar='GSTREAMER_PLUGINS_BASE', vnum='0.10.20', mandatory=True)
-	conf.check_pkg('gnome-vfs-2.0', destvar='GNOMEVFS', vnum='2.18.0', mandatory=True)
 	conf.check_pkg('libebook-1.2', destvar='LIBEBOOK', vnum='1.12.0', mandatory=True)
 	conf.check_pkg('cairo', destvar='CAIRO', vnum='1.4.0', mandatory=True)
 	conf.check_pkg('dbus-1', destvar='DBUS', vnum='1.0', mandatory=True)
@@ -76,6 +75,7 @@
 	conf.define('PACKAGE_LIBEXECDIR', conf.env['PREFIX'] + '/libexec/cheese')
 	conf.define('BINDIR', conf.env['PREFIX'] + '/bin')
 	conf.env.append_value('CCFLAGS', '-DHAVE_CONFIG_H')
+	conf.env.append_value('CCFLAGS', '-DGNOME_DESKTOP_USE_UNSTABLE_API=1')
 
 	conf.write_config_header('cheese-config.h')