diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2009-02-04 23:33:34 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2009-02-04 23:33:34 +0000 |
| commit | 4b441ebac57432a9ab9fd33313c4ee8fac6aaf26 (patch) | |
| tree | 1afc26a867d7c13305269ece94121e1f7ab305ee | |
| parent | 01140217f5bee693045403901abb4a32cc4f0fe0 (diff) | |
Don't add the standard /usr/lib or /usr/include paths to LDFLAGS and CPPFLAGS
(respectively) when --with-ssl=/usr is used (patch based on FreeBSD).
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 9 insertions, 2 deletions
@@ -6,6 +6,10 @@ Changelog +Daniel Fandrich (4 Feb 2009) +- Don't add the standard /usr/lib or /usr/include paths to LDFLAGS and CPPFLAGS + (respectively) when --with-ssl=/usr is used (patch based on FreeBSD). + Daniel Stenberg (3 Feb 2009) - Hidemoto Nakada provided a small fix that makes it possible to get the CURLINFO_CONTENT_LENGTH_DOWNLOAD size from file:// "transfers" with diff --git a/configure.ac b/configure.ac index 4275f3325..063025004 100644 --- a/configure.ac +++ b/configure.ac @@ -1171,8 +1171,11 @@ if test X"$OPT_SSL" != Xno; then PKGTEST="no" PREFIX_OPENSSL=$OPT_SSL LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff" - LDFLAGS="$LDFLAGS -L$LIB_OPENSSL" - CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include" + if [ "$PREFIX_OPENSSL" != "/usr" ] ; then + LDFLAGS="$LDFLAGS -L$LIB_OPENSSL" + CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include" + fi + CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include/openssl" ;; esac |