From 4db1ad6797de0e64183833f04670bd99df25b2c5 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 7 Dec 2015 08:24:41 -0600 Subject: installing nc(1) should imply building, even if not whitelisted --- configure.ac | 4 ---- m4/check-os-options.m4 | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6c60d15..f15e746 100644 --- a/configure.ac +++ b/configure.ac @@ -114,10 +114,6 @@ AM_CONDITIONAL([HOST_ASM_ELF_X86_64], AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64], [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) -AC_ARG_ENABLE([nc], - AS_HELP_STRING([--enable-nc], [Enable installing TLS-enabled nc(1)])) -AM_CONDITIONAL([ENABLE_NC], [test "x$enable_nc" = xyes]) - # Check if time_t is sized correctly AC_CHECK_SIZEOF([time_t], [time.h]) diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 index cbb8c45..b85516c 100644 --- a/m4/check-os-options.m4 +++ b/m4/check-os-options.m4 @@ -72,7 +72,11 @@ case $host_os in *) ;; esac -AM_CONDITIONAL([BUILD_NC], [test x$BUILD_NC = xyes]) +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]) + AM_CONDITIONAL([HOST_AIX], [test x$HOST_OS = xaix]) AM_CONDITIONAL([HOST_CYGWIN], [test x$HOST_OS = xcygwin]) AM_CONDITIONAL([HOST_DARWIN], [test x$HOST_OS = xdarwin]) -- cgit v1.2.3-55-g6feb