sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4: Modify auth/config.m4 to move pam tests to nsswitch.m4 so that we tests things in one place

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Matthieu Patou 2010-03-03 11:38:51 +03:00 committed by Stefan Metzmacher
parent cddc542ba5
commit 5f2f4849e5
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nsswitch/config.m4
View File

@ -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
#####

7
source4/auth/config.m4
View File

@ -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
###############################

5
source4/configure.ac
View File

@ -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