summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac14
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d525f643a..1fef0ca74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
13 reported by peak@argo.troja.mff.cuni.cz (Pavel Kankovsky) 13 reported by peak@argo.troja.mff.cuni.cz (Pavel Kankovsky)
14 [configure.ac defines.h] modify previous SCO3 fix to not break Solaris 7 14 [configure.ac defines.h] modify previous SCO3 fix to not break Solaris 7
15 [acconfig.h] remove unused HAVE_REGCOMP 15 [acconfig.h] remove unused HAVE_REGCOMP
16 [configure.ac] put back in search for prngd-socket
16 - (stevesk) openbsd-compat/base64.h: typo in comment 17 - (stevesk) openbsd-compat/base64.h: typo in comment
17 - (bal) Update sshd_config CVSID 18 - (bal) Update sshd_config CVSID
18 - (bal) OpenBSD CVS Sync 19 - (bal) OpenBSD CVS Sync
@@ -52,6 +53,7 @@
52 [ssh-keygen.c sshconnect2.c uuencode.c uuencode.h] 53 [ssh-keygen.c sshconnect2.c uuencode.c uuencode.h]
53 more u_* fixes 54 more u_* fixes
54 - (bal) Imported missing fatal.c and fixed up Makefile.in 55 - (bal) Imported missing fatal.c and fixed up Makefile.in
56 - (tim) [configure.ac] correction to Bug 123 fix
55 57
5620020225 5820020225
57 - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext() 59 - (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext()
@@ -7725,4 +7727,4 @@
7725 - Wrote replacements for strlcpy and mkdtemp 7727 - Wrote replacements for strlcpy and mkdtemp
7726 - Released 1.0pre1 7728 - Released 1.0pre1
7727 7729
7728$Id: ChangeLog,v 1.1888 2002/02/26 19:24:21 mouring Exp $ 7730$Id: ChangeLog,v 1.1889 2002/02/27 06:05:11 tim Exp $
diff --git a/configure.ac b/configure.ac
index 1f537868e..28da15261 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.21 2002/02/26 16:40:49 tim Exp $ 1# $Id: configure.ac,v 1.22 2002/02/27 06:05:12 tim Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -649,7 +649,12 @@ AC_ARG_WITH(pam,
649 PAM_MSG="yes" 649 PAM_MSG="yes"
650 650
651 AC_DEFINE(USE_PAM) 651 AC_DEFINE(USE_PAM)
652 AC_SUBST(LIBPAM, ["-lpam -ldl"]) 652 if test $ac_cv_lib_dl_dlopen = yes; then
653 LIBPAM="-lpam -ldl"
654 else
655 LIBPAM="-lpam"
656 fi
657 AC_SUBST(LIBPAM)
653 fi 658 fi
654 ] 659 ]
655) 660)
@@ -2250,7 +2255,10 @@ fi
2250 2255
2251dnl remove pam and dl because they are in $LIBPAM 2256dnl remove pam and dl because they are in $LIBPAM
2252if test "$PAM_MSG" = yes ; then 2257if test "$PAM_MSG" = yes ; then
2253 LIBS=`echo $LIBS | sed 's/-lpam -ldl //'` 2258 LIBS=`echo $LIBS | sed 's/-lpam //'`
2259fi
2260if test "$ac_cv_lib_pam_pam_set_item" = yes ; then
2261 LIBS=`echo $LIBS | sed 's/-ldl //'`
2254fi 2262fi
2255 2263
2256AC_EXEEXT 2264AC_EXEEXT