1diff --git a/libpcap/configure b/libpcap/configure 2index fa15fc7..e40a4c4 100755 3--- a/libpcap/configure 4+++ b/libpcap/configure 5@@ -1416,16 +1416,12 @@ Optional Features: 6 --enable-optimizer-dbg build optimizer debugging code 7 --enable-yydebug build parser debugging code 8 --disable-universal don't build universal on macOS 9- --enable-shared build shared libraries [default=yes, if support 10- available] 11- --enable-usb enable USB capture support [default=yes, if support 12- available] 13+ --enable-shared build shared libraries [default=no] 14+ --enable-usb enable USB capture support [default=no] 15 --enable-netmap enable netmap support [default=yes, if support 16 available] 17- --enable-bluetooth enable Bluetooth support [default=yes, if support 18- available] 19- --enable-dbus enable D-Bus capture support [default=yes, if 20- support available] 21+ --enable-bluetooth enable Bluetooth support [default=no] 22+ --enable-dbus enable D-Bus capture support [default=no] 23 --enable-rdma enable RDMA capture support [default=yes, if support 24 available] 25 26@@ -1435,8 +1431,7 @@ Optional Packages: 27 --without-gcc don't use gcc 28 --with-sita include SITA support 29 --with-pcap=TYPE use packet capture TYPE 30- --without-libnl disable libnl support [default=yes, on Linux, if 31- present] 32+ --without-libnl disable libnl support [default=disabled] 33 --with-dag[=DIR] include Endace DAG support (located in directory 34 DIR, if supplied). [default=yes, if present] 35 --with-dag-includes=IDIR 36@@ -6516,7 +6511,7 @@ else 37 fi 38 39 40- if test x$with_libnl != xno ; then 41+ if test x$with_libnl = xyes ; then 42 have_any_nl="no" 43 44 incdir=-I/usr/include/libnl3 45@@ -8572,7 +8567,7 @@ if test "${enable_shared+set}" = set; then : 46 enableval=$enable_shared; 47 fi 48 49-test "x$enable_shared" = "xno" && DYEXT="none" 50+test "x$enable_shared" != "xyes" && DYEXT="none" 51 52 if test -n "$ac_tool_prefix"; then 53 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. 54@@ -10397,7 +10392,7 @@ $as_echo "#define LBL_ALIGN 1" >>confdefs.h 55 if test "${enable_usb+set}" = set; then : 56 enableval=$enable_usb; 57 else 58- enable_usb=yes 59+ enable_usb=no 60 fi 61 62 63@@ -10646,7 +10641,7 @@ fi 64 if test "${enable_bluetooth+set}" = set; then : 65 enableval=$enable_bluetooth; 66 else 67- enable_bluetooth=ifsupportavailable 68+ enable_bluetooth=no 69 fi 70 71 72@@ -10771,7 +10766,7 @@ fi 73 if test "${enable_dbus+set}" = set; then : 74 enableval=$enable_dbus; 75 else 76- enable_dbus=ifavailable 77+ enable_dbus=no 78 fi 79 80 81@@ -11131,7 +11126,7 @@ ac_config_headers="$ac_config_headers config.h" 82 83 ac_config_commands="$ac_config_commands default-1" 84 85-ac_config_files="$ac_config_files Makefile pcap-filter.manmisc pcap-linktype.manmisc pcap-tstamp.manmisc pcap-savefile.manfile pcap.3pcap pcap_compile.3pcap pcap_datalink.3pcap pcap_dump_open.3pcap pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap pcap_open_offline.3pcap pcap_set_immediate_mode.3pcap pcap_set_tstamp_precision.3pcap pcap_set_tstamp_type.3pcap rpcapd/Makefile rpcapd/rpcapd.manadmin rpcapd/rpcapd-config.manfile testprogs/Makefile" 86+ac_config_files="$ac_config_files Makefile pcap-filter.manmisc pcap-linktype.manmisc pcap-tstamp.manmisc pcap-savefile.manfile pcap.3pcap pcap_compile.3pcap pcap_datalink.3pcap pcap_dump_open.3pcap pcap_get_tstamp_precision.3pcap pcap_list_datalinks.3pcap pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap pcap_open_offline.3pcap pcap_set_immediate_mode.3pcap pcap_set_tstamp_precision.3pcap pcap_set_tstamp_type.3pcap" 87 88 cat >confcache <<\_ACEOF 89 # This file is a shell script that caches the results of configure 90@@ -11851,10 +11846,6 @@ do 91 "pcap_set_immediate_mode.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_set_immediate_mode.3pcap" ;; 92 "pcap_set_tstamp_precision.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_set_tstamp_precision.3pcap" ;; 93 "pcap_set_tstamp_type.3pcap") CONFIG_FILES="$CONFIG_FILES pcap_set_tstamp_type.3pcap" ;; 94- "rpcapd/Makefile") CONFIG_FILES="$CONFIG_FILES rpcapd/Makefile" ;; 95- "rpcapd/rpcapd.manadmin") CONFIG_FILES="$CONFIG_FILES rpcapd/rpcapd.manadmin" ;; 96- "rpcapd/rpcapd-config.manfile") CONFIG_FILES="$CONFIG_FILES rpcapd/rpcapd-config.manfile" ;; 97- "testprogs/Makefile") CONFIG_FILES="$CONFIG_FILES testprogs/Makefile" ;; 98 99 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 100 esac 101diff --git a/libpcap/configure.ac b/libpcap/configure.ac 102index eba2723..6255f07 100644 103--- a/libpcap/configure.ac 104+++ b/libpcap/configure.ac 105@@ -847,10 +847,10 @@ linux) 106 # Do we have libnl? 107 # 108 AC_ARG_WITH(libnl, 109- AC_HELP_STRING([--without-libnl],[disable libnl support @<:@default=yes, on Linux, if present@:>@]), 110+ AC_HELP_STRING([--without-libnl],[disable libnl support @<:@default=disabled@:>@]), 111 with_libnl=$withval,with_libnl=if_available) 112 113- if test x$with_libnl != xno ; then 114+ if test x$with_libnl = xyes ; then 115 have_any_nl="no" 116 117 incdir=-I/usr/include/libnl3 118@@ -1993,8 +1993,8 @@ solaris*) 119 esac 120 121 AC_ARG_ENABLE(shared, 122-AC_HELP_STRING([--enable-shared],[build shared libraries @<:@default=yes, if support available@:>@])) 123-test "x$enable_shared" = "xno" && DYEXT="none" 124+AC_HELP_STRING([--enable-shared],[build shared libraries @<:@default=no@:>@])) 125+test "x$enable_shared" != "xyes" && DYEXT="none" 126 127 AC_PROG_RANLIB 128 AC_CHECK_TOOL([AR], [ar]) 129@@ -2073,9 +2073,9 @@ AC_SUBST(RPCAPD_LIBS) 130 AC_SUBST(EXTRA_NETWORK_LIBS) 131 132 AC_ARG_ENABLE([usb], 133-[AC_HELP_STRING([--enable-usb],[enable USB capture support @<:@default=yes, if support available@:>@])], 134+[AC_HELP_STRING([--enable-usb],[enable USB capture support @<:@default=no@:>@])], 135 [], 136- [enable_usb=yes]) 137+ [enable_usb=no]) 138 139 if test "xxx_only" = yes; then 140 # User requested something-else-only pcap, so they don't 141@@ -2221,9 +2221,9 @@ fi 142 143 144 AC_ARG_ENABLE([bluetooth], 145-[AC_HELP_STRING([--enable-bluetooth],[enable Bluetooth support @<:@default=yes, if support available@:>@])], 146+[AC_HELP_STRING([--enable-bluetooth],[enable Bluetooth support @<:@default=no@:>@])], 147 [], 148- [enable_bluetooth=ifsupportavailable]) 149+ [enable_bluetooth=no]) 150 151 if test "xxx_only" = yes; then 152 # User requested something-else-only pcap, so they don't 153@@ -2306,9 +2306,9 @@ if test "x$enable_bluetooth" != "xno" ; then 154 fi 155 156 AC_ARG_ENABLE([dbus], 157-[AC_HELP_STRING([--enable-dbus],[enable D-Bus capture support @<:@default=yes, if support available@:>@])], 158+[AC_HELP_STRING([--enable-dbus],[enable D-Bus capture support @<:@default=no@:>@])], 159 [], 160- [enable_dbus=ifavailable]) 161+ [enable_dbus=no]) 162 163 if test "xxx_only" = yes; then 164 # User requested something-else-only pcap, so they don't 165@@ -2460,6 +2460,5 @@ AC_OUTPUT(Makefile pcap-filter.manmisc pcap-linktype.manmisc 166 pcap_list_tstamp_types.3pcap pcap_open_dead.3pcap 167 pcap_open_offline.3pcap pcap_set_immediate_mode.3pcap 168 pcap_set_tstamp_precision.3pcap pcap_set_tstamp_type.3pcap 169- rpcapd/Makefile rpcapd/rpcapd.manadmin rpcapd/rpcapd-config.manfile 170- testprogs/Makefile) 171+ ) 172 exit 0 173diff --git a/libpcap/Makefile.in b/libpcap/Makefile.in 174index e7f4167..8eed20d 100644 175--- a/libpcap/Makefile.in 176+++ b/libpcap/Makefile.in 177@@ -729,8 +729,6 @@ uninstall-rpcapd: 178 179 clean: 180 rm -f $(CLEANFILES) 181- cd rpcapd; $(MAKE) clean 182- cd testprogs; $(MAKE) clean 183 184 distclean: clean 185 rm -f Makefile config.cache config.log config.status \ 186@@ -738,8 +736,6 @@ distclean: clean 187 pcap-config stamp-h stamp-h.in 188 rm -f $(MAN3PCAP_EXPAND:.in=) $(MANFILE:.in=) $(MANMISC:.in=) 189 rm -rf autom4te.cache 190- cd rpcapd; $(MAKE) distclean 191- cd testprogs; $(MAKE) distclean 192 193 extags: $(TAGFILES) 194 ctags $(TAGFILES) 195@@ -758,5 +754,3 @@ releasetar: 196 197 depend: $(GENSRC) $(GENHDR) 198 $(MKDEP) -c "$(CC)" -m "$(DEPENDENCY_CFLAG)" $(CFLAGS) $(DEFS) $(INCLS) $(SRC) 199- cd rpcapd; $(MAKE) depend 200- cd testprogs; $(MAKE) depend 201