- (djm) Sync openbsd-compat/glob.c

[openssh.git] / configure.in

diff --git a/configure.in b/configure.in
index 10927d3b814d1606f75e1ecf7f5c46485555cb23..d1ffaa839b471db0043342e3a7dc94f71d9fdb87 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -595,22 +595,22 @@ 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="$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 @@ 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="$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