From be8eb3b67ce4718ca94287a68e0babc715afcd21 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Sun, 18 Apr 2021 17:20:54 -0400 Subject: Import LibreSSL 3.3.2 --- configure.ac | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 3aca617..fdf72ee 100644 --- a/configure.ac +++ b/configure.ac @@ -110,9 +110,6 @@ AM_CONDITIONAL([HOST_ASM_MASM_X86_64], 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]) - AC_CONFIG_FILES([ Makefile include/Makefile @@ -132,18 +129,14 @@ AC_CONFIG_FILES([ openssl.pc ]) -AM_CONDITIONAL([SMALL_TIME_T], [test "$ac_cv_sizeof_time_t" = "4"]) -if test "$ac_cv_sizeof_time_t" = "4"; then - AC_DEFINE([SMALL_TIME_T]) - echo " ** Warning, this system is unable to represent times past 2038" - echo " ** It will behave incorrectly when handling valid RFC5280 dates" - - if test "$host_os" = "mingw32" ; then - echo " **" - echo " ** You can solve this by adjusting the build flags in your" - echo " ** mingw-w64 toolchain. Refer to README.windows for details." - fi -fi +AC_ARG_ENABLE([nc], + AS_HELP_STRING([--enable-nc], [Enable installing TLS-enabled nc(1)])) +AM_CONDITIONAL([ENABLE_NC], [test "x$enable_nc" = xyes]) +AM_CONDITIONAL([BUILD_NC], [test x$BUILD_NC = xyes -o "x$enable_nc" = xyes]) + +AC_ARG_ENABLE([libtls-only], + AS_HELP_STRING([--enable-libtls-only], [Enable installing libtls only])) +AM_CONDITIONAL([ENABLE_LIBTLS_ONLY], [test "x$enable_libtls_only" = xyes]) AC_REQUIRE_AUX_FILE([tap-driver.sh]) -- cgit 1.4.1