From: Guus Sliepen Date: Fri, 13 May 2011 10:37:26 +0000 (+0200) Subject: Reorder checks for libraries to allow ./configure LDFLAGS=-static. X-Git-Tag: release-1.0.15~9 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=03b7118139f57033659730afb740bf5cef7c961c;p=tinc Reorder checks for libraries to allow ./configure LDFLAGS=-static. OpenSSL depends on libdl and libz. When linking dynamically, libcrypto will automatically link with the other two libraries. However, when linking statically, these libraries need to be specified explicitly while linking. By moving the autoconf checks for libdl and libz before those for libcrypto, we ensure the latter test will be done with the proper libraries. --- diff --git a/configure.in b/configure.in index a6dd6d69..0f9c2f31 100644 --- a/configure.in +++ b/configure.in @@ -153,9 +153,9 @@ AC_CACHE_SAVE dnl These are defined in files in m4/ -tinc_OPENSSL tinc_ZLIB tinc_LZO +tinc_OPENSSL dnl Check if support for jumbograms is requested AC_ARG_ENABLE(jumbograms, diff --git a/m4/openssl.m4 b/m4/openssl.m4 index 59f0d450..254ea4ff 100644 --- a/m4/openssl.m4 +++ b/m4/openssl.m4 @@ -2,6 +2,20 @@ dnl Check to find the OpenSSL headers/libraries AC_DEFUN([tinc_OPENSSL], [ + case $host_os in + *mingw*) + ;; + *) + AC_CHECK_FUNC(dlopen, + [], + [AC_CHECK_LIB(dl, dlopen, + [LIBS="$LIBS -ldl"], + [AC_MSG_ERROR([OpenSSL depends on libdl.]); break] + )] + ) + ;; + esac + AC_ARG_WITH(openssl, AS_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]), [openssl="$withval" @@ -31,20 +45,6 @@ AC_DEFUN([tinc_OPENSSL], [AC_MSG_ERROR([OpenSSL libraries not found.])] ) -case $host_os in - *mingw*) - ;; - *) - AC_CHECK_FUNC(dlopen, - [], - [AC_CHECK_LIB(dl, dlopen, - [LIBS="$LIBS -ldl"], - [AC_MSG_ERROR([OpenSSL depends on libdl.]); break] - )] - ) - ;; -esac - AC_CHECK_FUNCS([RAND_pseudo_bytes EVP_EncryptInit_ex], , [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break], )