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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-07 20:40:41 +0000 (Sun, 07 Sep 2008)
New Revision: 2366

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/configure.in
Log:
	* configure.in: Fix the dependency of ACCT_TOOLS_SETUID on
	USE_PAM. Build failed with --without-libpam.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-09-07 00:51:17 UTC (rev 2365)
+++ upstream/trunk/ChangeLog	2008-09-07 20:40:41 UTC (rev 2366)
@@ -1,5 +1,10 @@
 2008-09-07  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* configure.in: Fix the dependency of ACCT_TOOLS_SETUID on
+	USE_PAM. Build failed with --without-libpam.
+
+2008-09-07  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/copydir.c, configure.in: Check for the presence of
 	st_mtim and st_mtimensec, as for st_atim and st_atimensec.
 	* libmisc/copydir.c: Call utimes() after closing the file.

Modified: upstream/trunk/configure.in
===================================================================
--- upstream/trunk/configure.in	2008-09-07 00:51:17 UTC (rev 2365)
+++ upstream/trunk/configure.in	2008-09-07 20:40:41 UTC (rev 2366)
@@ -230,7 +230,7 @@
 	   *) AC_MSG_ERROR(bad value ${enableval} for --enable-account-tools-setuid)
 	   ;;
 	 esac],
-	[enable_acct_tools_setuid="yes"]
+	[enable_acct_tools_setuid="maybe"]
 )
 
 AC_ARG_WITH(audit, 
@@ -431,13 +431,19 @@
 	AC_MSG_RESULT(yes)
 fi
 
-if test "$enable_acct_tools_setuid" = "yes"; then
+if test "$enable_acct_tools_setuid" != "no"; then
 	if test "$with_libpam" != "yes"; then
-		AC_MSG_ERROR(PAM support is required for --enable-account-tools-setuid)
+		if test "$enable_acct_tools_setuid" = "yes"; then
+			AC_MSG_ERROR(PAM support is required for --enable-account-tools-setuid)
+		else
+			enable_acct_tools_setuid="no"
+		fi
 	fi
-	AC_DEFINE(ACCT_TOOLS_SETUID,
-	          1,
-	          [Define if account management tools should be installed setuid and authenticate the callers])
+	if "$enable_acct_tools_setuid" = "yes"; then
+		AC_DEFINE(ACCT_TOOLS_SETUID,
+		          1,
+		          [Define if account management tools should be installed setuid and authenticate the callers])
+	fi
 fi
 AM_CONDITIONAL(ACCT_TOOLS_SETUID, test "x$enable_acct_tools_setuid" = "xyes")