Merging upstream version 2.3.1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
f3ce14142a
commit
685d423929
GPG key ID:
FBB4F0E80A80222F
12 changed files with 206 additions and 42 deletions
168
configure
vendored
168
configure
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.71 for dnscap 2.3.0.
|
||||
# Generated by GNU Autoconf 2.71 for dnscap 2.3.1.
|
||||
#
|
||||
# Report bugs to <dnscap-users@dns-oarc.net>.
|
||||
#
|
||||
|
|
@ -621,8 +621,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='dnscap'
|
||||
PACKAGE_TARNAME='dnscap'
|
||||
PACKAGE_VERSION='2.3.0'
|
||||
PACKAGE_STRING='dnscap 2.3.0'
|
||||
PACKAGE_VERSION='2.3.1'
|
||||
PACKAGE_STRING='dnscap 2.3.1'
|
||||
PACKAGE_BUGREPORT='dnscap-users@dns-oarc.net'
|
||||
PACKAGE_URL='https://github.com/DNS-OARC/dnscap/issues'
|
||||
|
||||
|
|
@ -1382,7 +1382,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 dnscap 2.3.0 to adapt to many kinds of systems.
|
||||
\`configure' configures dnscap 2.3.1 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1453,7 +1453,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of dnscap 2.3.0:";;
|
||||
short | recursive ) echo "Configuration of dnscap 2.3.1:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1586,7 +1586,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
dnscap configure 2.3.0
|
||||
dnscap configure 2.3.1
|
||||
generated by GNU Autoconf 2.71
|
||||
|
||||
Copyright (C) 2021 Free Software Foundation, Inc.
|
||||
|
|
@ -1875,6 +1875,58 @@ printf "%s\n" "$ac_res" >&6; }
|
|||
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||||
|
||||
} # ac_fn_c_check_type
|
||||
|
||||
# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
|
||||
# ------------------------------------------------------------------
|
||||
# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
|
||||
# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
|
||||
ac_fn_check_decl ()
|
||||
{
|
||||
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
|
||||
as_decl_name=`echo $2|sed 's/ *(.*//'`
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
|
||||
printf %s "checking whether $as_decl_name is declared... " >&6; }
|
||||
if eval test \${$3+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
|
||||
eval ac_save_FLAGS=\$$6
|
||||
as_fn_append $6 " $5"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
$4
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
#ifndef $as_decl_name
|
||||
#ifdef __cplusplus
|
||||
(void) $as_decl_use;
|
||||
#else
|
||||
(void) $as_decl_name;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"
|
||||
then :
|
||||
eval "$3=yes"
|
||||
else $as_nop
|
||||
eval "$3=no"
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
eval $6=\$ac_save_FLAGS
|
||||
|
||||
fi
|
||||
eval ac_res=\$$3
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
|
||||
printf "%s\n" "$ac_res" >&6; }
|
||||
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
|
||||
|
||||
} # ac_fn_check_decl
|
||||
ac_configure_args_raw=
|
||||
for ac_arg
|
||||
do
|
||||
|
|
@ -1899,7 +1951,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 dnscap $as_me 2.3.0, which was
|
||||
It was created by dnscap $as_me 2.3.1, which was
|
||||
generated by GNU Autoconf 2.71. Invocation command line was
|
||||
|
||||
$ $0$ac_configure_args_raw
|
||||
|
|
@ -3169,7 +3221,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='dnscap'
|
||||
VERSION='2.3.0'
|
||||
VERSION='2.3.1'
|
||||
|
||||
|
||||
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
|
||||
|
|
@ -13151,6 +13203,86 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
|
||||
printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
|
||||
if test ${ac_cv_c_undeclared_builtin_options+y}
|
||||
then :
|
||||
printf %s "(cached) " >&6
|
||||
else $as_nop
|
||||
ac_save_CFLAGS=$CFLAGS
|
||||
ac_cv_c_undeclared_builtin_options='cannot detect'
|
||||
for ac_arg in '' -fno-builtin; do
|
||||
CFLAGS="$ac_save_CFLAGS $ac_arg"
|
||||
# This test program should *not* compile successfully.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
(void) strchr;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"
|
||||
then :
|
||||
|
||||
else $as_nop
|
||||
# This test program should compile successfully.
|
||||
# No library function is consistently available on
|
||||
# freestanding implementations, so test against a dummy
|
||||
# declaration. Include always-available headers on the
|
||||
# off chance that they somehow elicit warnings.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <float.h>
|
||||
#include <limits.h>
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
extern void ac_decl (int, char *);
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
(void) ac_decl (0, (char *) 0);
|
||||
(void) ac_decl;
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"
|
||||
then :
|
||||
if test x"$ac_arg" = x
|
||||
then :
|
||||
ac_cv_c_undeclared_builtin_options='none needed'
|
||||
else $as_nop
|
||||
ac_cv_c_undeclared_builtin_options=$ac_arg
|
||||
fi
|
||||
break
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||
done
|
||||
CFLAGS=$ac_save_CFLAGS
|
||||
|
||||
fi
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
|
||||
printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
|
||||
case $ac_cv_c_undeclared_builtin_options in #(
|
||||
'cannot detect') :
|
||||
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
as_fn_error $? "cannot make $CC report undeclared builtins
|
||||
See \`config.log' for more details" "$LINENO" 5; } ;; #(
|
||||
'none needed') :
|
||||
ac_c_undeclared_builtin_options='' ;; #(
|
||||
*) :
|
||||
ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
|
||||
esac
|
||||
|
||||
# Check whether --enable-threads was given.
|
||||
if test ${enable_threads+y}
|
||||
then :
|
||||
|
|
@ -13974,6 +14106,14 @@ printf "%s\n" "#define HAVE_PCAP_DIRECTION_T 1" >>confdefs.h
|
|||
|
||||
fi
|
||||
|
||||
ac_fn_check_decl "$LINENO" "DLT_LINUX_SLL2" "ac_cv_have_decl_DLT_LINUX_SLL2" "#include <pcap/pcap.h>
|
||||
" "$ac_c_undeclared_builtin_options" "CFLAGS"
|
||||
if test "x$ac_cv_have_decl_DLT_LINUX_SLL2" = xyes
|
||||
then :
|
||||
|
||||
else $as_nop
|
||||
as_fn_error $? "link-type DLT_LINUX_SLL2 not found, libpcap >= 1.10.0 required" "$LINENO" 5
|
||||
fi
|
||||
|
||||
|
||||
else $as_nop
|
||||
|
|
@ -14126,6 +14266,14 @@ printf "%s\n" "#define HAVE_PCAP_DIRECTION_T 1" >>confdefs.h
|
|||
|
||||
fi
|
||||
|
||||
ac_fn_check_decl "$LINENO" "DLT_LINUX_SLL2" "ac_cv_have_decl_DLT_LINUX_SLL2" "#include <pcap/pcap.h>
|
||||
" "$ac_c_undeclared_builtin_options" "CFLAGS"
|
||||
if test "x$ac_cv_have_decl_DLT_LINUX_SLL2" = xyes
|
||||
then :
|
||||
|
||||
else $as_nop
|
||||
as_fn_error $? "link-type DLT_LINUX_SLL2 not found, libpcap >= 1.10.0 required" "$LINENO" 5
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -15964,7 +16112,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 dnscap $as_me 2.3.0, which was
|
||||
This file was extended by dnscap $as_me 2.3.1, which was
|
||||
generated by GNU Autoconf 2.71. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -16033,7 +16181,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="\\
|
||||
dnscap config.status 2.3.0
|
||||
dnscap config.status 2.3.1
|
||||
configured by $0, generated by GNU Autoconf 2.71,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue