Work around more stupid autoconf "helpfulness"

diff --git a/src/modules/rlm_pam/config.h.in b/src/modules/rlm_pam/config.h.in
index a606880..a8ccab3 100644 (file)
--- a/src/modules/rlm_pam/config.h.in
+++ b/src/modules/rlm_pam/config.h.in
@@ -1,4 +1,7 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
+/* Define if you have the <pam/pam_appl.h> header file.  */
+#undef HAVE_PAM_PAM_APPL_H
+
 /* Define if you have the <security/pam_appl.h> header file.  */
 #undef HAVE_SECURITY_PAM_APPL_H

diff --git a/src/modules/rlm_pam/configure b/src/modules/rlm_pam/configure
index 366cf07..157e64c 100755 (executable)
--- a/src/modules/rlm_pam/configure
+++ b/src/modules/rlm_pam/configure
@@ -521,7 +521,7 @@ else
 fi
 
 
-# From configure.in Revision: 1.3 
+# From configure.in Revision: 1.4 
 
 
 if test x$with_rlm_pam != xno; then
@@ -914,21 +914,24 @@ else
 fi
 
 
-       for ac_hdr in security/pam_appl.h
+       for ac_hdr in \
+                       security/pam_appl.h \
+                       pam/pam_appl.h \
+                       
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:922: checking for $ac_hdr" >&5
+echo "configure:925: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 927 "configure"
+#line 930 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -948,7 +951,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
- pam/pam_appl.h
+ 
 else
   echo "$ac_t""no" 1>&6
 fi

diff --git a/src/modules/rlm_pam/configure.in b/src/modules/rlm_pam/configure.in
index 9fc3a4e..3633f17 100644 (file)
--- a/src/modules/rlm_pam/configure.in
+++ b/src/modules/rlm_pam/configure.in
@@ -17,7 +17,14 @@ if test x$with_[]modname != xno; then
                [ $pam_ldflags ]
        )
 
-       AC_CHECK_HEADERS(security/pam_appl.h,pam/pam_appl.h)
+dnl #  
+dnl #  Yes, these DO have to be on seperate lines,
+dnl #  otherwise autoheader won't pick them up.
+dnl #  
+       AC_CHECK_HEADERS( \
+                       security/pam_appl.h \
+                       pam/pam_appl.h \
+                       )
        pam_cflags="-I."
        
        targetname=modname