- (dtucker) [configure.ac] Save $LIBS during PAM library tests and restore

   afterward.  Removes the need to mangle $LIBS later to remove -lpam and -ldl.

diff --git a/ChangeLog b/ChangeLog
index 032cf14510e52d375e3f10792b1a87ca9c40f098..7c9651abc03d64c24faf37104fb312def181217b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20060820
  - (dtucker) [log.c] Move ifdef to prevent unused variable warning.
+ - (dtucker) [configure.ac] Save $LIBS during PAM library tests and restore
+   afterward.  Removes the need to mangle $LIBS later to remove -lpam and -ldl.
 
 20060819
  - (djm) OpenBSD CVS Sync

diff --git a/configure.ac b/configure.ac
index 85b076e7cd589c8cbf8259b040af7eb99e9cf738..cffd1eff1b72e9f3cf2d88b5964407885e4a63c3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1691,10 +1691,12 @@ AC_ARG_WITH(pam,
                                AC_MSG_ERROR([PAM headers not found])
                        fi
 
+                       saved_LIBS="$LIBS"
                        AC_CHECK_LIB(dl, dlopen, , )
                        AC_CHECK_LIB(pam, pam_set_item, , AC_MSG_ERROR([*** libpam missing]))
                        AC_CHECK_FUNCS(pam_getenvlist)
                        AC_CHECK_FUNCS(pam_putenv)
+                       LIBS="$saved_LIBS"
 
                        PAM_MSG="yes"
 
@@ -3820,14 +3822,6 @@ if test ! -z "$blibpath" ; then
        AC_MSG_WARN([Please check and edit blibpath in LDFLAGS in Makefile])
 fi
 
-dnl remove pam and dl because they are in $LIBPAM
-if test "$PAM_MSG" = yes ; then
-       LIBS=`echo $LIBS | sed 's/-lpam //'`
-fi
-if test "$ac_cv_lib_pam_pam_set_item" = yes ; then
-       LIBS=`echo $LIBS | sed 's/-ldl //'`
-fi
-
 dnl Adding -Werror to CFLAGS early prevents configure tests from running.
 dnl Add now.
 CFLAGS="$CFLAGS $werror_flags"