OSSH 2.5.2p2: Why is /usr/local/ put into the include & lib paths under Solaris?

[Damien Miller]

On Wed, 28 Mar 2001, Carson Gaspar wrote:

> > Many people and packages (like most of sunfreeware) put stuff in
> > /usr/local.
>
> So?

People used to complain that configure didn't find stuff in /usr/local,
now they complain that it does. I suppose we can't win.

Index: configure.in
===================================================================
RCS file: /var/cvs/openssh/configure.in,v
retrieving revision 1.270
diff -u -r1.270 configure.in
--- configure.in	2001/03/28 04:37:06	1.270
+++ configure.in	2001/03/28 10:40:14
@@ -595,22 +595,22 @@
 			# Try to use $ssldir/lib if it exists, otherwise
 			# $ssldir
 			if test -d "$ssldir/lib" ; then
-				LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
+				LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
 				if test ! -z "$need_dash_r" ; then
-					LDFLAGS="$LDFLAGS -R$ssldir/lib"
+					LDFLAGS="-R$ssldir/lib $LDFLAGS"
 				fi
 			else
-				LDFLAGS="$saved_LDFLAGS -L$ssldir"
+				LDFLAGS="-L$ssldir $saved_LDFLAGS"
 				if test ! -z "$need_dash_r" ; then
-					LDFLAGS="$LDFLAGS -R$ssldir"
+					LDFLAGS="-R$ssldir $LDFLAGS"
 				fi
 			fi
 			# Try to use $ssldir/include if it exists, otherwise
 			# $ssldir
 			if test -d "$ssldir/include" ; then
-				CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
+				CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
 			else
-				CPPFLAGS="$saved_CPPFLAGS -I$ssldir"
+				CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
 			fi
 		fi

@@ -657,22 +657,22 @@
 		# Try to use $ssldir/lib if it exists, otherwise
 		# $ssldir
 		if test -d "$ssldir/lib" ; then
-			LDFLAGS="$saved_LDFLAGS -L$ssldir/lib"
+			LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
 			if test ! -z "$need_dash_r" ; then
-				LDFLAGS="$LDFLAGS -R$ssldir/lib"
+				LDFLAGS="-R$ssldir/lib $LDFLAGS"
 			fi
 		else
-			LDFLAGS="$saved_LDFLAGS -L$ssldir"
+			LDFLAGS="-L$ssldir $saved_LDFLAGS"
 			if test ! -z "$need_dash_r" ; then
-				LDFLAGS="$LDFLAGS -R$ssldir"
+				LDFLAGS="-R$ssldir $LDFLAGS"
 			fi
 		fi
 		# Try to use $ssldir/include if it exists, otherwise
 		# $ssldir
 		if test -d "$ssldir/include" ; then
-			CPPFLAGS="$saved_CPPFLAGS -I$ssldir/include"
+			CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
 		else
-			CPPFLAGS="$saved_CPPFLAGS -I$ssldir"
+			CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
 		fi
 	fi
 fi


-- 
| Damien Miller <djm at mindrot.org> \ ``E-mail attachments are the poor man's
| http://www.mindrot.org          /   distributed filesystem'' - Dan Geer