summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Richardson <mcr@tcpdump.org>2015-02-15 12:53:35 -0500
committerMichael Richardson <mcr@tcpdump.org>2015-02-15 12:53:35 -0500
commitfeab22162d7998ea02547e9d21fee82dc7d35c73 (patch)
tree323da86363834a8cd110a3213c9083cb0543ffb5
parent697bc41cd26cfd8270106cd980a89113ad9e2dc9 (diff)
downloadlibpcap-feab22162d7998ea02547e9d21fee82dc7d35c73.tar.gz
regenerated configure with --with-libnl switchbare
-rwxr-xr-xconfigure24
1 files changed, 21 insertions, 3 deletions
diff --git a/configure b/configure
index 1a391448..ef22204e 100755
--- a/configure
+++ b/configure
@@ -623,6 +623,7 @@ ac_subst_vars='LTLIBOBJS
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
+PCAP_SUPPORT_PACKET_RING
DBUS_SRC
PCAP_SUPPORT_DBUS
PKGCONFIG
@@ -750,6 +751,7 @@ enable_bluetooth
enable_canusb
enable_can
enable_dbus
+enable_packet_ring
'
ac_precious_vars='build_alias
host_alias
@@ -1391,6 +1393,7 @@ Optional Features:
available]
--enable-dbus enable D-Bus capture support [default=yes, if
support available]
+ --enable-packet-ring enable Linux packet ring support [default=yes]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -8155,7 +8158,7 @@ fi
if test "x$enable_canusb" != "xno" ; then
case "$host_os" in
- linux*)
+ linux*|uclinux*)
ac_fn_c_check_header_mongrel "$LINENO" "libusb-1.0/libusb.h" "ac_cv_header_libusb_1_0_libusb_h" "$ac_includes_default"
if test "x$ac_cv_header_libusb_1_0_libusb_h" = xyes; then :
@@ -8165,7 +8168,8 @@ if ${ac_cv_lib_usb_1_0_libusb_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lusb-1.0 $LIBS"
+LIBS="-lusb-1.0 -lpthread
+ $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -8206,7 +8210,6 @@ $as_echo "#define PCAP_SUPPORT_CANUSB 1" >>confdefs.h
else
ac_lbl_has_libusb=no
-
fi
@@ -8455,6 +8458,21 @@ $as_echo "$as_me: no hardware timestamp support implemented for $host_os" >&6;}
;;
esac
+# Check whether --enable-packet-ring was given.
+if test "${enable_packet_ring+set}" = set; then :
+ enableval=$enable_packet_ring;
+else
+ enable_packet_ring=yes
+fi
+
+
+if test "x$enable_packet_ring" != "xno" ; then
+
+$as_echo "#define PCAP_SUPPORT_PACKET_RING 1" >>confdefs.h
+
+
+fi
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions: