Re: [PATCH] build fixes policykit support



Michael Biebl wrote:
Hi,

attached is a patch for the build system regarding policykit support

policy/Makefile.am
1.) removes duplicate copy, looks like a cut-n-paste error.

Parts of it, have been remove in 3651, but not all.

Updated patch attached.


--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
Index: configure.in
===================================================================
--- configure.in	(Revision 3651)
+++ configure.in	(Arbeitskopie)
@@ -221,11 +221,7 @@
 
 PKG_CHECK_MODULES(POLKIT, polkit-dbus)
 
-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
+AC_PATH_PROG([POLKIT_POLICY_FILE_VALIDATE], [polkit-policy-file-validate], [false])
 
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
Index: policy/Makefile.am
===================================================================
--- policy/Makefile.am	(Revision 3651)
+++ policy/Makefile.am	(Arbeitskopie)
@@ -4,11 +4,11 @@
 	org.freedesktop.network-manager-settings.system.policy
 
 check:
-	for f in $(dist_polkit_policy_DATA); do \
+	@for f in $(dist_polkit_policy_DATA); do \
             echo -n "Validate PolicyKit policy in $$f : "; \
             $(POLKIT_POLICY_FILE_VALIDATE) $(srcdir)/$$f ; \
 	    ret=$$?; \
-            if  [ "$$ret" == "0" ]; \
+            if  [ "$$ret" = "0" ]; \
 	      then \
                 echo ok; \
             else \
@@ -19,5 +19,3 @@
 
 clean-local :
 	rm -f *~
-polkit_policydir = $(datadir)/PolicyKit/policy
-

Attachment: signature.asc
Description: OpenPGP digital signature



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]