Better checks for OpenSSL. I think it can now detect almost all conceivable installations.
This commit is contained in:
parent
72c3776d6a
commit
9ddb37cee0
1 changed files with 54 additions and 27 deletions
|
@ -3,49 +3,76 @@ dnl Check to find the OpenSSL headers/libraries
|
|||
|
||||
AC_DEFUN(tinc_OPENSSL,
|
||||
[
|
||||
|
||||
AC_CACHE_CHECK([for openssl], tinc_cv_openssl_include,
|
||||
AC_ARG_WITH(openssl,
|
||||
[ --with-openssl=DIR OpenSSL library and headers prefix],
|
||||
[openssl_lib="$withval/lib"
|
||||
openssl_include="$withval/include"]
|
||||
)
|
||||
AC_CACHE_CHECK([for openssl headers], tinc_cv_openssl_include,
|
||||
[
|
||||
AC_ARG_WITH(openssl,
|
||||
[ --with-openssl=DIR OpenSSL library and headers prefix],
|
||||
[echo -ne 'prefix...'
|
||||
openssl_lib="$withval/lib"
|
||||
openssl_include="$withval/include"]
|
||||
)
|
||||
AC_ARG_WITH(openssl-include,
|
||||
[ --with-openssl-include=DIR OpenSSL headers directory],
|
||||
[echo -ne 'includes...'
|
||||
openssl_include="$withvall"]
|
||||
[tinc_cv_openssl_include="$withval"],
|
||||
[if test "x$openssl_include" = "x" ; then
|
||||
tinc_cv_openssl_include="none given"
|
||||
else
|
||||
tinc_cv_openssl_include=$openssl_include
|
||||
fi]
|
||||
)
|
||||
])
|
||||
AC_CACHE_CHECK([for openssl libraries], tinc_cv_openssl_lib,
|
||||
[
|
||||
AC_ARG_WITH(openssl-lib,
|
||||
[ --with-openssl-lib=DIR OpenSSL library directory],
|
||||
[echo -ne 'libraries...'
|
||||
openssl_lib="$withval"]
|
||||
[tinc_cv_openssl_lib="$withval"],
|
||||
[if test "x$openssl_lib" = "x" ; then
|
||||
tinc_cv_openssl_lib="none given"
|
||||
else
|
||||
tinc_cv_openssl_lib=$openssl_lib
|
||||
fi]
|
||||
)
|
||||
|
||||
if test "x$openssl_lib" != "x" ; then
|
||||
LIBS="$LIBS -L$openssl_lib"
|
||||
fi
|
||||
if test "x$openssl_include" != "x" ; then
|
||||
INCLUDES="$INCLUDES -I$openssl_include"
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([done.])
|
||||
])
|
||||
|
||||
if test "$openssl_lib" != "none given" ; then
|
||||
LIBS="$LIBS -L$tinc_cv_openssl_lib"
|
||||
fi
|
||||
if test "$openssl_include" != "none given" ; then
|
||||
INCLUDES="$INCLUDES -I$tinc_cv_openssl_include"
|
||||
fi
|
||||
|
||||
osi=none
|
||||
AC_CHECK_HEADERS(evp.h rsa.h,
|
||||
[osi=found
|
||||
break])
|
||||
|
||||
if test "$osi" = "none" ; then
|
||||
AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h,
|
||||
[osi=found
|
||||
break])
|
||||
fi
|
||||
|
||||
|
||||
libcrypto=none
|
||||
AC_CHECK_LIB(crypto, SHA1_version, [
|
||||
libcrypto=yes
|
||||
])
|
||||
|
||||
if test "$osi" = "found" ; then
|
||||
AC_CHECK_LIB(crypto, SHA1_version, [
|
||||
libcrypto=yes
|
||||
])
|
||||
fi
|
||||
|
||||
if test $libcrypto = none; then
|
||||
AC_MSG_ERROR(
|
||||
[It seems like OpenSSL is not installed on this system. But perhaps
|
||||
cat <<EOF
|
||||
|
||||
It seems like OpenSSL is not installed on this system. But perhaps
|
||||
you need to supply the exact location of the headers and libraries.
|
||||
You can try running configure with the --with-openssl=/DIRECTORY
|
||||
parameter. If you installed the headers and libraries in a different
|
||||
location you can use --with-openssl-include=/DIR and
|
||||
--with-openssl-lib=/DIR.])
|
||||
--with-openssl-lib=/DIR.
|
||||
|
||||
EOF
|
||||
|
||||
AC_MSG_ERROR(OpenSSL not found.)
|
||||
|
||||
else
|
||||
LIBS="$LIBS -lcrypto"
|
||||
|
|
Loading…
Reference in a new issue