diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2001-06-20 07:43:36 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2001-06-20 07:43:36 +0000 |
| commit | 4ac7a087c62d0c8908d0a5cc7ea351931f49b09d (patch) | |
| tree | 3049179b8b6883a25f49eafce529f66a07cd6be8 | |
| parent | 2d5039184e036d3487aaf8a9529a7adfca9b6070 (diff) | |
when --with-ssl is used with a specified path, we use that path immediately
to check libs and include files in, we don't check the default places first!
| -rw-r--r-- | configure.in | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 5f27a4dcc..3cdb8c9d8 100644 --- a/configure.in +++ b/configure.in @@ -583,13 +583,20 @@ then else dnl Check for and handle argument to --with-ssl. - EXTRA_SSL= + + dnl save the pre-ssl check flags for a while + CLEANLDFLAGS="$LDFLAGS" + CLEANCPPFLAGS="$CPPFLAGS" case "$OPT_SSL" in yes) EXTRA_SSL=/usr/local/ssl ;; *) - EXTRA_SSL=$OPT_SSL ;; + dnl check the given spot right away! + EXTRA_SSL=$OPT_SSL + LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib" + CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include" + ;; esac AC_CHECK_LIB(crypto, CRYPTO_lock,[ @@ -597,8 +604,8 @@ else ],[ OLDLDFLAGS="$LDFLAGS" OLDCPPFLAGS="$CPPFLAGS" - LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib" - CPPFLAGS="$CPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include" + LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib" + CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include" AC_CHECK_LIB(crypto, CRYPTO_add_lock,[ HAVECRYPTO="yes" ], [ LDFLAGS="$OLDLDFLAGS" |