diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 136 |
1 files changed, 105 insertions, 31 deletions
diff --git a/configure b/configure index 9400d62bc838..222d8a513fd0 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for tcpdump 4.99.5. +# Generated by GNU Autoconf 2.71 for tcpdump 4.99.6. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -608,8 +608,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='tcpdump' PACKAGE_TARNAME='tcpdump' -PACKAGE_VERSION='4.99.5' -PACKAGE_STRING='tcpdump 4.99.5' +PACKAGE_VERSION='4.99.6' +PACKAGE_STRING='tcpdump 4.99.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1306,7 +1306,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tcpdump 4.99.5 to adapt to many kinds of systems. +\`configure' configures tcpdump 4.99.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1372,7 +1372,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tcpdump 4.99.5:";; + short | recursive ) echo "Configuration of tcpdump 4.99.6:";; esac cat <<\_ACEOF @@ -1489,7 +1489,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tcpdump configure 4.99.5 +tcpdump configure 4.99.6 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2086,7 +2086,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tcpdump $as_me 4.99.5, which was +It was created by tcpdump $as_me 4.99.6, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4248,6 +4248,11 @@ then : fi + +# On Linux, if Autoconf version >= 2.72 and GNU C Library version >= 2.34, +# uncomment AC_SYS_YEAR2038_RECOMMENDED to ensure time_t is Y2038-safe. +# (Can be done by autogen.sh) +# AC_SYS_YEAR2038_RECOMMENDED # # Get the size of a void *, to know whether this is a 32-bit or 64-bit build. # @@ -5839,18 +5844,6 @@ fi # -# Make sure we have snprintf(); we require it. -# -ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" -if test "x$ac_cv_func_snprintf" = xyes -then : - -else $as_nop - as_fn_error $? "snprintf() is required but wasn't found" "$LINENO" 5 -fi - - -# # It became apparent at some point that using a suitable C99 compiler does not # automatically mean snprintf(3) implementation in the libc supports all the # modifiers and specifiers used in the project, so let's test that before the @@ -5883,32 +5876,50 @@ else $as_nop #include <inttypes.h> #include <sys/types.h> +#if defined(_WIN32) && !defined(_SSIZE_T_DEFINED) +/* + * On UN*Xes, this is a signed integer type of the same size as size_t. + * + * It's not defined by Visual Studio; we assume that ptrdiff_t will + * be a type that is a signed integer type of the same size as size_t. + */ +typedef ptrdiff_t ssize_t; +#endif + +/* + * Avoid trying to cast negative values to unsigned types, or doing + * shifts of signed types, in order not to have the test program fail + * if we're building with undefined-behavior sanitizers enabled. + */ int main() { char buf[100]; - uint64_t t = (uint64_t)1 << 32; + unsigned int ui = sizeof(buf); + int i = sizeof(buf); + int64_t i64 = INT64_C(0x100000000); + uint64_t ui64 = UINT64_C(0x100000000); - snprintf(buf, sizeof(buf), "%zu", sizeof(buf)); + snprintf(buf, sizeof(buf), "%zu", (size_t)ui); if (strncmp(buf, "100", sizeof(buf))) return 1; - snprintf(buf, sizeof(buf), "%zd", -sizeof(buf)); + snprintf(buf, sizeof(buf), "%zd", (ssize_t)(-i)); if (strncmp(buf, "-100", sizeof(buf))) return 2; - snprintf(buf, sizeof(buf), "%" PRId64, -t); + snprintf(buf, sizeof(buf), "%" PRId64, -i64); if (strncmp(buf, "-4294967296", sizeof(buf))) return 3; - snprintf(buf, sizeof(buf), "0o%" PRIo64, t); + snprintf(buf, sizeof(buf), "0o%" PRIo64, ui64); if (strncmp(buf, "0o40000000000", sizeof(buf))) return 4; - snprintf(buf, sizeof(buf), "0x%" PRIx64, t); + snprintf(buf, sizeof(buf), "0x%" PRIx64, ui64); if (strncmp(buf, "0x100000000", sizeof(buf))) return 5; - snprintf(buf, sizeof(buf), "%" PRIu64, t); + snprintf(buf, sizeof(buf), "%" PRIu64, ui64); if (strncmp(buf, "4294967296", sizeof(buf))) return 6; @@ -7845,6 +7856,11 @@ fi rm -f os-proto.h + # + # MKDEP defaults to no-op (":") if we don't test whether the compiler + # supports generating dependencies + # + MKDEP=: if test "${LBL_CFLAGS+set}" = set; then V_CCOPT="$V_CCOPT ${LBL_CFLAGS}" fi @@ -8066,6 +8082,59 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag="$save_ac_c_werror_flag" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wcomma option" >&5 +printf %s "checking whether the compiler supports the -Wcomma option... " >&6; } + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wcomma" + # + # XXX - yes, this depends on the way AC_LANG_WERROR works, + # but no mechanism is provided to turn AC_LANG_WERROR on + # *and then turn it back off*, so that we *only* do it when + # testing compiler options - 15 years after somebody asked + # for it: + # + # https://autoconf.gnu.narkive.com/gTAVmfKD/how-to-cancel-flags-set-by-ac-lang-werror + # + save_ac_c_werror_flag="$ac_c_werror_flag" + ac_c_werror_flag=yes + # + # We use AC_LANG_SOURCE() so that we can control the complete + # content of the program being compiled. We do not, for example, + # want the default "int main()" that AC_LANG_PROGRAM() generates, + # as it will generate a warning with -Wold-style-definition, meaning + # that we would treat it as not working, as the test will fail if + # *any* error output, including a warning due to the flag we're + # testing, is generated; see + # + # https://www.postgresql.org/message-id/2192993.1591682589%40sss.pgh.pa.us + # https://www.postgresql.org/message-id/2192993.1591682589%40sss.pgh.pa.us + # + # This may, as per those two messages, be fixed in autoconf 2.70, + # but we only require 2.69 or newer for now. + # + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(void) { return 0; } +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + CFLAGS="$save_CFLAGS" + V_CCOPT="$V_CCOPT -Wcomma" + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + CFLAGS="$save_CFLAGS" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_c_werror_flag="$save_ac_c_werror_flag" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports the -Wmissing-prototypes option" >&5 printf %s "checking whether the compiler supports the -Wmissing-prototypes option... " >&6; } save_CFLAGS="$CFLAGS" @@ -9024,16 +9093,20 @@ printf "%s\n" "no" >&6; } # .devel file; why should the ABI for which we produce code # depend on .devel? # + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use an os-proto.h header" >&5 +printf %s "checking whether to use an os-proto.h header... " >&6; } os=`echo $host_os | sed -e 's/\([0-9][0-9]*\)[^0-9].*$/\1/'` name="lbl/os-$os.h" if test -f $name ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, at \"$name\"" >&5 +printf "%s\n" "yes, at \"$name\"" >&6; } ln -s $name os-proto.h printf "%s\n" "#define HAVE_OS_PROTO_H 1" >>confdefs.h else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: can't find $name" >&5 -printf "%s\n" "$as_me: WARNING: can't find $name" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi @@ -9689,6 +9762,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ac_config_headers="$ac_config_headers config.h" + + ac_config_commands="$ac_config_commands .devel" ac_config_files="$ac_config_files Makefile tcpdump.1" @@ -10192,7 +10267,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by tcpdump $as_me 4.99.5, which was +This file was extended by tcpdump $as_me 4.99.6, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10260,7 +10335,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -tcpdump config.status 4.99.5 +tcpdump config.status 4.99.6 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" @@ -10990,4 +11065,3 @@ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 fi exit 0 - |