summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in10
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index de28aace..bd277fac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
20010221
- (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
- (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and
getcwd.c.
@@ -4080,4 +4083,4 @@
- Wrote replacements for strlcpy and mkdtemp
- 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 $
diff --git a/configure.in b/configure.in
index 160e1d2f..53d03617 100644
--- a/configure.in
+++ b/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)
@@ -606,12 +606,12 @@ AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [
# Try to use $ssldir/lib if it exists, otherwise
# $ssldir
if test -d "$ssldir/lib" ; then
- LDFLAGS="$LDFLAGS -L$ssldir/lib"
+ LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
if test ! -z "$need_dash_r" ; then
LDFLAGS="$LDFLAGS -R$ssldir/lib"
fi
else
- LDFLAGS="$LDFLAGS -L$ssldir"
+ LDFLAGS="$saved_LDFLAGS -L$ssldir"
if test ! -z "$need_dash_r" ; then
LDFLAGS="$LDFLAGS -R$ssldir"
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
# $ssldir
if test -d "$ssldir/lib" ; then
- LDFLAGS="$LDFLAGS -L$ssldir/lib"
+ LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
if test ! -z "$need_dash_r" ; then
LDFLAGS="$LDFLAGS -R$ssldir/lib"
fi
else
- LDFLAGS="$LDFLAGS -L$ssldir"
+ LDFLAGS="$saved_LDFLAGS -L$ssldir"
if test ! -z "$need_dash_r" ; then
LDFLAGS="$LDFLAGS -R$ssldir"
fi