@@ -8330,23 +8330,27 @@ fi
83308330fi
83318331
83328332if test " $with_pam " = yes; then
8333- if test " ${ac_cv_header_security_pam_appl_h+set} " =set ; then
8334- echo " $as_me :$LINENO : checking for security/pam_appl.h" >&5
8335- echo $ECHO_N " checking for security/pam_appl.h...$ECHO_C " >&6
8336- if test " ${ac_cv_header_security_pam_appl_h+set} " =set ; then
8333+
8334+ for ac_header in security/pam_appl.h
8335+ do
8336+ as_ac_Header=` echo" ac_cv_header_$ac_header " | $as_tr_sh `
8337+ if eval " test\"\$ {$as_ac_Header +set}\" = set" ; then
8338+ echo " $as_me :$LINENO : checking for$ac_header " >&5
8339+ echo $ECHO_N " checking for$ac_header ...$ECHO_C " >&6
8340+ if eval " test\"\$ {$as_ac_Header +set}\" = set" ; then
83378341echo $ECHO_N " (cached)$ECHO_C " >&6
83388342fi
8339- echo " $as_me :$LINENO : result:$ac_cv_header_security_pam_appl_h " >&5
8340- echo " ${ECHO_T} $ac_cv_header_security_pam_appl_h " >&6
8343+ echo " $as_me :$LINENO : result:` eval echo ' ${ ' $as_ac_Header ' } ' ` " >&5
8344+ echo " ${ECHO_T} ` eval echo ' ${ ' $as_ac_Header ' } ' ` " >&6
83418345else
83428346# Is the header compilable?
8343- echo " $as_me :$LINENO : checkingsecurity/pam_appl.h usability" >&5
8344- echo $ECHO_N " checkingsecurity/pam_appl.h usability...$ECHO_C " >&6
8347+ echo " $as_me :$LINENO : checking$ac_header usability" >&5
8348+ echo $ECHO_N " checking$ac_header usability...$ECHO_C " >&6
83458349cat> conftest.$ac_ext << _ACEOF
83468350#line$LINENO "configure"
83478351#include "confdefs.h"
83488352$ac_includes_default
8349- #include <security/pam_appl.h >
8353+ #include <$ac_header >
83508354_ACEOF
83518355rm -f conftest.$ac_objext
83528356if { (evalecho " $as_me :$LINENO :\" $ac_compile \" " )>&5
@@ -8371,12 +8375,12 @@ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
83718375echo " ${ECHO_T} $ac_header_compiler " >&6
83728376
83738377# Is the header present?
8374- echo " $as_me :$LINENO : checkingsecurity/pam_appl.h presence" >&5
8375- echo $ECHO_N " checkingsecurity/pam_appl.h presence...$ECHO_C " >&6
8378+ echo " $as_me :$LINENO : checking$ac_header presence" >&5
8379+ echo $ECHO_N " checking$ac_header presence...$ECHO_C " >&6
83768380cat> conftest.$ac_ext << _ACEOF
83778381#line$LINENO "configure"
83788382#include "confdefs.h"
8379- #include <security/pam_appl.h >
8383+ #include <$ac_header >
83808384_ACEOF
83818385if { (evalecho " $as_me :$LINENO :\" $ac_cpp conftest.$ac_ext \" " )>&5
83828386 (eval$ac_cpp conftest.$ac_ext )2> conftest.er1
@@ -8408,37 +8412,156 @@ echo "${ECHO_T}$ac_header_preproc" >&6
84088412# So? What about this header?
84098413case $ac_header_compiler :$ac_header_preproc in
84108414 yes:no )
8411- {echo " $as_me :$LINENO : WARNING:security/pam_appl.h : accepted by the compiler, rejected by the preprocessor!" >&5
8412- echo " $as_me : WARNING:security/pam_appl.h : accepted by the compiler, rejected by the preprocessor!" >&2 ; }
8413- {echo " $as_me :$LINENO : WARNING:security/pam_appl.h : proceeding with the preprocessor's result" >&5
8414- echo " $as_me : WARNING:security/pam_appl.h : proceeding with the preprocessor's result" >&2 ; };;
8415+ {echo " $as_me :$LINENO : WARNING:$ac_header : accepted by the compiler, rejected by the preprocessor!" >&5
8416+ echo " $as_me : WARNING:$ac_header : accepted by the compiler, rejected by the preprocessor!" >&2 ; }
8417+ {echo " $as_me :$LINENO : WARNING:$ac_header : proceeding with the preprocessor's result" >&5
8418+ echo " $as_me : WARNING:$ac_header : proceeding with the preprocessor's result" >&2 ; };;
84158419 no:yes )
8416- {echo " $as_me :$LINENO : WARNING:security/pam_appl.h : present but cannot be compiled" >&5
8417- echo " $as_me : WARNING:security/pam_appl.h : present but cannot be compiled" >&2 ; }
8418- {echo " $as_me :$LINENO : WARNING:security/pam_appl.h : check for missing prerequisite headers?" >&5
8419- echo " $as_me : WARNING:security/pam_appl.h : check for missing prerequisite headers?" >&2 ; }
8420- {echo " $as_me :$LINENO : WARNING:security/pam_appl.h : proceeding with the preprocessor's result" >&5
8421- echo " $as_me : WARNING:security/pam_appl.h : proceeding with the preprocessor's result" >&2 ; };;
8420+ {echo " $as_me :$LINENO : WARNING:$ac_header : present but cannot be compiled" >&5
8421+ echo " $as_me : WARNING:$ac_header : present but cannot be compiled" >&2 ; }
8422+ {echo " $as_me :$LINENO : WARNING:$ac_header : check for missing prerequisite headers?" >&5
8423+ echo " $as_me : WARNING:$ac_header : check for missing prerequisite headers?" >&2 ; }
8424+ {echo " $as_me :$LINENO : WARNING:$ac_header : proceeding with the preprocessor's result" >&5
8425+ echo " $as_me : WARNING:$ac_header : proceeding with the preprocessor's result" >&2 ; };;
84228426esac
8423- echo " $as_me :$LINENO : checking forsecurity/pam_appl.h " >&5
8424- echo $ECHO_N " checking forsecurity/pam_appl.h ...$ECHO_C " >&6
8425- if test " ${ac_cv_header_security_pam_appl_h +set}" =set ; then
8427+ echo " $as_me :$LINENO : checking for$ac_header " >&5
8428+ echo $ECHO_N " checking for$ac_header ...$ECHO_C " >&6
8429+ if eval " test\"\$ { $as_ac_Header +set}\ " = set" ; then
84268430echo $ECHO_N " (cached)$ECHO_C " >&6
84278431else
8428- ac_cv_header_security_pam_appl_h =$ac_header_preproc
8432+ eval " $as_ac_Header =$ac_header_preproc "
84298433fi
8430- echo " $as_me :$LINENO : result:$ac_cv_header_security_pam_appl_h " >&5
8431- echo " ${ECHO_T} $ac_cv_header_security_pam_appl_h " >&6
8434+ echo " $as_me :$LINENO : result:` eval echo ' ${ ' $as_ac_Header ' } ' ` " >&5
8435+ echo " ${ECHO_T} ` eval echo ' ${ ' $as_ac_Header ' } ' ` " >&6
84328436
84338437fi
8434- if test $ac_cv_header_security_pam_appl_h = yes; then
8435- :
8438+ if test ` evalecho ' ${' $as_ac_Header ' }' ` = yes; then
8439+ cat>> confdefs.h<< _ACEOF
8440+ #define` echo" HAVE_$ac_header " | $as_tr_cpp ` 1
8441+ _ACEOF
8442+
8443+ else
8444+
8445+ for ac_header in pam/pam_appl.h
8446+ do
8447+ as_ac_Header=` echo" ac_cv_header_$ac_header " | $as_tr_sh `
8448+ if eval " test\"\$ {$as_ac_Header +set}\" = set" ; then
8449+ echo " $as_me :$LINENO : checking for$ac_header " >&5
8450+ echo $ECHO_N " checking for$ac_header ...$ECHO_C " >&6
8451+ if eval " test\"\$ {$as_ac_Header +set}\" = set" ; then
8452+ echo $ECHO_N " (cached)$ECHO_C " >&6
8453+ fi
8454+ echo " $as_me :$LINENO : result:` evalecho ' ${' $as_ac_Header ' }' ` " >&5
8455+ echo " ${ECHO_T} ` evalecho ' ${' $as_ac_Header ' }' ` " >&6
8456+ else
8457+ # Is the header compilable?
8458+ echo " $as_me :$LINENO : checking$ac_header usability" >&5
8459+ echo $ECHO_N " checking$ac_header usability...$ECHO_C " >&6
8460+ cat> conftest.$ac_ext << _ACEOF
8461+ #line$LINENO "configure"
8462+ #include "confdefs.h"
8463+ $ac_includes_default
8464+ #include <$ac_header >
8465+ _ACEOF
8466+ rm -f conftest.$ac_objext
8467+ if { (evalecho " $as_me :$LINENO :\" $ac_compile \" " )>&5
8468+ (eval$ac_compile )2>&5
8469+ ac_status=$?
8470+ echo " $as_me :$LINENO :\$ ? =$ac_status " >&5
8471+ (exit$ac_status ); }&&
8472+ { ac_try=' test -s conftest.$ac_objext'
8473+ { (evalecho " $as_me :$LINENO :\" $ac_try \" " )>&5
8474+ (eval$ac_try )2>&5
8475+ ac_status=$?
8476+ echo " $as_me :$LINENO :\$ ? =$ac_status " >&5
8477+ (exit$ac_status ); }; }; then
8478+ ac_header_compiler=yes
8479+ else
8480+ echo " $as_me : failed program was:" >&5
8481+ cat conftest.$ac_ext >&5
8482+ ac_header_compiler=no
8483+ fi
8484+ rm -f conftest.$ac_objext conftest.$ac_ext
8485+ echo " $as_me :$LINENO : result:$ac_header_compiler " >&5
8486+ echo " ${ECHO_T} $ac_header_compiler " >&6
8487+
8488+ # Is the header present?
8489+ echo " $as_me :$LINENO : checking$ac_header presence" >&5
8490+ echo $ECHO_N " checking$ac_header presence...$ECHO_C " >&6
8491+ cat> conftest.$ac_ext << _ACEOF
8492+ #line$LINENO "configure"
8493+ #include "confdefs.h"
8494+ #include <$ac_header >
8495+ _ACEOF
8496+ if { (evalecho " $as_me :$LINENO :\" $ac_cpp conftest.$ac_ext \" " )>&5
8497+ (eval$ac_cpp conftest.$ac_ext )2> conftest.er1
8498+ ac_status=$?
8499+ egrep -v' ^ *\+' conftest.er1> conftest.err
8500+ rm -f conftest.er1
8501+ cat conftest.err>&5
8502+ echo " $as_me :$LINENO :\$ ? =$ac_status " >&5
8503+ (exit$ac_status ); }> /dev/null; then
8504+ if test -s conftest.err; then
8505+ ac_cpp_err=$ac_c_preproc_warn_flag
8506+ else
8507+ ac_cpp_err=
8508+ fi
8509+ else
8510+ ac_cpp_err=yes
8511+ fi
8512+ if test -z" $ac_cpp_err " ; then
8513+ ac_header_preproc=yes
8514+ else
8515+ echo " $as_me : failed program was:" >&5
8516+ cat conftest.$ac_ext >&5
8517+ ac_header_preproc=no
8518+ fi
8519+ rm -f conftest.err conftest.$ac_ext
8520+ echo " $as_me :$LINENO : result:$ac_header_preproc " >&5
8521+ echo " ${ECHO_T} $ac_header_preproc " >&6
8522+
8523+ # So? What about this header?
8524+ case $ac_header_compiler :$ac_header_preproc in
8525+ yes:no )
8526+ {echo " $as_me :$LINENO : WARNING:$ac_header : accepted by the compiler, rejected by the preprocessor!" >&5
8527+ echo " $as_me : WARNING:$ac_header : accepted by the compiler, rejected by the preprocessor!" >&2 ; }
8528+ {echo " $as_me :$LINENO : WARNING:$ac_header : proceeding with the preprocessor's result" >&5
8529+ echo " $as_me : WARNING:$ac_header : proceeding with the preprocessor's result" >&2 ; };;
8530+ no:yes )
8531+ {echo " $as_me :$LINENO : WARNING:$ac_header : present but cannot be compiled" >&5
8532+ echo " $as_me : WARNING:$ac_header : present but cannot be compiled" >&2 ; }
8533+ {echo " $as_me :$LINENO : WARNING:$ac_header : check for missing prerequisite headers?" >&5
8534+ echo " $as_me : WARNING:$ac_header : check for missing prerequisite headers?" >&2 ; }
8535+ {echo " $as_me :$LINENO : WARNING:$ac_header : proceeding with the preprocessor's result" >&5
8536+ echo " $as_me : WARNING:$ac_header : proceeding with the preprocessor's result" >&2 ; };;
8537+ esac
8538+ echo " $as_me :$LINENO : checking for$ac_header " >&5
8539+ echo $ECHO_N " checking for$ac_header ...$ECHO_C " >&6
8540+ if eval " test\"\$ {$as_ac_Header +set}\" = set" ; then
8541+ echo $ECHO_N " (cached)$ECHO_C " >&6
84368542else
8437- { {echo " $as_me :$LINENO : error: header file <security/pam_appl.h> is required for PAM" >&5
8438- echo " $as_me : error: header file <security/pam_appl.h> is required for PAM" >&2 ; }
8543+ eval " $as_ac_Header =$ac_header_preproc "
8544+ fi
8545+ echo " $as_me :$LINENO : result:` evalecho ' ${' $as_ac_Header ' }' ` " >&5
8546+ echo " ${ECHO_T} ` evalecho ' ${' $as_ac_Header ' }' ` " >&6
8547+
8548+ fi
8549+ if test ` evalecho ' ${' $as_ac_Header ' }' ` = yes; then
8550+ cat>> confdefs.h<< _ACEOF
8551+ #define` echo" HAVE_$ac_header " | $as_tr_cpp ` 1
8552+ _ACEOF
8553+
8554+ else
8555+ { {echo " $as_me :$LINENO : error: header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM." >&5
8556+ echo " $as_me : error: header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM." >&2 ; }
84398557 { (exit 1); exit 1; }; }
84408558fi
84418559
8560+ done
8561+
8562+ fi
8563+
8564+ done
84428565
84438566fi
84448567