eel r2103 - trunk

[cneumair svn gnome org]

Author: cneumair
Date: Sat Mar 29 10:21:30 2008
New Revision: 2103
URL: http://svn.gnome.org/viewvc/eel?rev=2103&view=rev

Log:
2008-03-29  Christian Neumair  <cneumair gnome org>

	* configure.in:
	Use a slightly cleaner method of detecting libstartup-notification,
	using macros instead of manually calling pkg-config (#507811).
	Thanks to LoÃc Minier <lool dooz org>.



Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Mar 29 10:21:30 2008
@@ -61,22 +61,16 @@
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_C_CONST
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
-if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then
-  echo "Building with libstartup-notification"
-  AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1,
-            [define to enable startup notification support])
-  with_startup_notification=yes
-  STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0
-  EXTRA_CORE_MODULES="$EXTRA_CORE_MODULES libstartup-notification-1.0"
-else
-  echo "***** WARNING: Building without libstartup-notification"
-  with_startup_notification=no
-  STARTUP_NOTIFICATION_PACKAGE=
-fi
+OPTIONAL_MODULES=""
 
-AC_SUBST(STARTUP_NOTIFICATION_PACKAGE)
+PKG_CHECK_MODULES(STARTUP_NOTIFICATION,
+    [libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_REQUIRED],
+    AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1,
+              [define to enable startup notification support])
+    OPTIONAL_MODULES="$OPTIONAL_MODULES libstartup-notification-1.0",
+    echo "***** WARNING: Building without libstartup-notification"
+)
 
 PKG_CHECK_MODULES(EEL, [
 	gail			>= $GAIL_REQUIRED
@@ -91,10 +85,8 @@
 	libgnomeui-2.0		>= $GNOME_UI_REQUIRED
 	gnome-desktop-2.0	>= $LIBGNOME_DESKTOP_REQUIRED
 	libxml-2.0		>= $XML_REQUIRED
-	$STARTUP_NOTIFICATION_PACKAGE
+	$OPTIONAL_MODULES
 ])
-AC_SUBST(EEL_LIBS)
-AC_SUBST(EEL_CFLAGS)