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!
This commit is contained in:
Родитель
2d5039184e
Коммит
4ac7a087c6
15
configure.in
15
configure.in
|
@ -583,13 +583,20 @@ then
|
||||||
else
|
else
|
||||||
|
|
||||||
dnl Check for and handle argument to --with-ssl.
|
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
|
case "$OPT_SSL" in
|
||||||
yes)
|
yes)
|
||||||
EXTRA_SSL=/usr/local/ssl ;;
|
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
|
esac
|
||||||
|
|
||||||
AC_CHECK_LIB(crypto, CRYPTO_lock,[
|
AC_CHECK_LIB(crypto, CRYPTO_lock,[
|
||||||
|
@ -597,8 +604,8 @@ else
|
||||||
],[
|
],[
|
||||||
OLDLDFLAGS="$LDFLAGS"
|
OLDLDFLAGS="$LDFLAGS"
|
||||||
OLDCPPFLAGS="$CPPFLAGS"
|
OLDCPPFLAGS="$CPPFLAGS"
|
||||||
LDFLAGS="$LDFLAGS -L$EXTRA_SSL/lib"
|
LDFLAGS="$CLEANLDFLAGS -L$EXTRA_SSL/lib"
|
||||||
CPPFLAGS="$CPPFLAGS -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" ], [
|
||||||
LDFLAGS="$OLDLDFLAGS"
|
LDFLAGS="$OLDLDFLAGS"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче