CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 14:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change configure check for libpcap to require pcap_create (libpcap 1.0.0 or later). See #1291

Browse source
This commit is contained in:
dmiller 2018-08-20 22:08:55 +00:00
parent 9e77964022
commit 4deb24fec4
8 changed files with 77 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

40
configure vendored
View file

@ -6164,9 +6164,9 @@ if test "${with_libpcap+set}" = set; then :
ac_fn_c_check_header_mongrel "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default"
if test "x$ac_cv_header_pcap_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink in -lpcap" >&5
$as_echo_n "checking for pcap_datalink in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_datalink+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_create in -lpcap" >&5
$as_echo_n "checking for pcap_create in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -6180,27 +6180,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char pcap_datalink ();
char pcap_create ();
int
main ()
{
return pcap_datalink ();
return pcap_create ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pcap_pcap_datalink=yes
ac_cv_lib_pcap_pcap_create=yes
else
ac_cv_lib_pcap_pcap_datalink=no
ac_cv_lib_pcap_pcap_create=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_datalink" >&5
$as_echo "$ac_cv_lib_pcap_pcap_datalink" >&6; }
if test "x$ac_cv_lib_pcap_pcap_datalink" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5
$as_echo "$ac_cv_lib_pcap_pcap_create" >&6; }
if test "x$ac_cv_lib_pcap_pcap_create" = xyes; then :
have_libpcap=yes
fi
@ -6221,9 +6221,9 @@ fi
ac_fn_c_check_header_mongrel "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default"
if test "x$ac_cv_header_pcap_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink in -lpcap" >&5
$as_echo_n "checking for pcap_datalink in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_datalink+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_create in -lpcap" >&5
$as_echo_n "checking for pcap_create in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -6237,27 +6237,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char pcap_datalink ();
char pcap_create ();
int
main ()
{
return pcap_datalink ();
return pcap_create ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pcap_pcap_datalink=yes
ac_cv_lib_pcap_pcap_create=yes
else
ac_cv_lib_pcap_pcap_datalink=no
ac_cv_lib_pcap_pcap_create=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_datalink" >&5
$as_echo "$ac_cv_lib_pcap_pcap_datalink" >&6; }
if test "x$ac_cv_lib_pcap_pcap_datalink" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5
$as_echo "$ac_cv_lib_pcap_pcap_create" >&6; }
if test "x$ac_cv_lib_pcap_pcap_create" = xyes; then :
have_libpcap=yes
LIBPCAP_INC=$with_libpcap/include
LIBPCAP_LIB=$with_libpcap/lib

4
configure.ac
View file

@ -425,7 +425,7 @@ AC_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap
[ case "$with_libpcap" in
yes)
AC_CHECK_HEADER(pcap.h,[
AC_CHECK_LIB(pcap, pcap_datalink,
AC_CHECK_LIB(pcap, pcap_create,
[have_libpcap=yes ])])
;;
included)
@ -439,7 +439,7 @@ AC_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap
LDFLAGS="-L$with_libpcap/lib $LDFLAGS"
AC_CHECK_HEADER(pcap.h,[
AC_CHECK_LIB(pcap, pcap_datalink,
AC_CHECK_LIB(pcap, pcap_create,
[have_libpcap=yes
LIBPCAP_INC=$with_libpcap/include
LIBPCAP_LIB=$with_libpcap/lib])])

40
ncat/configure vendored
View file

@ -4777,9 +4777,9 @@ if test "${with_libpcap+set}" = set; then :
ac_fn_c_check_header_mongrel "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default"
if test "x$ac_cv_header_pcap_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink in -lpcap" >&5
$as_echo_n "checking for pcap_datalink in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_datalink+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_create in -lpcap" >&5
$as_echo_n "checking for pcap_create in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -4793,27 +4793,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char pcap_datalink ();
char pcap_create ();
int
main ()
{
return pcap_datalink ();
return pcap_create ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pcap_pcap_datalink=yes
ac_cv_lib_pcap_pcap_create=yes
else
ac_cv_lib_pcap_pcap_datalink=no
ac_cv_lib_pcap_pcap_create=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_datalink" >&5
$as_echo "$ac_cv_lib_pcap_pcap_datalink" >&6; }
if test "x$ac_cv_lib_pcap_pcap_datalink" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5
$as_echo "$ac_cv_lib_pcap_pcap_create" >&6; }
if test "x$ac_cv_lib_pcap_pcap_create" = xyes; then :
have_libpcap=yes
fi
@ -4834,9 +4834,9 @@ fi
ac_fn_c_check_header_mongrel "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default"
if test "x$ac_cv_header_pcap_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink in -lpcap" >&5
$as_echo_n "checking for pcap_datalink in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_datalink+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_create in -lpcap" >&5
$as_echo_n "checking for pcap_create in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -4850,27 +4850,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char pcap_datalink ();
char pcap_create ();
int
main ()
{
return pcap_datalink ();
return pcap_create ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pcap_pcap_datalink=yes
ac_cv_lib_pcap_pcap_create=yes
else
ac_cv_lib_pcap_pcap_datalink=no
ac_cv_lib_pcap_pcap_create=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_datalink" >&5
$as_echo "$ac_cv_lib_pcap_pcap_datalink" >&6; }
if test "x$ac_cv_lib_pcap_pcap_datalink" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5
$as_echo "$ac_cv_lib_pcap_pcap_create" >&6; }
if test "x$ac_cv_lib_pcap_pcap_create" = xyes; then :
have_libpcap=yes
LIBPCAP_INC=$with_libpcap/include
LIBPCAP_LIB=$with_libpcap/lib

4
ncat/configure.ac
View file

