From b90786a5ef9cfb732f71e095b0b8da51534fce73 Mon Sep 17 00:00:00 2001 From: dmiller Date: Wed, 27 Sep 2017 21:29:31 +0000 Subject: [PATCH] Regen configure scripts --- nbase/configure | 32 +++++++++++++++----- ncat/configure | 20 +++++++++++-- nping/configure | 72 +++++++++++++++++++++++++++++++++------------ nsock/src/configure | 50 +++++++++++++++++++++---------- 4 files changed, 130 insertions(+), 44 deletions(-) diff --git a/nbase/configure b/nbase/configure index 38bee83e7..0bc5792f7 100755 --- a/nbase/configure +++ b/nbase/configure @@ -659,6 +659,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -732,6 +733,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -984,6 +986,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1121,7 +1132,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1274,6 +1285,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -3864,7 +3876,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_has_sa_len" >&5 $as_echo "$ac_cv_sockaddr_has_sa_len" >&6; } if test $ac_cv_sockaddr_has_sa_len = yes ; then - $as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h + +$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h fi @@ -4796,7 +4809,8 @@ $as_echo "$ac_cv_define_sockaddr_in6" >&6; } if test "$ac_cv_define_sockaddr_in6" = "yes"; then have_sockaddr_in6=1 - $as_echo "#define HAVE_SOCKADDR_IN6 1" >>confdefs.h + +$as_echo "#define HAVE_SOCKADDR_IN6 1" >>confdefs.h else have_sockaddr_in6=0 @@ -4849,7 +4863,8 @@ $as_echo "$ac_cv_define_sockaddr_storage" >&6; } if test "$ac_cv_define_sockaddr_storage" = "yes"; then have_sockaddr_storage=1 - $as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h + +$as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h else have_sockaddr_storage=0 @@ -4902,7 +4917,8 @@ $as_echo "$ac_cv_define_af_inet6" >&6; } if test "$ac_cv_define_af_inet6" = "yes"; then have_af_inet6=1 - $as_echo "#define HAVE_AF_INET6 1" >>confdefs.h + +$as_echo "#define HAVE_AF_INET6 1" >>confdefs.h else have_af_inet6=0 @@ -4955,7 +4971,8 @@ esac fi if test "$have_ipv6" = "1"; then - $as_echo "#define HAVE_IPV6 1" >>confdefs.h + +$as_echo "#define HAVE_IPV6 1" >>confdefs.h fi @@ -5134,7 +5151,8 @@ fi fi if test "$use_openssl" = "yes"; then - $as_echo "#define HAVE_OPENSSL 1" >>confdefs.h + +$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h fi diff --git a/ncat/configure b/ncat/configure index 2ab6e9e33..955eaf41f 100755 --- a/ncat/configure +++ b/ncat/configure @@ -680,6 +680,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -756,6 +757,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1008,6 +1010,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1145,7 +1156,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1298,6 +1309,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -5004,7 +5016,8 @@ if test $have_libpcap = yes; then PCAP_BUILD="" PCAP_CLEAN="" PCAP_DIST_CLEAN="" - $as_echo "#define HAVE_LIBPCAP 1" >>confdefs.h + +$as_echo "#define HAVE_LIBPCAP 1" >>confdefs.h else if test "${LIBPCAP_INC+set}" = "set"; then @@ -5666,7 +5679,8 @@ $as_echo "no" >&6; } LUA_BUILD="build-lua" LUA_CLEAN="clean-lua" LUA_DIST_CLEAN="distclean-lua" - $as_echo "#define LUA_INCLUDED 1" >>confdefs.h + +$as_echo "#define LUA_INCLUDED 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 diff --git a/nping/configure b/nping/configure index e902e05d2..0cb0b40fe 100755 --- a/nping/configure +++ b/nping/configure @@ -681,6 +681,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -759,6 +760,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1011,6 +1013,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1148,7 +1159,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1301,6 +1312,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -4127,6 +4139,7 @@ fi # Remember that all following tests will run with this CXXFLAGS by default { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __func__" >&5 $as_echo_n "checking for __func__... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5071,7 +5084,8 @@ fi OPENSSL_LIBS= if test "$use_openssl" = "yes"; then - $as_echo "#define HAVE_OPENSSL 1" >>confdefs.h + +$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h OPENSSL_LIBS="-lssl -lcrypto" LIBS_TMP="$LIBS" @@ -5350,7 +5364,8 @@ if test $have_libpcap != yes; then PCAP_CLEAN="clean-pcap" PCAP_DIST_CLEAN="distclean-pcap" else - $as_echo "#define HAVE_LIBPCAP 1" >>confdefs.h + +$as_echo "#define HAVE_LIBPCAP 1" >>confdefs.h LIBPCAP_LIBS="-lpcap" PCAP_DEPENDS="" @@ -5454,7 +5469,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_has_sa_len" >&5 $as_echo "$ac_cv_sockaddr_has_sa_len" >&6; } if test $ac_cv_sockaddr_has_sa_len = yes ; then - $as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h + +$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h fi @@ -5488,7 +5504,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_in_has_sin_len" >&5 $as_echo "$ac_cv_sockaddr_in_has_sin_len" >&6; } if test $ac_cv_sockaddr_in_has_sin_len = yes ; then - $as_echo "#define HAVE_SOCKADDR_IN_SIN_LEN 1" >>confdefs.h + +$as_echo "#define HAVE_SOCKADDR_IN_SIN_LEN 1" >>confdefs.h fi @@ -5522,7 +5539,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_in6_has_sin6_len" >&5 $as_echo "$ac_cv_sockaddr_in6_has_sin6_len" >&6; } if test $ac_cv_sockaddr_in6_has_sin6_len = yes ; then - $as_echo "#define HAVE_SOCKADDR_IN6_SIN6_LEN 1" >>confdefs.h + +$as_echo "#define HAVE_SOCKADDR_IN6_SIN6_LEN 1" >>confdefs.h fi @@ -5756,6 +5774,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking if struct in_addr is a wacky huge structure (some Sun boxes)" >&5 $as_echo_n "checking if struct in_addr is a wacky huge structure (some Sun boxes)... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -5872,7 +5891,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ip_has_ip_sum" >&5 $as_echo "$ac_cv_ip_has_ip_sum" >&6; } if test $ac_cv_ip_has_ip_sum = yes ; then - $as_echo "#define HAVE_IP_IP_SUM 1" >>confdefs.h + +$as_echo "#define HAVE_IP_IP_SUM 1" >>confdefs.h fi @@ -5913,40 +5933,50 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_signal" >&5 $as_echo "$ac_cv_have_signal" >&6; } if test $ac_cv_have_signal = yes ; then - $as_echo "#define HAVE_SIGNAL 1" >>confdefs.h + +$as_echo "#define HAVE_SIGNAL 1" >>confdefs.h fi + + case "$host" in *alpha-dec-osf*) - $as_echo "#define DEC 1" >>confdefs.h + +$as_echo "#define DEC 1" >>confdefs.h ;; *-netbsd* | *-knetbsd*-gnu) - $as_echo "#define NETBSD 1" >>confdefs.h + +$as_echo "#define NETBSD 1" >>confdefs.h ;; *-openbsd*) - $as_echo "#define OPENBSD 1" >>confdefs.h + +$as_echo "#define OPENBSD 1" >>confdefs.h ;; *-freebsd* | *-kfreebsd*-gnu | *-dragonfly*) - $as_echo "#define FREEBSD 1" >>confdefs.h + +$as_echo "#define FREEBSD 1" >>confdefs.h ;; *-bsdi*) - $as_echo "#define BSDI 1" >>confdefs.h + +$as_echo "#define BSDI 1" >>confdefs.h ;; *-sgi-irix5* | *-sgi-irix6*) - $as_echo "#define IRIX 1" >>confdefs.h + +$as_echo "#define IRIX 1" >>confdefs.h ;; *-hpux*) - $as_echo "#define HPUX 1" >>confdefs.h + +$as_echo "#define HPUX 1" >>confdefs.h # To link with libnet and NM (/usr/lib/libnm.sl) library # on HP-UX 11.11 (other versions?) Mikhail Zakharov (zmey20000@yahoo.com) @@ -6179,17 +6209,21 @@ fi ;; *-sunos4*) - $as_echo "#define SUNOS 1" >>confdefs.h - $as_echo "#define SPRINTF_RETURNS_STRING 1" >>confdefs.h +$as_echo "#define SUNOS 1" >>confdefs.h + + +$as_echo "#define SPRINTF_RETURNS_STRING 1" >>confdefs.h ;; *-linux*) - $as_echo "#define LINUX 1" >>confdefs.h + +$as_echo "#define LINUX 1" >>confdefs.h ;; *-apple-darwin*) - $as_echo "#define MACOSX 1" >>confdefs.h + +$as_echo "#define MACOSX 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5 $as_echo_n "checking for main in -lm... " >&6; } diff --git a/nsock/src/configure b/nsock/src/configure index 4763c4b3d..281198173 100755 --- a/nsock/src/configure +++ b/nsock/src/configure @@ -2232,17 +2232,23 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + + case "$host" in *alpha-dec-osf*) - $as_echo "#define DEC 1" >>confdefs.h + +$as_echo "#define DEC 1" >>confdefs.h ;; *-netbsd* | *-knetbsd*-gnu) - $as_echo "#define NETBSD 1" >>confdefs.h + +$as_echo "#define NETBSD 1" >>confdefs.h ;; *-openbsd*) - $as_echo "#define OPENBSD 1" >>confdefs.h + +$as_echo "#define OPENBSD 1" >>confdefs.h ;; *-sgi-irix5*) @@ -2254,14 +2260,16 @@ case "$host" in ;; *-hpux*) - $as_echo "#define HPUX 1" >>confdefs.h + +$as_echo "#define HPUX 1" >>confdefs.h ;; *-solaris2.1[1-9]*) $as_echo "#define SOLARIS 1" >>confdefs.h # Solaris 11 and later use BPF packet capture rather than DLPI. - $as_echo "#define SOLARIS_BPF_PCAP_CAPTURE 1" >>confdefs.h + +$as_echo "#define SOLARIS_BPF_PCAP_CAPTURE 1" >>confdefs.h ;; *-solaris2.0*) @@ -2297,23 +2305,28 @@ case "$host" in ;; *-sunos4*) - $as_echo "#define SUNOS 1" >>confdefs.h + +$as_echo "#define SUNOS 1" >>confdefs.h ;; *-linux*) - $as_echo "#define LINUX 1" >>confdefs.h + +$as_echo "#define LINUX 1" >>confdefs.h ;; *-freebsd* | *-kfreebsd*-gnu | *-dragonfly*) - $as_echo "#define FREEBSD 1" >>confdefs.h + +$as_echo "#define FREEBSD 1" >>confdefs.h ;; *-bsdi*) - $as_echo "#define BSDI 1" >>confdefs.h + +$as_echo "#define BSDI 1" >>confdefs.h ;; *-apple-darwin*) - $as_echo "#define MACOSX 1" >>confdefs.h + +$as_echo "#define MACOSX 1" >>confdefs.h ;; esac @@ -3628,7 +3641,8 @@ if test "$with_libpcap" != "no" -a "$have_libpcap" = "no"; then have_libpcap=yes fi if test "$have_libpcap" != "no"; then - $as_echo "#define HAVE_PCAP 1" >>confdefs.h + +$as_echo "#define HAVE_PCAP 1" >>confdefs.h if test "${LIBPCAP_INC+set}" = "set"; then CPPFLAGS="-I$LIBPCAP_INC $CPPFLAGS" @@ -3721,6 +3735,7 @@ fi if test "${ax_cv_have_epoll}" = "yes"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + $as_echo "#define HAVE_EPOLL 1" >>confdefs.h else @@ -3757,6 +3772,7 @@ fi if test "${ax_cv_have_poll}" = "yes"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + $as_echo "#define HAVE_POLL 1" >>confdefs.h else @@ -4898,7 +4914,8 @@ fi OPENSSL_LIBS= if test "$use_openssl" = "yes"; then - $as_echo "#define HAVE_OPENSSL 1" >>confdefs.h + +$as_echo "#define HAVE_OPENSSL 1" >>confdefs.h OPENSSL_LIBS="-lssl -lcrypto" LIBS_TMP="$LIBS" @@ -4918,7 +4935,8 @@ SSL_set_tlsext_host_name(NULL, NULL) _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SSL_SET_TLSEXT_HOST_NAME 1" >>confdefs.h +$as_echo "yes" >&6; }; +$as_echo "#define HAVE_SSL_SET_TLSEXT_HOST_NAME 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -4941,7 +4959,8 @@ DTLS_client_method() _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_DTLS_CLIENT_METHOD 1" >>confdefs.h +$as_echo "yes" >&6; }; +$as_echo "#define HAVE_DTLS_CLIENT_METHOD 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -4964,7 +4983,8 @@ SSL_set_alpn_protos(NULL, NULL, 0) _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ALPN_SUPPORT 1" >>confdefs.h +$as_echo "yes" >&6; }; +$as_echo "#define HAVE_ALPN_SUPPORT 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5