mirror of
https://git.freebsd.org/ports.git
synced 2025-06-18 19:20:36 -04:00
7277ec6a16
FreeBSD appears to use different pkg-config name for 0.1.x API but it doesn't matter much as 0.1, 1.0 and 2.0 share CFLAGS/LIBS.
166 lines
4.2 KiB
Text
166 lines
4.2 KiB
Text
--- configure.orig 2016-04-14 20:19:53 UTC
|
|
+++ configure
|
|
@@ -245,7 +245,7 @@ DSOSUF=".so"
|
|
LDFLAGS_SHARED="-shared"
|
|
modules="no"
|
|
prefix="/usr/local"
|
|
-mandir="\${prefix}/share/man"
|
|
+mandir="\${prefix}/man"
|
|
datadir="\${prefix}/share"
|
|
qemu_docdir="\${prefix}/share/doc/qemu"
|
|
bindir="\${prefix}/bin"
|
|
@@ -316,6 +316,10 @@ virglrenderer=""
|
|
tpm="yes"
|
|
libssh2=""
|
|
vhdx=""
|
|
+quorum="no"
|
|
+pcap="no"
|
|
+pcap_create="no"
|
|
+bpf="no"
|
|
numa=""
|
|
tcmalloc="no"
|
|
jemalloc="no"
|
|
@@ -575,7 +579,7 @@ FreeBSD)
|
|
audio_drv_list="oss"
|
|
audio_possible_drivers="oss sdl pa"
|
|
# needed for kinfo_getvmmap(3) in libutil.h
|
|
- LIBS="-lutil $LIBS"
|
|
+ LIBS="-lprocstat -lkvm -lelf -lutil $LIBS"
|
|
netmap="" # enable netmap autodetect
|
|
HOST_VARIANT_DIR="freebsd"
|
|
;;
|
|
@@ -878,6 +882,10 @@ for opt do
|
|
;;
|
|
--enable-vnc-png) vnc_png="yes"
|
|
;;
|
|
+ --enable-pcap) pcap="yes"
|
|
+ ;;
|
|
+ --disable-pcap) pcap="no"
|
|
+ ;;
|
|
--disable-slirp) slirp="no"
|
|
;;
|
|
--disable-uuid) uuid="no"
|
|
@@ -2157,7 +2165,7 @@ if test "$gtk" != "no"; then
|
|
gtk_cflags="$gtk_cflags $x11_cflags"
|
|
gtk_libs="$gtk_libs $x11_libs"
|
|
fi
|
|
- libs_softmmu="$gtk_libs $libs_softmmu"
|
|
+ libs_softmmu="$gtk_libs -lintl $libs_softmmu"
|
|
gtk="yes"
|
|
elif test "$gtk" = "yes"; then
|
|
feature_not_found "gtk" "Install gtk2 or gtk3 devel"
|
|
@@ -2384,6 +2392,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
|
|
@@ -2526,6 +2542,50 @@ EOF
|
|
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"
|
|
|
|
##########################################
|
|
# VNC SASL detection
|
|
@@ -3857,14 +3917,7 @@ fi
|
|
|
|
# Check if tools are available to build documentation.
|
|
if test "$docs" != "no" ; then
|
|
- if has makeinfo && has pod2man; then
|
|
docs=yes
|
|
- else
|
|
- if test "$docs" = "yes" ; then
|
|
- feature_not_found "docs" "Install texinfo and Perl/perl-podlators"
|
|
- fi
|
|
- docs=no
|
|
- fi
|
|
fi
|
|
|
|
# Search for bswap_32 function
|
|
@@ -4769,6 +4834,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 "VNC support $vnc"
|
|
if test "$vnc" = "yes" ; then
|
|
echo "VNC SASL support $vnc_sasl"
|
|
@@ -4950,6 +5016,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" = "yes" ; then
|
|
echo "CONFIG_SLIRP=y" >> $config_host_mak
|
|
echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
|
|
@@ -5153,6 +5228,9 @@ fi
|
|
if test "$have_ifaddrs_h" = "yes" ; then
|
|
echo "HAVE_IFADDRS_H=y" >> $config_host_mak
|
|
fi
|
|
+if test "$have_ifaddrs_h" = "yes" ; then
|
|
+ echo "HAVE_IFADDRS_H=y" >> $config_host_mak
|
|
+fi
|
|
if test "$vte" = "yes" ; then
|
|
echo "CONFIG_VTE=y" >> $config_host_mak
|
|
echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
|