diff options
Diffstat (limited to '')
| -rw-r--r-- | configure.ac | 76 |
1 files changed, 4 insertions, 72 deletions
diff --git a/configure.ac b/configure.ac index 3aca617..f2a27a9 100644 --- a/configure.ac +++ b/configure.ac @@ -12,10 +12,8 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -AC_INIT([libressl], m4_esyscmd([tr -d '\n' < VERSION])) -AC_SUBST([LIBCRYPTO_VERSION], m4_esyscmd([tr -d '\n' < crypto/VERSION])) -AC_SUBST([LIBSSL_VERSION], m4_esyscmd([tr -d '\n' < ssl/VERSION])) -AC_SUBST([LIBTLS_VERSION], m4_esyscmd([tr -d '\n' < tls/VERSION])) +AC_INIT([libretls], m4_esyscmd([tr -d '\n' < VERSION])) +AC_SUBST([LIBTLS_VERSION], m4_esyscmd([tr -d '\n' < LIBTLS_VERSION])) AC_CANONICAL_HOST AM_INIT_AUTOMAKE([subdir-objects foreign]) @@ -40,47 +38,9 @@ AM_PROG_AS DISABLE_COMPILER_WARNINGS -# Check if the certhash command should be built -AC_CHECK_FUNCS([symlink]) -AM_CONDITIONAL([BUILD_CERTHASH], [test "x$ac_cv_func_symlink" = xyes]) - -# Check if funopen exists -AC_CHECK_FUNC([funopen]) - CHECK_LIBC_COMPAT -CHECK_SYSCALL_COMPAT CHECK_CRYPTO_COMPAT CHECK_VA_COPY -CHECK_B64_NTOP - -AC_ARG_WITH([openssldir], - AS_HELP_STRING([--with-openssldir], - [Set the default openssl directory]), - OPENSSLDIR="$withval" - AC_SUBST(OPENSSLDIR) -) -AM_CONDITIONAL([OPENSSLDIR_DEFINED], [test x$with_openssldir != x]) - -AC_ARG_ENABLE([extratests], - AS_HELP_STRING([--enable-extratests], [Enable extra tests that may be unreliable on some platforms])) -AM_CONDITIONAL([ENABLE_EXTRATESTS], [test "x$enable_extratests" = xyes]) - -AC_ARG_ENABLE([tests], - [AS_HELP_STRING([--disable-tests], [Disable tests @<:@default=enabled@:>@])], - [ - if ! test "x${enable_tests}" = "xyes"; then - enable_tests="no" - fi], - [enable_tests="yes"]) -AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = xyes]) - -AS_CASE([$host_cpu], - [*arm*], [host_cpu=arm], - [*amd64*], [host_cpu=x86_64 HOSTARCH=intel], - [i?86], [HOSTARCH=intel], - [x86_64], [HOSTARCH=intel] -) -AM_CONDITIONAL([HOST_CPU_IS_INTEL], [test "x$HOSTARCH" = "xintel"]) AC_MSG_CHECKING([if .gnu.warning accepts long strings]) AC_LINK_IFELSE([AC_LANG_SOURCE([[ @@ -94,42 +54,16 @@ int main() {return 0;} AC_MSG_RESULT(no) ]) -AC_ARG_ENABLE([asm], - AS_HELP_STRING([--disable-asm], [Disable assembly])) -AM_CONDITIONAL([OPENSSL_NO_ASM], [test "x$enable_asm" = "xno"]) - -# Conditionally enable assembly by default -AM_CONDITIONAL([HOST_ASM_ELF_ARM], - [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "arm" -a "x$enable_asm" != "xno"]) -AM_CONDITIONAL([HOST_ASM_ELF_X86_64], - [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) -AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64], - [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) -AM_CONDITIONAL([HOST_ASM_MASM_X86_64], - [test "x$HOST_ABI" = "xmasm" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) -AM_CONDITIONAL([HOST_ASM_MINGW64_X86_64], - [test "x$HOST_ABI" = "xmingw64" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) - # Check if time_t is sized correctly AC_CHECK_SIZEOF([time_t], [time.h]) +AX_CHECK_OPENSSL([], [AC_MSG_ERROR([unable to find OpenSSL])]) + AC_CONFIG_FILES([ Makefile include/Makefile - include/openssl/Makefile - crypto/Makefile - ssl/Makefile - tls/Makefile - tests/Makefile - apps/Makefile - apps/ocspcheck/Makefile - apps/openssl/Makefile - apps/nc/Makefile man/Makefile - libcrypto.pc - libssl.pc libtls.pc - openssl.pc ]) AM_CONDITIONAL([SMALL_TIME_T], [test "$ac_cv_sizeof_time_t" = "4"]) @@ -145,6 +79,4 @@ if test "$ac_cv_sizeof_time_t" = "4"; then fi fi -AC_REQUIRE_AUX_FILE([tap-driver.sh]) - AC_OUTPUT |