[Pkg-shadow-commits] r1970 - upstream/trunk

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-04-16 20:09:03 +0000 (Wed, 16 Apr 2008)
New Revision: 1970

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/configure.in
Log:
Fix the detection of the audit library and header file.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-04-13 21:21:00 UTC (rev 1969)
+++ upstream/trunk/ChangeLog	2008-04-16 20:09:03 UTC (rev 1970)
@@ -1,3 +1,8 @@
+2008-04-16  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* NEWS, configure.in: Fix the detection of the audit library and
+	header file.
+
 2008-04-04  Mark Rosenstand  <mark at borkware.net>
 
 	* NEWS, etc/pam.d/Makefile.am: Add chfn, chsh, and userdel to

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2008-04-13 21:21:00 UTC (rev 1969)
+++ upstream/trunk/NEWS	2008-04-16 20:09:03 UTC (rev 1970)
@@ -5,6 +5,7 @@
 *** general:
 - packaging
   * Distribute the chfn, chsh, and userdel PAM configuration file.
+  * Fix the detection of the audit library and header file.
 
 shadow-4.1.0 -> shadow-4.1.1						02-04-2008
 

Modified: upstream/trunk/configure.in
===================================================================
--- upstream/trunk/configure.in	2008-04-13 21:21:00 UTC (rev 1969)
+++ upstream/trunk/configure.in	2008-04-16 20:09:03 UTC (rev 1970)
@@ -218,7 +218,7 @@
 
 AC_ARG_WITH(audit, 
 	[AC_HELP_STRING([--with-audit], [use auditing support @<:@default=yes if found@:>@])],
-	[with_audit=$withval], [with_audit=yes])
+	[with_audit=$withval], [with_audit=maybe])
 AC_ARG_WITH(libpam,
 	[AC_HELP_STRING([--with-libpam], [use libpam for PAM support @<:@default=yes if found@:>@])],
 	[with_libpam=$withval], [with_libpam=yes])
@@ -275,12 +275,25 @@
 	[AC_MSG_ERROR([crypt() not found])])
 
 AC_SUBST(LIBAUDIT)
-if test "$with_audit" = "yes"; then
+if test "$with_audit" != "no"; then
 	AC_CHECK_HEADER(libaudit.h, [audit_header="yes"], [audit_header="no"])
-	if test "$audit_header" = "yes"; then
+	if test "$audit_header$with_audit" = "noyes" ; then
+		AC_MSG_ERROR([libaudit.h is missing])
+	elif test "$audit_header" = "yes"; then
 		AC_CHECK_LIB(audit, audit_log_acct_message,
-			[AC_DEFINE(WITH_AUDIT, 1, [Define if you want to enable Audit messages])
-			LIBAUDIT="-laudit"])
+		             [audit_lib="yes"], [audit_lib="no"])
+		if test "$audit_lib$with_audit" = "noyes" ; then
+			AC_MSG_ERROR([libaudit not found])
+		elif test "$audit_lib" = "no" ; then
+			with_audit="no"
+		else
+			AC_DEFINE(WITH_AUDIT, 1,
+			          [Define if you want to enable Audit messages])
+			LIBAUDIT="-laudit"
+			with_audit="yes"
+		fi
+	else
+		with_audit="no"
 	fi
 fi