[PolicyKit] doesn't build with PAM from Debian

[Frederic Peters]

Hello,

http://jhbuild.bxlug.be/builds/2006-06-06-0000/logs/PolicyKit/#build
shows a error when building newest PolicyKit with Debian PAM libraries.

Attached patch adds new configure checks; pam-polkit-console.c may
need alternate behaviour if pam_vsyslog is missing (using straight
vsyslog?).



Regards,

        Frederic
-------------- next part --------------
Index: configure.in
===================================================================
RCS file: /cvs/hal/PolicyKit/configure.in,v
retrieving revision 1.6
diff -u -r1.6 configure.in
--- configure.in	5 Jun 2006 23:39:00 -0000	1.6
+++ configure.in	6 Jun 2006 06:38:31 -0000
@@ -262,6 +262,9 @@
 AC_SUBST(HAVE_PAM)
 AC_SUBST(AUTH_LIBS)
 
+AC_CHECK_HEADER(security/pam_modutil.h, [AC_DEFINE(HAVE_PAM_MODUTIL_H, [], "Have pam_modutil.h")])
+AC_CHECK_HEADER(security/pam_ext.h, [AC_DEFINE(HAVE_PAM_EXT_H, [], "Have pam_ext.h")])
+AC_CHECK_LIB(pam, pam_vsyslog, [AC_DEFINE(HAVE_PAM_VSYSLOG, [], "Have pam_vsyslog")])
 
 AC_ARG_WITH(os-type,     [  --with-os-type=<os>        distribution or OS (redhat)])
 
Index: pam-polkit-console/pam-polkit-console.c
===================================================================
RCS file: /cvs/hal/PolicyKit/pam-polkit-console/pam-polkit-console.c,v
retrieving revision 1.1
diff -u -r1.1 pam-polkit-console.c
--- pam-polkit-console/pam-polkit-console.c	5 Jun 2006 23:39:00 -0000	1.1
+++ pam-polkit-console/pam-polkit-console.c	6 Jun 2006 06:38:31 -0000
@@ -37,11 +37,16 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
+#include <stdarg.h>
 
 #include <security/pam_modules.h>
 #include <security/_pam_macros.h>
+#ifdef HAVE_PAM_MODUTIL_H
 #include <security/pam_modutil.h>
+#endif
+#ifdef HAVE_PAM_EXT_H
 #include <security/pam_ext.h>
+#endif
 
 #ifndef FALSE
 #define FALSE 0
@@ -64,7 +69,9 @@
 		return;
 
 	va_start (args, format);
+#ifdef HAVE_PAM_VSYSLOG
 	pam_vsyslog (pamh, err, format, args);
+#endif
 	closelog ();
 }