diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2005-03-09 18:40:41 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2005-03-09 18:40:41 +0000 |
| commit | c4f7570a235a0d7b73b38bed6b810c345dcf8226 (patch) | |
| tree | c36262cc5618b9abd92a4215114855062e9c059f | |
| parent | d26cfd5791c13daa7b263368959f0ec85774402e (diff) | |
Stopped linking to the SSL libs if a full installation isn't found.
Removed a redundant library check.
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 864abf534..e04088b01 100644 --- a/configure.ac +++ b/configure.ac @@ -761,11 +761,13 @@ else AC_CHECK_LIB(crypto, CRYPTO_lock,[ HAVECRYPTO="yes" + LIBS="-lcrypto $LIBS" ],[ LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib$libsuff" CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include" AC_CHECK_LIB(crypto, CRYPTO_add_lock,[ - HAVECRYPTO="yes" ], [ + HAVECRYPTO="yes" + LIBS="-lcrypto $LIBS"], [ LDFLAGS="$CLEANLDFLAGS" CPPFLAGS="$CLEANCPPFLAGS" LIBS="$CLEANLIBS" @@ -794,7 +796,6 @@ else AC_MSG_RESULT(no)] ) - AC_CHECK_LIB(crypto, CRYPTO_add_lock) AC_CHECK_LIB(ssl, SSL_connect) if test "$ac_cv_lib_ssl_SSL_connect" != yes; then @@ -832,7 +833,11 @@ else dnl is there a pkcs12.h header present? AC_CHECK_HEADERS(openssl/pkcs12.h) + else + LIBS="$CLEANLIBS" fi + dnl USE_SSLEAY is the historical name for what configure calls + dnl OPENSSL_ENABLED; the names should really be unified USE_SSLEAY="$OPENSSL_ENABLED" AC_SUBST(USE_SSLEAY) |