diff options
author | Brent Cook <bcook@openbsd.org> | 2015-12-07 08:24:41 -0600 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-12-07 08:24:41 -0600 |
commit | 4db1ad6797de0e64183833f04670bd99df25b2c5 (patch) | |
tree | 4eadf73243aa0da8aefeed2cd50feba10b378dac | |
parent | 28aaab43234226b2885d66d1e70f536cd7e438f0 (diff) | |
download | portable-4db1ad6797de0e64183833f04670bd99df25b2c5.tar.gz portable-4db1ad6797de0e64183833f04670bd99df25b2c5.tar.bz2 portable-4db1ad6797de0e64183833f04670bd99df25b2c5.zip |
installing nc(1) should imply building, even if not whitelisted
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | 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], | |||
114 | AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64], | 114 | AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64], |
115 | [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) | 115 | [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"]) |
116 | 116 | ||
117 | AC_ARG_ENABLE([nc], | ||
118 | AS_HELP_STRING([--enable-nc], [Enable installing TLS-enabled nc(1)])) | ||
119 | AM_CONDITIONAL([ENABLE_NC], [test "x$enable_nc" = xyes]) | ||
120 | |||
121 | # Check if time_t is sized correctly | 117 | # Check if time_t is sized correctly |
122 | AC_CHECK_SIZEOF([time_t], [time.h]) | 118 | AC_CHECK_SIZEOF([time_t], [time.h]) |
123 | 119 | ||
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 | |||
72 | *) ;; | 72 | *) ;; |
73 | esac | 73 | esac |
74 | 74 | ||
75 | AM_CONDITIONAL([BUILD_NC], [test x$BUILD_NC = xyes]) | 75 | AC_ARG_ENABLE([nc], |
76 | AS_HELP_STRING([--enable-nc], [Enable installing TLS-enabled nc(1)])) | ||
77 | AM_CONDITIONAL([ENABLE_NC], [test "x$enable_nc" = xyes]) | ||
78 | AM_CONDITIONAL([BUILD_NC], [test x$BUILD_NC = xyes -o "x$enable_nc" = xyes]) | ||
79 | |||
76 | AM_CONDITIONAL([HOST_AIX], [test x$HOST_OS = xaix]) | 80 | AM_CONDITIONAL([HOST_AIX], [test x$HOST_OS = xaix]) |
77 | AM_CONDITIONAL([HOST_CYGWIN], [test x$HOST_OS = xcygwin]) | 81 | AM_CONDITIONAL([HOST_CYGWIN], [test x$HOST_OS = xcygwin]) |
78 | AM_CONDITIONAL([HOST_DARWIN], [test x$HOST_OS = xdarwin]) | 82 | AM_CONDITIONAL([HOST_DARWIN], [test x$HOST_OS = xdarwin]) |