diff options
| author | Matthieu Patou <mat@matws.net> | 2010-03-03 11:38:51 +0300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-03-11 13:31:37 +0100 |
| commit | 5f2f4849e556cb761c7d9fca78cb1ef9e1279974 (patch) | |
| tree | 74f87babd7cef2dd6de9867668646459d9f141e5 | |
| parent | cddc542ba5f30316ff4ee8fa591a54808b7be4c8 (diff) | |
| download | samba-5f2f4849e556cb761c7d9fca78cb1ef9e1279974.tar.gz samba-5f2f4849e556cb761c7d9fca78cb1ef9e1279974.tar.bz2 samba-5f2f4849e556cb761c7d9fca78cb1ef9e1279974.zip | |
s4: Modify auth/config.m4 to move pam tests to nsswitch.m4 so that we tests things in one place
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | nsswitch/config.m4 | 24 | ||||
| -rw-r--r-- | source4/auth/config.m4 | 7 | ||||
| -rw-r--r-- | source4/configure.ac | 5 |
3 files changed, 29 insertions, 7 deletions
diff --git a/nsswitch/config.m4 b/nsswitch/config.m4 index b49ecbcc5e..8d9118322c 100644 --- a/nsswitch/config.m4 +++ b/nsswitch/config.m4 @@ -1,3 +1,4 @@ +###### AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h ) case "$host_os" in @@ -13,3 +14,26 @@ case "$host_os" in *) ;; esac +##### + +##### +#All the pam requirement tests are regrouped here +#It is mandatory not to remove them otherwise it will break badly the source4/auth part +AC_CHECK_HEADERS(security/pam_appl.h) +AC_CHECK_LIB_EXT(pam, PAM_LIBS, pam_start) +# This part is need for the compilation +AC_CHECK_HEADERS(security/pam_modules.h pam/pam_modules.h,,,[[ + #if HAVE_SECURITY_PAM_APPL_H + #include <security/pam_appl.h> + #endif + #if HAVE_PAM_PAM_APPL_H + #include <pam/pam_appl.h> + #endif +]]) + +SMB_EXT_LIB(PAM, $PAM_LIBS) + +if test x"$ac_cv_header_security_pam_appl_h" = x"yes" -a x"$ac_cv_lib_ext_pam_pam_start" = x"yes";then + SMB_ENABLE(PAM,YES) +fi +##### diff --git a/source4/auth/config.m4 b/source4/auth/config.m4 index 9735b17cac..03fdadb4e2 100644 --- a/source4/auth/config.m4 +++ b/source4/auth/config.m4 @@ -1,12 +1,7 @@ ############################### # start SMB_EXT_LIB_PAM # check for security/pam_appl.h and -lpam -AC_CHECK_HEADERS(security/pam_appl.h) -AC_CHECK_LIB_EXT(pam, PAM_LIBS, pam_start) -if test x"$ac_cv_header_security_pam_appl_h" = x"yes" -a x"$ac_cv_lib_ext_pam_pam_start" = x"yes";then - SMB_ENABLE(PAM,YES) -fi -SMB_EXT_LIB(PAM, $PAM_LIBS) +# Tests are now moved in ../nsswitch/config.m4 because winbind stuff require more pam tests # end SMB_EXT_LIB_PAM ############################### diff --git a/source4/configure.ac b/source4/configure.ac index ac4a0da189..c615169b37 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -126,10 +126,13 @@ m4_include(ntvfs/unixuid/config.m4) m4_include(../lib/socket_wrapper/config.m4) m4_include(../lib/nss_wrapper/config.m4) m4_include(../lib/uid_wrapper/config.m4) +dnl nsswitch must be before auth as it sets some variable +dnl tested by auth/config.m4, libiiniparser must be even before +dnl because nsswitch depend also on it +m4_include(../nsswitch/config.m4) m4_include(auth/config.m4) m4_include(kdc/config.m4) m4_include(ntvfs/sysdep/config.m4) -m4_include(../nsswitch/config.m4) ################################################# # add *_CFLAGS only for the real build |