STABLE12-ignore-pam-module-if-no-headers-20030701

FIXES 1649

we check for pam headers; use the result

(cherry picked from commit 96c7261a229207a44e483cce52478fbb1b35fe96)

diff --git a/Makefile.in b/Makefile.in
index 56a5f5e9377c095b021e901a8e8b79c5a59b9fe3..0c12e0cedda66bd187b9f7da17331947c21e36f4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -317,7 +317,11 @@ login: project kauth rxkad
        amd64_linux24) \
                echo Skipping pam/login for amd64_linux24 ;; \
        sun*_* | hp_ux11* | ia64_hpux* | *linux* | *fbsd* ) \
-               ${COMPILE_PART1} pam ${COMPILE_PART2} ;; \
+               if test "@HAVE_PAM@" = "yes"; then \
+                       ${COMPILE_PART1} pam ${COMPILE_PART2} ; \
+               else \
+                       echo Skipping pam for ${SYS_NAME} ; \
+               fi ;; \
        ppc_darwin* | *_obsd* ) \
                echo Skipping login for ${SYS_NAME} ;; \
        * ) \

diff --git a/acinclude.m4 b/acinclude.m4
index b698747b40882d1205feeaf76d79def3859fb32d..58671e89d1bbe013beecbc584fac33dd5c70dda8 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -680,6 +680,13 @@ AC_CHECK_HEADERS(sys/mount.h strings.h termios.h signal.h)
 AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h)
 AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h)
 
+if test "$ac_cv_header_security_pam_modules_h" = "yes"; then
+       HAVE_PAM="yes"
+else
+       HAVE_PAM="no"
+fi
+AC_SUBST(HAVE_PAM)
+
 AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf re_comp re_exec)
 AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp)
 AC_CHECK_TYPE(ssize_t, int)