From 5f2f4849e556cb761c7d9fca78cb1ef9e1279974 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Wed, 3 Mar 2010 11:38:51 +0300 Subject: 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 --- source4/auth/config.m4 | 7 +------ source4/configure.ac | 5 ++++- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'source4') 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 -- cgit