moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Stopped linking to the SSL libs if a full installation isn't found. 

Removed a redundant library check.
This commit is contained in:
Dan Fandrich 2005-03-09 18:40:41 +00:00
parent d26cfd5791
commit c4f7570a23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -761,11 +761,13 @@ else
AC_CHECK_LIB(crypto, CRYPTO_lock,[ AC_CHECK_LIB(crypto, CRYPTO_lock,[
HAVECRYPTO="yes" HAVECRYPTO="yes"
LIBS="-lcrypto $LIBS"
],[ ],[
LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib$libsuff" LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib$libsuff"
CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include" CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
AC_CHECK_LIB(crypto, CRYPTO_add_lock,[ AC_CHECK_LIB(crypto, CRYPTO_add_lock,[
HAVECRYPTO="yes" ], [ HAVECRYPTO="yes"
LIBS="-lcrypto $LIBS"], [
LDFLAGS="$CLEANLDFLAGS" LDFLAGS="$CLEANLDFLAGS"
CPPFLAGS="$CLEANCPPFLAGS" CPPFLAGS="$CLEANCPPFLAGS"
LIBS="$CLEANLIBS" LIBS="$CLEANLIBS"
@ -794,7 +796,6 @@ else
AC_MSG_RESULT(no)] AC_MSG_RESULT(no)]
) )
AC_CHECK_LIB(crypto, CRYPTO_add_lock)
AC_CHECK_LIB(ssl, SSL_connect) AC_CHECK_LIB(ssl, SSL_connect)
if test "$ac_cv_lib_ssl_SSL_connect" != yes; then if test "$ac_cv_lib_ssl_SSL_connect" != yes; then
@ -832,7 +833,11 @@ else
dnl is there a pkcs12.h header present? dnl is there a pkcs12.h header present?
AC_CHECK_HEADERS(openssl/pkcs12.h) AC_CHECK_HEADERS(openssl/pkcs12.h)
else
LIBS="$CLEANLIBS"
fi 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" USE_SSLEAY="$OPENSSL_ENABLED"
AC_SUBST(USE_SSLEAY) AC_SUBST(USE_SSLEAY)