diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-21 02:35:37 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-21 02:35:37 +0000 |
commit | 5eff0316a8bc81e43c8ca4223bc4f904bac5cbe4 (patch) | |
tree | 45f9ee712c3838bbe1f21cd8a44d62381323dc15 | |
parent | 866488b3406e6ff223382eaddd4490155a3cca2f (diff) |
- (bal) Fixed OpenSSL rework to use $saved_*. Patch by Tim Rice
<tim@multitalents.net>
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -1,5 +1,8 @@ | |||
1 | 20010221 | 1 | 20010221 |
2 | - (bal) Removed -L/usr/ucblib -R/usr/ucblib for Solaris platform. | 2 | - (bal) Removed -L/usr/ucblib -R/usr/ucblib for Solaris platform. |
3 | - (bal) Fixed OpenSSL rework to use $saved_*. Patch by Tim Rice | ||
4 | <tim@multitalents.net> | ||
5 | |||
3 | 20010220 | 6 | 20010220 |
4 | - (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and | 7 | - (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and |
5 | getcwd.c. | 8 | getcwd.c. |
@@ -4080,4 +4083,4 @@ | |||
4080 | - Wrote replacements for strlcpy and mkdtemp | 4083 | - Wrote replacements for strlcpy and mkdtemp |
4081 | - Released 1.0pre1 | 4084 | - Released 1.0pre1 |
4082 | 4085 | ||
4083 | $Id: ChangeLog,v 1.806 2001/02/20 18:22:38 mouring Exp $ | 4086 | $Id: ChangeLog,v 1.807 2001/02/21 02:35:37 mouring Exp $ |
diff --git a/configure.in b/configure.in index 160e1d2f7..53d036172 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.249 2001/02/20 18:22:39 mouring Exp $ | 1 | # $Id: configure.in,v 1.250 2001/02/21 02:35:37 mouring Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -606,12 +606,12 @@ AC_CACHE_CHECK([for OpenSSL directory], ac_cv_openssldir, [ | |||
606 | # Try to use $ssldir/lib if it exists, otherwise | 606 | # Try to use $ssldir/lib if it exists, otherwise |
607 | # $ssldir | 607 | # $ssldir |
608 | if test -d "$ssldir/lib" ; then | 608 | if test -d "$ssldir/lib" ; then |
609 | LDFLAGS="$LDFLAGS -L$ssldir/lib" | 609 | LDFLAGS="$saved_LDFLAGS -L$ssldir/lib" |
610 | if test ! -z "$need_dash_r" ; then | 610 | if test ! -z "$need_dash_r" ; then |
611 | LDFLAGS="$LDFLAGS -R$ssldir/lib" | 611 | LDFLAGS="$LDFLAGS -R$ssldir/lib" |
612 | fi | 612 | fi |
613 | else | 613 | else |
614 | LDFLAGS="$LDFLAGS -L$ssldir" | 614 | LDFLAGS="$saved_LDFLAGS -L$ssldir" |
615 | if test ! -z "$need_dash_r" ; then | 615 | if test ! -z "$need_dash_r" ; then |
616 | LDFLAGS="$LDFLAGS -R$ssldir" | 616 | LDFLAGS="$LDFLAGS -R$ssldir" |
617 | fi | 617 | fi |
@@ -668,12 +668,12 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; | |||
668 | # Try to use $ssldir/lib if it exists, otherwise | 668 | # Try to use $ssldir/lib if it exists, otherwise |
669 | # $ssldir | 669 | # $ssldir |
670 | if test -d "$ssldir/lib" ; then | 670 | if test -d "$ssldir/lib" ; then |
671 | LDFLAGS="$LDFLAGS -L$ssldir/lib" | 671 | LDFLAGS="$saved_LDFLAGS -L$ssldir/lib" |
672 | if test ! -z "$need_dash_r" ; then | 672 | if test ! -z "$need_dash_r" ; then |
673 | LDFLAGS="$LDFLAGS -R$ssldir/lib" | 673 | LDFLAGS="$LDFLAGS -R$ssldir/lib" |
674 | fi | 674 | fi |
675 | else | 675 | else |
676 | LDFLAGS="$LDFLAGS -L$ssldir" | 676 | LDFLAGS="$saved_LDFLAGS -L$ssldir" |
677 | if test ! -z "$need_dash_r" ; then | 677 | if test ! -z "$need_dash_r" ; then |
678 | LDFLAGS="$LDFLAGS -R$ssldir" | 678 | LDFLAGS="$LDFLAGS -R$ssldir" |
679 | fi | 679 | fi |