gnome-settings-daemon r418 - trunk

[jensg svn gnome org]

Author: jensg
Date: Tue Aug  5 17:36:48 2008
New Revision: 418
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=418&view=rev

Log:
2008-08-05  Jens Granseuer  <jensgr gmx net>

	* configure.ac: simplify libnotify check, fix fontconfig result
	output


Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Aug  5 17:36:48 2008
@@ -84,18 +84,14 @@
 AM_GCONF_SOURCE_2
 
 dnl ---------------------------------------------------------------------------
-dnl - Is a new enough libnotify available?
+dnl - Check for libnotify
 dnl ---------------------------------------------------------------------------
 
-if $PKG_CONFIG --atleast-version $LIBNOTIFY_REQUIRED_VERSION libnotify; then
-   have_libnotify=yes
-   PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION)
-   AC_SUBST(LIBNOTIFY_CFLAGS)
-   AC_SUBST(LIBNOTIFY_LIBS)
-   AC_DEFINE(HAVE_LIBNOTIFY, 1, [Building with libnotify support])
-else
-   have_libnotify=no
-fi
+PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
+		  [AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available])
+                  have_libnotify=yes], [have_libnotify=no])
+AC_SUBST(LIBNOTIFY_CFLAGS)
+AC_SUBST(LIBNOTIFY_LIBS)
 
 dnl ---------------------------------------------------------------------------
 dnl - Check for D-Bus
@@ -197,7 +193,7 @@
 PKG_CHECK_MODULES(FONTCONFIG, fontconfig,
 		  [AC_DEFINE(HAVE_FONTCONFIG, 1, [Define if Fontconfig functionality is available])
 		   have_fontconfig=yes],
-		  AC_MSG_RESULT([no]))
+		  [have_fontconfig=no])
 AM_CONDITIONAL(HAVE_FONTCONFIG, test x"$have_fontconfig" = "xyes")
 
 dnl ---------------------------------------------------------------------------