mirror of git://anongit.mindrot.org/openssh.git
correction to Bug 123 fix
This commit is contained in:
parent
88c0cd8596
commit
7d2d1f1e67
|
@ -13,6 +13,7 @@
|
|||
reported by peak@argo.troja.mff.cuni.cz (Pavel Kankovsky)
|
||||
[configure.ac defines.h] modify previous SCO3 fix to not break Solaris 7
|
||||
[acconfig.h] remove unused HAVE_REGCOMP
|
||||
[configure.ac] put back in search for prngd-socket
|
||||
- (stevesk) openbsd-compat/base64.h: typo in comment
|
||||
- (bal) Update sshd_config CVSID
|
||||
- (bal) OpenBSD CVS Sync
|
||||
|
@ -52,6 +53,7 @@
|
|||
[ssh-keygen.c sshconnect2.c uuencode.c uuencode.h]
|
||||
more u_* fixes
|
||||
- (bal) Imported missing fatal.c and fixed up Makefile.in
|
||||
- (tim) [configure.ac] correction to Bug 123 fix
|
||||
|
||||
20020225
|
||||
- (bal) Last AIX patch. Moved aix_usrinfo() outside of do_setuserconext()
|
||||
|
@ -7725,4 +7727,4 @@
|
|||
- Wrote replacements for strlcpy and mkdtemp
|
||||
- Released 1.0pre1
|
||||
|
||||
$Id: ChangeLog,v 1.1888 2002/02/26 19:24:21 mouring Exp $
|
||||
$Id: ChangeLog,v 1.1889 2002/02/27 06:05:11 tim Exp $
|
||||
|
|
14
configure.ac
14
configure.ac
|
@ -1,4 +1,4 @@
|
|||
# $Id: configure.ac,v 1.21 2002/02/26 16:40:49 tim Exp $
|
||||
# $Id: configure.ac,v 1.22 2002/02/27 06:05:12 tim Exp $
|
||||
|
||||
AC_INIT
|
||||
AC_CONFIG_SRCDIR([ssh.c])
|
||||
|
@ -649,7 +649,12 @@ AC_ARG_WITH(pam,
|
|||
PAM_MSG="yes"
|
||||
|
||||
AC_DEFINE(USE_PAM)
|
||||
AC_SUBST(LIBPAM, ["-lpam -ldl"])
|
||||
if test $ac_cv_lib_dl_dlopen = yes; then
|
||||
LIBPAM="-lpam -ldl"
|
||||
else
|
||||
LIBPAM="-lpam"
|
||||
fi
|
||||
AC_SUBST(LIBPAM)
|
||||
fi
|
||||
]
|
||||
)
|
||||
|
@ -2250,7 +2255,10 @@ fi
|
|||
|
||||
dnl remove pam and dl because they are in $LIBPAM
|
||||
if test "$PAM_MSG" = yes ; then
|
||||
LIBS=`echo $LIBS | sed 's/-lpam -ldl //'`
|
||||
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
|
||||
|
||||
AC_EXEEXT
|
||||
|
|
Loading…
Reference in New Issue