gdm r6389 - trunk

[mccann svn gnome org]

Author: mccann
Date: Tue Aug 19 01:16:13 2008
New Revision: 6389
URL: http://svn.gnome.org/viewvc/gdm?rev=6389&view=rev

Log:
2008-08-18  William Jon McCann  <jmccann redhat com>

	* configure.ac: Make PolicyKit-gnome optional
	Patch from: Gilles Dartiguelongue <gilles dartiguelongue esiee org>
	Fixes #547965



Modified:
   trunk/ChangeLog
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Aug 19 01:16:13 2008
@@ -118,8 +118,20 @@
         polkit-gnome >= $POLICYKIT_REQUIRED_VERSION,
         have_polkit=yes,
         have_polkit=no)
-if test "x$have_polkit" = "xyes" ; then
-       AC_DEFINE(HAVE_POLKIT_GNOME, [], [Define if we have polkit])
+
+AC_ARG_ENABLE([polkit],
+              AS_HELP_STRING([--enable-polkit],
+                             [Enable PolicyKit support @<:@default=auto@:>@]),
+              enable_polkit=$enableval, enable_polkit=auto)
+
+if test "x$enable_polkit" != "xno"; then
+  if test "x$enable_polkit" = "xyes" -a "x$have_polkit" = "xno"; then
+    AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
+  fi
+
+  if test "x$have_polkit" = "xyes" ; then
+    AC_DEFINE(HAVE_POLKIT_GNOME, [], [Define if we have polkit])
+  fi
 fi
 AM_CONDITIONAL(HAVE_POLKIT_GNOME, test x$have_polkit = xyes)
 AC_SUBST(HAVE_POLKIT_GNOME)