gnome-applets r10980 - trunk

[callum svn gnome org]

Author: callum
Date: Sat Sep 13 00:35:45 2008
New Revision: 10980
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=10980&view=rev

Log:
Make it possible to explicitly disable policy-kit
even if it is available. Patch from Nirbheek Chauhan (Bug 551763).

Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Sep 13 00:35:45 2008
@@ -211,7 +211,20 @@
 dnl -- check for PolicyKit and PolicyKit-gnome (optional) -----------------------------------------
 POLKIT_CFLAGS=
 POLKIT_LIBS=
-PKG_CHECK_MODULES(POLKIT, polkit >= $POLKIT_REQUIRED polkit-dbus >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
+AC_ARG_ENABLE([polkit],
+    AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]),
+    enable_polkit=$enableval,
+    enable_polkit=auto)
+if test "x$enable_polkit" != "xno"; then
+    PKG_CHECK_MODULES(POLKIT, polkit >= $POLKIT_REQUIRED polkit-dbus >= $POLKIT_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
+    if test "x$enable_polkit" = "xyes" -a "x$HAVE_POLKIT" = "xno"; then
+        AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
+    fi
+fi
+dnl - This is only so the printout at the end of configure is correct -
+if test "x$enable_polkit" = "xno"; then
+   HAVE_POLKIT=no
+fi
 if test "x$HAVE_POLKIT" = "xyes"; then
     AC_DEFINE(HAVE_POLKIT, [1], [PolicyKit available])
 fi
@@ -221,7 +234,13 @@
 
 POLKIT_GNOME_CFLAGS=
 POLKIT_GNOME_LIBS=
-PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_REQUIRED, polkit_gnome=yes, polkit_gnome=no)
+polkit_gnome=no
+if test "x$enable_polkit" != "xno"; then
+    PKG_CHECK_MODULES(POLKIT_GNOME, polkit-gnome >= $POLKIT_REQUIRED, polkit_gnome=yes, polkit_gnome=no)
+    if test "x$enable_polkit" = "xyes" -a "x$polkit_gnome" = "xno"; then
+        AC_MSG_ERROR([PolicyKit-gnome support explicitly requested but dependencies not found])
+    fi
+fi
 if test "x$polkit_gnome" = "xyes"; then
     AC_DEFINE(HAVE_POLKIT_GNOME, [1], [PolicyKit-gnome available])
 fi