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

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

2 files changed, 7 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 206efa7e9..84c0bd419 100644
--- 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
@@ -5277,4 +5279,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4499 2006/08/20 07:55:54 dtucker Exp $
+$Id: ChangeLog,v 1.4500 2006/08/20 09:55:02 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 9d30bff61..17de2173a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.351 2006/08/18 22:38:23 djm Exp $
+# $Id: configure.ac,v 1.352 2006/08/20 09:55:02 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.351 $)
+AC_REVISION($Revision: 1.352 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -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"