aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-12-07 08:14:51 -0600
committerBrent Cook <bcook@openbsd.org>2015-12-07 08:14:51 -0600
commit28aaab43234226b2885d66d1e70f536cd7e438f0 (patch)
treedcf3836a7cdc97eadd59a2c28d95f551e3b7758c
parent19f58fdb1bf8052c0ea3ddd3230df07baaa4e843 (diff)
downloadportable-28aaab43234226b2885d66d1e70f536cd7e438f0.tar.gz
portable-28aaab43234226b2885d66d1e70f536cd7e438f0.tar.bz2
portable-28aaab43234226b2885d66d1e70f536cd7e438f0.zip
allow optionally installing nc(1) with '--enable-nc'
-rw-r--r--apps/nc/Makefile.am4
-rw-r--r--configure.ac4
2 files changed, 8 insertions, 0 deletions
diff --git a/apps/nc/Makefile.am b/apps/nc/Makefile.am
index 564080c..34c5cd3 100644
--- a/apps/nc/Makefile.am
+++ b/apps/nc/Makefile.am
@@ -2,7 +2,11 @@ include $(top_srcdir)/Makefile.am.common
2 2
3if BUILD_NC 3if BUILD_NC
4 4
5if ENABLE_NC
6bin_PROGRAMS = nc
7else
5noinst_PROGRAMS = nc 8noinst_PROGRAMS = nc
9endif
6 10
7EXTRA_DIST = nc.1 11EXTRA_DIST = nc.1
8 12
diff --git a/configure.ac b/configure.ac
index f15e746..6c60d15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,6 +114,10 @@ AM_CONDITIONAL([HOST_ASM_ELF_X86_64],
114AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64], 114AM_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
117AC_ARG_ENABLE([nc],
118 AS_HELP_STRING([--enable-nc], [Enable installing TLS-enabled nc(1)]))
119AM_CONDITIONAL([ENABLE_NC], [test "x$enable_nc" = xyes])
120
117# Check if time_t is sized correctly 121# Check if time_t is sized correctly
118AC_CHECK_SIZEOF([time_t], [time.h]) 122AC_CHECK_SIZEOF([time_t], [time.h])
119 123