diff options
| author | Rob Austein <sra@hactrn.net> | 2011-04-25 20:24:59 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-04-25 20:24:59 +0000 |
| commit | cf99bda83149c2a14485a02e27e809c9621ffd89 (patch) | |
| tree | 398d1da6ff63bf6cb8caea03121527ac8184c008 | |
| parent | f8cabfe66d12dbe4ecd146988b09102f3ab8d7e2 (diff) | |
Reorder CFLAGS and LDFLAGS to avoid search path problems
svn path=/configure; revision=3791
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 10 insertions, 4 deletions
@@ -4268,8 +4268,11 @@ $as_echo_n "checking what glob to use when renaming OpenSSL shared libraries... { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_SO_GLOB" >&5 $as_echo "$OPENSSL_SO_GLOB" >&6; } - CFLAGS="$CFLAGS -I\${abs_top_srcdir}/openssl/openssl/include" - LIBS="$LIBS \${abs_top_builddir}/openssl/openssl/libssl.a \${abs_top_builddir}/openssl/openssl/libcrypto.a" + # NB: We put our OpenSSL directory at the *front* of the + # search list to preempt conflicts with system copies. + + CFLAGS="-I\${abs_top_srcdir}/openssl/openssl/include $CFLAGS" + LIBS="\${abs_top_builddir}/openssl/openssl/libssl.a \${abs_top_builddir}/openssl/openssl/libcrypto.a $LIBS" else LIBS="$LIBS -lssl -lcrypto" fi diff --git a/configure.ac b/configure.ac index 30835d67..fa0f76f3 100644 --- a/configure.ac +++ b/configure.ac @@ -324,8 +324,11 @@ then AC_SUBST(OPENSSL_SO_GLOB) AC_MSG_RESULT([$OPENSSL_SO_GLOB]) - CFLAGS="$CFLAGS -I\${abs_top_srcdir}/openssl/openssl/include" - LIBS="$LIBS \${abs_top_builddir}/openssl/openssl/libssl.a \${abs_top_builddir}/openssl/openssl/libcrypto.a" + # NB: We put our OpenSSL directory at the *front* of the + # search list to preempt conflicts with system copies. + + CFLAGS="-I\${abs_top_srcdir}/openssl/openssl/include $CFLAGS" + LIBS="\${abs_top_builddir}/openssl/openssl/libssl.a \${abs_top_builddir}/openssl/openssl/libcrypto.a $LIBS" else LIBS="$LIBS -lssl -lcrypto" fi |