- (bal) Fixed OpenSSL rework to use $saved_*. Patch by Tim Rice
<tim@multitalents.net>
This commit is contained in:
parent
866488b340
commit
5eff0316a8
|
@ -1,5 +1,8 @@
|
||||||
20010221
|
20010221
|
||||||
- (bal) Removed -L/usr/ucblib -R/usr/ucblib for Solaris platform.
|
- (bal) Removed -L/usr/ucblib -R/usr/ucblib for Solaris platform.
|
||||||
|
- (bal) Fixed OpenSSL rework to use $saved_*. Patch by Tim Rice
|
||||||
|
<tim@multitalents.net>
|
||||||
|
|
||||||
20010220
|
20010220
|
||||||
- (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and
|
- (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and
|
||||||
getcwd.c.
|
getcwd.c.
|
||||||
|
@ -4080,4 +4083,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.806 2001/02/20 18:22:38 mouring Exp $
|
$Id: ChangeLog,v 1.807 2001/02/21 02:35:37 mouring Exp $
|
||||||
|
|
10
configure.in
10
configure.in
|
@ -1,4 +1,4 @@
|
||||||
# $Id: configure.in,v 1.249 2001/02/20 18:22:39 mouring Exp $
|
# $Id: configure.in,v 1.250 2001/02/21 02:35:37 mouring Exp $
|
||||||
|
|
||||||
AC_INIT(ssh.c)
|
AC_INIT(ssh.c)
|
||||||
|
|
||||||
|
@ -606,12 +606,12 @@ AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
|
||||||
# Try to use $ssldir/lib if it exists, otherwise
|
# Try to use $ssldir/lib if it exists, otherwise
|
||||||
# $ssldir
|
# $ssldir
|
||||||
if test -d "$ssldir/lib" ; then
|
if test -d "$ssldir/lib" ; then
|
||||||
LDFLAGS="$LDFLAGS -L$ssldir/lib"
|
LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
|
||||||
if test ! -z "$need_dash_r" ; then
|
if test ! -z "$need_dash_r" ; then
|
||||||
LDFLAGS="$LDFLAGS -R$ssldir/lib"
|
LDFLAGS="$LDFLAGS -R$ssldir/lib"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
LDFLAGS="$LDFLAGS -L$ssldir"
|
LDFLAGS="$saved_LDFLAGS -L$ssldir"
|
||||||
if test ! -z "$need_dash_r" ; then
|
if test ! -z "$need_dash_r" ; then
|
||||||
LDFLAGS="$LDFLAGS -R$ssldir"
|
LDFLAGS="$LDFLAGS -R$ssldir"
|
||||||
fi
|
fi
|
||||||
|
@ -668,12 +668,12 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ;
|
||||||
# Try to use $ssldir/lib if it exists, otherwise
|
# Try to use $ssldir/lib if it exists, otherwise
|
||||||
# $ssldir
|
# $ssldir
|
||||||
if test -d "$ssldir/lib" ; then
|
if test -d "$ssldir/lib" ; then
|
||||||
LDFLAGS="$LDFLAGS -L$ssldir/lib"
|
LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
|
||||||
if test ! -z "$need_dash_r" ; then
|
if test ! -z "$need_dash_r" ; then
|
||||||
LDFLAGS="$LDFLAGS -R$ssldir/lib"
|
LDFLAGS="$LDFLAGS -R$ssldir/lib"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
LDFLAGS="$LDFLAGS -L$ssldir"
|
LDFLAGS="$saved_LDFLAGS -L$ssldir"
|
||||||
if test ! -z "$need_dash_r" ; then
|
if test ! -z "$need_dash_r" ; then
|
||||||
LDFLAGS="$LDFLAGS -R$ssldir"
|
LDFLAGS="$LDFLAGS -R$ssldir"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue