gnome-applets r10886 - trunk

[callum svn gnome org]

Author: callum
Date: Sat Jul 19 03:44:24 2008
New Revision: 10886
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=10886&view=rev

Log:
Make the compilation of the weather applet conditional on libgweather being present rather than gnome-vfs (bug 511466)

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Jul 19 03:44:24 2008
@@ -5,9 +5,14 @@
 gtop_SUBDIRS = $(gtop_applets)
 endif
 
-vfs_applets = \
-	drivemount	\
+libgweather_applets = \
 	gweather
+if BUILD_LIBGWEATHER_APPLETS
+libgweather_SUBDIRS = $(libgweather_applets)
+endif
+
+vfs_applets = \
+	drivemount
 if BUILD_GNOME_VFS_APPLETS
 vfs_SUBDIRS = $(vfs_applets)
 endif
@@ -59,6 +64,7 @@
 	$(mixer_SUBDIRS)	\
 	$(modemlights_SUBDIRS)	\
 	$(gtop_SUBDIRS)		\
+	$(libgweather_SUBDIRS)	\
 	$(vfs_SUBDIRS)		\
 	$(battstat_SUBDIR)	\
 	$(accessx_status_SUBDIR)\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Jul 19 03:44:24 2008
@@ -305,9 +305,13 @@
 AC_SUBST(XML2_LIBS)
 
  dnl -- check for libgweather (required for gweather applet) ------------------
-PKG_CHECK_MODULES(LIBGWEATHER, gweather >= $GWEATHER_REQUIRED)
+build_libgweather_applets=false
+PKG_CHECK_MODULES(LIBGWEATHER, gweather >= $GWEATHER_REQUIRED,
+	          build_libgweather_applets=true,
+		  AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
 AC_SUBST(LIBGWEATHER_CFLAGS)
 AC_SUBST(LIBGWEATHER_LIBS)
+AM_CONDITIONAL(BUILD_LIBGWEATHER_APPLETS, $build_libgweather_applets)
 
 dnl ***************************************************************************
 dnl *** find paths to installed binaries                                    ***
@@ -821,7 +825,7 @@
 	 - drivemount			$build_gnome_vfs_applets
 	 - geyes			always
 	 - keyboard-applet		$BUILD_KEYBOARD_APPLET
-	 - gweather			$build_gnome_vfs_applets
+	 - gweather			$build_libgweather_applets
 	 - invest-applet		$BUILD_INVEST_APPLET
 	 - mini-commander		$enable_mini_commander
 	 - mixer			$HAVE_GST