OpenSSH 2.5.0p1

[Tim Rice]

On Sun, 18 Feb 2001 mouring at etoh.eviladmin.org wrote:

> On Sat, 17 Feb 2001, Gert Doering wrote:
> 
> > Hi,
> > 
> > On Sat, Feb 17, 2001 at 11:17:05AM -0600, mouring at etoh.eviladmin.org wrote:
> > > However I know there was a reason for us -L$ssldir and -L$ssldir/lib.  And
> > > I would rather see a solution that keeps both tests in place if possible. 
> > 
> > The double "-L" breaks the linker on SCO 3.0 (too many -L).
> > 
> > Why not really *check* the -L path for "$ssldir/(lib/)?libcrypto.a", and
> > use only the directory where it can be found?
> > 
> I was hoping someone else with this problem would provide the
> patch.. However.  If this is acceptable to all parties... 
> 
> Grant I refuse to claim it's clean, pretty, what not.. It's almost 1am my
> time and I'm going to bed.  I can state it works under Linux Redhat 7.0
> and I've done no other other testing.
[snip]
> 

Well, that patch didn't work but this one does.

> 

-- 
Tim Rice				Multitalents	(707) 887-1469
tim at multitalents.net

-------------- next part --------------
--- openssh_cvs/configure.in.old	Sun Feb 18 11:04:38 2001
+++ openssh_cvs/configure.in	Sun Feb 18 23:26:30 2001
@@ -596,10 +596,18 @@
 
 	for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
 		if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
-			LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
+			if test -f "$ssldir/lib/libcrypto.a" -o -f "$ssldir/lib/libcrypto.so"; then
+				LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
+			else
+				LDFLAGS="$saved_LDFLAGS -L$ssldir"
+			fi
 			CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
 			if test ! -z "$need_dash_r" ; then
-				LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
+				if test -f "$ssldir/lib/libcrypto.a" -o -f "$ssldir/lib/libcrypto.so"; then
+					LDFLAGS="$LDFLAGS -R$ssldir/lib"
+				else
+					LDFLAGS="$LDFLAGS -R$ssldir"
+				fi
 			fi
 		else
 			LDFLAGS="$saved_LDFLAGS"
@@ -649,9 +657,17 @@
 
 	if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
 		CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
-		LDFLAGS="$saved_LDFLAGS -L$ssldir/lib -L$ssldir"
+		if test -f "$ssldir/lib/libcrypto.a" -o -f "$ssldir/lib/libcrypto.so"; then
+			LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
+		else
+			LDFLAGS="$saved_LDFLAGS -L$ssldir"
+		fi
 		if test ! -z "$need_dash_r" ; then
-			LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir"
+			if test -f "$ssldir/lib/libcrypto.a" -o -f "$ssldir/lib/libcrypto.so"; then
+				LDFLAGS="$LDFLAGS -R$ssldir/lib"
+			else
+				LDFLAGS="$LDFLAGS -R$ssldir"
+			fi
 		fi
 		if test ! -z "$blibpath" ; then
 			blibpath="$blibpath:$ssldir:$ssldir/lib"