summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <asaleem@src.gnome.org>2008-08-21 07:09:43 +0000
committerSaleem Abdulrasool <asaleem@src.gnome.org>2008-08-21 07:09:43 +0000
commite35f058dd5dee8abbba7b4646ae5c6b219a716c7 (patch)
tree23c7368559d6ea378b0ee5c302f36b5bfb0d7244
parentc9270a57edf80d401de2b507e48a5fe60cb369fa (diff)
downloadgconf-e35f058dd5dee8abbba7b4646ae5c6b219a716c7.tar.gz
fix configure for the no polickykit case
svn path=/trunk/; revision=2659
-rw-r--r--ChangeLog7
-rw-r--r--configure.in10
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 009d3241..edf7bc5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-21 Saleem Abdulrasool <compnerd@compnerd.org>
+
+ reviewed by: kmaraas
+
+ * configure.in: Check for polkit-policy-file-validate if policykit is needed
+ to allow configure to pass on systems without PolicyKit
+
=========================== 2.23.2 ==========================
2008-08-19 Kjartan Maraas <kmaraas@gnome.org>
diff --git a/configure.in b/configure.in
index 4557ab95..a3b2e905 100644
--- a/configure.in
+++ b/configure.in
@@ -187,12 +187,12 @@ fi
if test "x$enable_defaults_service" != "xno" ; then
AC_DEFINE(ENABLE_DEFAULTS_SERVICE, 1, [enable defaults DBus service])
-fi
-AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
- [polkit-policy-file-validate], [polkit-policy-file-validate])
-if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
- AC_MSG_ERROR([polkit-policy-file-validate not found])
+ AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
+ [polkit-policy-file-validate], [polkit-policy-file-validate])
+ if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
+ AC_MSG_ERROR([polkit-policy-file-validate not found])
+ fi
fi
AM_CONDITIONAL(ENABLE_DEFAULTS_SERVICE, [test "x$enable_defaults_service" != "xno"])