20eee12e65
- USES=gl is not always needed [1] PR: 238364 [1] Submitted by: pizzamig [1] Reported by: bz
163 lines
4.3 KiB
Text
163 lines
4.3 KiB
Text
--- configure.orig 2019-04-23 18:14:45 UTC
|
|
+++ configure
|
|
@@ -396,7 +396,7 @@ DSOSUF=".so"
|
|
LDFLAGS_SHARED="-shared"
|
|
modules="no"
|
|
prefix="/usr/local"
|
|
-mandir="\${prefix}/share/man"
|
|
+mandir="\${prefix}/man"
|
|
datadir="\${prefix}/share"
|
|
firmwarepath="\${prefix}/share/qemu-firmware"
|
|
qemu_docdir="\${prefix}/share/doc/qemu"
|
|
@@ -476,6 +476,9 @@ numa=""
|
|
tcmalloc="no"
|
|
jemalloc="no"
|
|
replication="yes"
|
|
+pcap="no"
|
|
+pcap_create="no"
|
|
+bpf="no"
|
|
vxhs=""
|
|
bochs="yes"
|
|
cloop="yes"
|
|
@@ -1118,6 +1121,10 @@ for opt do
|
|
;;
|
|
--enable-vnc-png) vnc_png="yes"
|
|
;;
|
|
+ --enable-pcap) pcap="yes"
|
|
+ ;;
|
|
+ --disable-pcap) pcap="no"
|
|
+ ;;
|
|
--disable-slirp) slirp="no"
|
|
;;
|
|
--enable-slirp=system) slirp="system"
|
|
@@ -2972,6 +2979,14 @@ if ! check_include "ifaddrs.h" ; then
|
|
fi
|
|
|
|
##########################################
|
|
+# getifaddrs (for tests/test-io-channel-socket )
|
|
+
|
|
+have_ifaddrs_h=yes
|
|
+if ! check_include "ifaddrs.h" ; then
|
|
+ have_ifaddrs_h=no
|
|
+fi
|
|
+
|
|
+##########################################
|
|
# VTE probe
|
|
|
|
if test "$vte" != "no"; then
|
|
@@ -3629,7 +3644,7 @@ for i in $glib_modules; do
|
|
glib_libs=$($pkg_config --libs $i)
|
|
QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS"
|
|
LIBS="$glib_libs $LIBS"
|
|
- libs_qga="$glib_libs $libs_qga"
|
|
+ libs_qga="$glib_libs -lintl $libs_qga"
|
|
else
|
|
error_exit "glib-$glib_req_ver $i is required to compile QEMU"
|
|
fi
|
|
@@ -4723,11 +4738,6 @@ has_sphinx_build() {
|
|
if test "$docs" != "no" ; then
|
|
if has makeinfo && has pod2man && has_sphinx_build; then
|
|
docs=yes
|
|
- else
|
|
- if test "$docs" = "yes" ; then
|
|
- feature_not_found "docs" "Install texinfo, Perl/perl-podlators and python-sphinx"
|
|
- fi
|
|
- docs=no
|
|
fi
|
|
fi
|
|
|
|
@@ -4861,7 +4871,7 @@ fi
|
|
|
|
# check for libusb
|
|
if test "$libusb" != "no" ; then
|
|
- if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
|
|
+ if $pkg_config libusb-1.0; then
|
|
libusb="yes"
|
|
libusb_cflags=$($pkg_config --cflags libusb-1.0)
|
|
libusb_libs=$($pkg_config --libs libusb-1.0)
|
|
@@ -5251,7 +5261,51 @@ if test "$debug_stack_usage" = "yes"; then
|
|
fi
|
|
fi
|
|
|
|
+##########################################
|
|
+# pcap probe
|
|
|
|
+if test "$pcap" = "yes" -a "$pcap" != "no"; then
|
|
+ cat > $TMPC << EOF
|
|
+#include <pcap.h>
|
|
+int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); }
|
|
+EOF
|
|
+ if test "$mingw32" = "no" ; then
|
|
+ libpcap=-lpcap
|
|
+ else
|
|
+ libpcap=-lwpcap
|
|
+ fi
|
|
+ if compile_prog "" "$libpcap" ; then
|
|
+ :
|
|
+ else
|
|
+ echo
|
|
+ echo "Error: Could not find pcap"
|
|
+ echo "Make sure to have the pcap libs and headers installed."
|
|
+ echo
|
|
+ exit 1
|
|
+ fi
|
|
+ cat > $TMPC << EOF
|
|
+#include <pcap.h>
|
|
+int main(void)
|
|
+{
|
|
+ char errbuf[PCAP_ERRBUF_SIZE];
|
|
+ return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0);
|
|
+}
|
|
+EOF
|
|
+ if compile_prog "" "$libpcap" ; then
|
|
+ pcap_create="yes"
|
|
+ fi
|
|
+ cat > $TMPC << EOF
|
|
+#define PCAP_DONT_INCLUDE_PCAP_BPF_H
|
|
+#include <pcap.h>
|
|
+#include <net/bpf.h>
|
|
+int main(void) { return (BPF_MAJOR_VERSION); }
|
|
+EOF
|
|
+ if compile_prog ; then
|
|
+ bpf="yes"
|
|
+ fi
|
|
+ libs_softmmu="$libpcap $libs_softmmu"
|
|
+fi # test "$pcap"
|
|
+
|
|
##########################################
|
|
# check if we have open_by_handle_at
|
|
|
|
@@ -6332,6 +6386,7 @@ echo "Audio drivers $audio_drv_list"
|
|
echo "Block whitelist (rw) $block_drv_rw_whitelist"
|
|
echo "Block whitelist (ro) $block_drv_ro_whitelist"
|
|
echo "VirtFS support $virtfs"
|
|
+echo "pcap support $pcap"
|
|
echo "Multipath support $mpath"
|
|
echo "VNC support $vnc"
|
|
if test "$vnc" = "yes" ; then
|
|
@@ -6565,6 +6620,15 @@ fi
|
|
if test "$profiler" = "yes" ; then
|
|
echo "CONFIG_PROFILER=y" >> $config_host_mak
|
|
fi
|
|
+if test "$pcap" = "yes" ; then
|
|
+ echo "CONFIG_PCAP=y" >> $config_host_mak
|
|
+ if test "$pcap_create" = "yes" ; then
|
|
+ echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak
|
|
+ fi
|
|
+ if test "$bpf" = "yes" ; then
|
|
+ echo "CONFIG_BPF=y" >> $config_host_mak
|
|
+ fi
|
|
+fi
|
|
if test "$slirp" != "no"; then
|
|
echo "CONFIG_SLIRP=y" >> $config_host_mak
|
|
echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
|
|
@@ -6812,6 +6876,9 @@ fi
|
|
# if this macro is set.
|
|
if test "$have_fsxattr" = "yes" ; then
|
|
echo "HAVE_FSXATTR=y" >> $config_host_mak
|
|
+fi
|
|
+if test "$have_ifaddrs_h" = "yes" ; then
|
|
+ echo "HAVE_IFADDRS_H=y" >> $config_host_mak
|
|
fi
|
|
if test "$have_copy_file_range" = "yes" ; then
|
|
echo "HAVE_COPY_FILE_RANGE=y" >> $config_host_mak
|