gnome-settings-daemon r700 - trunk

[jensg svn gnome org]

Author: jensg
Date: Sun Feb  8 15:20:49 2009
New Revision: 700
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=700&view=rev

Log:
2009-02-08  Jens Granseuer  <jensgr gmx net>

	Patch by: Nirbheek Chauhan <nirbheek chauhan gmail com>

	* configure.ac: add --without-libnotify to disable notifications
	(bug #570885)


Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Feb  8 15:20:49 2009
@@ -89,9 +89,19 @@
 dnl - Check for libnotify
 dnl ---------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
-		  [AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available])
-                  have_libnotify=yes], [have_libnotify=no])
+have_libnotify=no
+AC_ARG_WITH(libnotify,
+	AC_HELP_STRING([--without-libnotify], [Disable notifications (default: auto)]),
+	with_libnotify=$withval, with_libnotify=auto)
+
+if test "x$with_libnotify" != "xno"; then
+	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
+			  [AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify is available])
+			  have_libnotify=yes], have_libnotify=no)
+	if test "x$have_libnotify" = xno -a "x$with_libnotify" = xyes; then
+		AC_MSG_ERROR([libnotify support requested but libraries not found])
+	fi
+fi
 AC_SUBST(LIBNOTIFY_CFLAGS)
 AC_SUBST(LIBNOTIFY_LIBS)
 
@@ -386,7 +396,7 @@
 
         dbus-1 system.d dir:      ${DBUS_SYS_DIR}
 
+        Libnotify support:        ${have_libnotify}
         PulseAudio support:       ${have_pulse}
-
         Profiling support:        ${enable_profiling}
 "