From 70bf7cca3314a600230386b95d7402ad90147a32 Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Wed, 16 Apr 2008 20:09:03 +0000
Subject: [PATCH] Fix the detection of the audit library and header file.

---
 ChangeLog    |  5 +++++
 NEWS         |  1 +
 configure.in | 23 ++++++++++++++++++-----
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f88eb85..c555fa32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-16  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* NEWS, configure.in: Fix the detection of the audit library and
+	header file.
+
 2008-04-04  Mark Rosenstand  <mark@borkware.net>
 
 	* NEWS, etc/pam.d/Makefile.am: Add chfn, chsh, and userdel to
diff --git a/NEWS b/NEWS
index 4e1b16a0..1367ca47 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ shadow-4.1.1 -> shadow-4.1.2						UNRELEASED
 *** 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
 
diff --git a/configure.in b/configure.in
index 45db0317..4ab2122a 100644
--- a/configure.in
+++ b/configure.in
@@ -218,7 +218,7 @@ AC_ARG_ENABLE(man,
 
 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_CHECK_LIB(crypt, crypt, [LIBCRYPT=-lcrypt],
 	[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