From 70c9eeff05a1202145ce0444c0142c98ee3c73dc Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 7 Sep 2008 20:40:41 +0000 Subject: [PATCH] * configure.in: Fix the dependency of ACCT_TOOLS_SETUID on USE_PAM. Build failed with --without-libpam. --- ChangeLog | 5 +++++ configure.in | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0faf82c8..1d5fe2ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-09-07 Nicolas François + + * configure.in: Fix the dependency of ACCT_TOOLS_SETUID on + USE_PAM. Build failed with --without-libpam. + 2008-09-07 Nicolas François * libmisc/copydir.c, configure.in: Check for the presence of diff --git a/configure.in b/configure.in index 8da687a4..25ed1546 100644 --- 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")