* configure.in: Fix the dependency of ACCT_TOOLS_SETUID on

	USE_PAM. Build failed with --without-libpam.

diff --git a/ChangeLog b/ChangeLog
index 0faf82c8ab1a740769c16d2b1a42a517e8570c50..1d5fe2cec98862f9693b7e93d445ccdac4110dd4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-07  Nicolas François  <nicolas.francois@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@centraliens.net>
 
        * libmisc/copydir.c, configure.in: Check for the presence of

diff --git a/configure.in b/configure.in
index 8da687a4e6f50708c7583bc394a9b917ffac5e3d..25ed154665e9fc6300a4873d5d2bf445c186967d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -230,7 +230,7 @@ AC_ARG_ENABLE(account-tools-setuid,
           *) 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 @@ else
        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
+       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
-       AC_DEFINE(ACCT_TOOLS_SETUID,
-                 1,
-                 [Define if account management tools should be installed setuid and authenticate the callers])
 fi
 AM_CONDITIONAL(ACCT_TOOLS_SETUID, test "x$enable_acct_tools_setuid" = "xyes")