@ -129,7 +129,7 @@ AC_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap
[ case "$with_libpcap" in
yes)
AC_CHECK_HEADER(pcap.h,[
AC_CHECK_LIB(pcap, pcap_datalink,
AC_CHECK_LIB(pcap, pcap_create,
[have_libpcap=yes ])])
;;
included)
@ -143,7 +143,7 @@ AC_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap
LDFLAGS="-L$with_libpcap/lib $LDFLAGS"
AC_CHECK_HEADER(pcap.h,[
AC_CHECK_LIB(pcap, pcap_datalink,
AC_CHECK_LIB(pcap, pcap_create,
[have_libpcap=yes
LIBPCAP_INC=$with_libpcap/include
LIBPCAP_LIB=$with_libpcap/lib])])

40
nping/configure vendored
View file

@ -5116,9 +5116,9 @@ if test "${with_libpcap+set}" = set; then :
ac_fn_c_check_header_mongrel "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default"
if test "x$ac_cv_header_pcap_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink in -lpcap" >&5
$as_echo_n "checking for pcap_datalink in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_datalink+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_create in -lpcap" >&5
$as_echo_n "checking for pcap_create in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -5132,27 +5132,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char pcap_datalink ();
char pcap_create ();
int
main ()
{
return pcap_datalink ();
return pcap_create ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pcap_pcap_datalink=yes
ac_cv_lib_pcap_pcap_create=yes
else
ac_cv_lib_pcap_pcap_datalink=no
ac_cv_lib_pcap_pcap_create=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_datalink" >&5
$as_echo "$ac_cv_lib_pcap_pcap_datalink" >&6; }
if test "x$ac_cv_lib_pcap_pcap_datalink" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5
$as_echo "$ac_cv_lib_pcap_pcap_create" >&6; }
if test "x$ac_cv_lib_pcap_pcap_create" = xyes; then :
have_libpcap=yes
fi
@ -5173,9 +5173,9 @@ fi
ac_fn_c_check_header_mongrel "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default"
if test "x$ac_cv_header_pcap_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink in -lpcap" >&5
$as_echo_n "checking for pcap_datalink in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_datalink+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_create in -lpcap" >&5
$as_echo_n "checking for pcap_create in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -5189,27 +5189,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char pcap_datalink ();
char pcap_create ();
int
main ()
{
return pcap_datalink ();
return pcap_create ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pcap_pcap_datalink=yes
ac_cv_lib_pcap_pcap_create=yes
else
ac_cv_lib_pcap_pcap_datalink=no
ac_cv_lib_pcap_pcap_create=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_datalink" >&5
$as_echo "$ac_cv_lib_pcap_pcap_datalink" >&6; }
if test "x$ac_cv_lib_pcap_pcap_datalink" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5
$as_echo "$ac_cv_lib_pcap_pcap_create" >&6; }
if test "x$ac_cv_lib_pcap_pcap_create" = xyes; then :
have_libpcap=yes
LIBPCAP_INC=$with_libpcap/include
LIBPCAP_LIB=$with_libpcap/lib

4
nping/configure.ac
View file

@ -196,7 +196,7 @@ AC_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap
[ case "$with_libpcap" in
yes)
AC_CHECK_HEADER(pcap.h,[
AC_CHECK_LIB(pcap, pcap_datalink,
AC_CHECK_LIB(pcap, pcap_create,
[have_libpcap=yes ])])
;;
included)
@ -210,7 +210,7 @@ AC_HELP_STRING([--with-libpcap=included], [Always use version included with Nmap
LDFLAGS="-L$with_libpcap/lib $LDFLAGS"
AC_CHECK_HEADER(pcap.h,[
AC_CHECK_LIB(pcap, pcap_datalink,
AC_CHECK_LIB(pcap, pcap_create,
[have_libpcap=yes
LIBPCAP_INC=$with_libpcap/include
LIBPCAP_LIB=$with_libpcap/lib])])

20
nsock/src/configure vendored
View file

@ -3579,9 +3579,9 @@ fi
ac_fn_c_check_header_mongrel "$LINENO" "pcap.h" "ac_cv_header_pcap_h" "$ac_includes_default"
if test "x$ac_cv_header_pcap_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_datalink in -lpcap" >&5
$as_echo_n "checking for pcap_datalink in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_datalink+:} false; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcap_create in -lpcap" >&5
$as_echo_n "checking for pcap_create in -lpcap... " >&6; }
if ${ac_cv_lib_pcap_pcap_create+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -3595,27 +3595,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
char pcap_datalink ();
char pcap_create ();
int
main ()
{
return pcap_datalink ();
return pcap_create ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_pcap_pcap_datalink=yes
ac_cv_lib_pcap_pcap_create=yes
else
ac_cv_lib_pcap_pcap_datalink=no
ac_cv_lib_pcap_pcap_create=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_datalink" >&5
$as_echo "$ac_cv_lib_pcap_pcap_datalink" >&6; }
if test "x$ac_cv_lib_pcap_pcap_datalink" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5
$as_echo "$ac_cv_lib_pcap_pcap_create" >&6; }
if test "x$ac_cv_lib_pcap_pcap_create" = xyes; then :
have_libpcap=yes
LIBPCAP_LIBS=-lpcap
LIBPCAP_INC=$with_libpcap/include

2
nsock/src/configure.ac
View file

@ -144,7 +144,7 @@ AC_HELP_STRING([--without-libpcap], [Disable pcap functions.]),
LDFLAGS="-L$with_libpcap/lib $LDFLAGS"
AC_CHECK_HEADER(pcap.h,[
AC_CHECK_LIB(pcap, pcap_datalink,
AC_CHECK_LIB(pcap, pcap_create,
[have_libpcap=yes
LIBPCAP_LIBS=-lpcap
LIBPCAP_INC=$with_libpcap/include