Changeset View
Changeset View
Standalone View
Standalone View
head/emulators/qemu-devel/files/patch-configure
--- a/configure | --- configure.orig 2015-12-16 20:50:32 UTC | ||||
+++ a/configure | +++ configure | ||||
@@ -273,7 +273,7 @@ DSOSUF=".so" | @@ -276,7 +276,7 @@ DSOSUF=".so" | ||||
LDFLAGS_SHARED="-shared" | LDFLAGS_SHARED="-shared" | ||||
modules="no" | modules="no" | ||||
prefix="/usr/local" | prefix="/usr/local" | ||||
-mandir="\${prefix}/share/man" | -mandir="\${prefix}/share/man" | ||||
+mandir="\${prefix}/man" | +mandir="\${prefix}/man" | ||||
datadir="\${prefix}/share" | datadir="\${prefix}/share" | ||||
qemu_docdir="\${prefix}/share/doc/qemu" | qemu_docdir="\${prefix}/share/doc/qemu" | ||||
bindir="\${prefix}/bin" | bindir="\${prefix}/bin" | ||||
@@ -2062,7 +2062,7 @@ if test "$gtk" != "no"; then | @@ -2241,7 +2241,7 @@ if test "$gtk" != "no"; then | ||||
if $pkg_config --exists "$gtkx11package >= $gtkversion"; then | gtk_cflags="$gtk_cflags $x11_cflags" | ||||
gtk_libs="$gtk_libs -lX11" | gtk_libs="$gtk_libs $x11_libs" | ||||
fi | fi | ||||
- libs_softmmu="$gtk_libs $libs_softmmu" | - libs_softmmu="$gtk_libs $libs_softmmu" | ||||
+ libs_softmmu="$gtk_libs -lintl $libs_softmmu" | + libs_softmmu="$gtk_libs -lintl $libs_softmmu" | ||||
gtk="yes" | gtk="yes" | ||||
elif test "$gtk" = "yes"; then | elif test "$gtk" = "yes"; then | ||||
feature_not_found "gtk" "Install gtk2 or gtk3 devel" | feature_not_found "gtk" "Install gtk2 or gtk3 devel" | ||||
@@ -3500,15 +3500,18 @@ if compile_prog "" "" ; then | @@ -3864,14 +3864,7 @@ fi | ||||
fi | |||||
# Check if tools are available to build documentation. | # 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 | |||||
if test "$docs" != "no" ; then | if test "$docs" != "no" ; then | ||||
- if has makeinfo && has pod2man; then | - if has makeinfo && has pod2man; then | ||||
- docs=yes | docs=yes | ||||
- else | - else | ||||
- if test "$docs" = "yes" ; then | - if test "$docs" = "yes" ; then | ||||
- feature_not_found "docs" "Install texinfo and Perl/perl-podlators" | - feature_not_found "docs" "Install texinfo and Perl/perl-podlators" | ||||
- fi | - fi | ||||
- docs=no | - docs=no | ||||
- fi | - fi | ||||
+ docs=yes | |||||
fi | fi | ||||
# Search for bswap_32 function | # Search for bswap_32 function | ||||
@@ -3650,6 +3653,17 @@ fi | @@ -3999,6 +3992,17 @@ fi | ||||
# check for libusb | # check for libusb | ||||
if test "$libusb" != "no" ; then | if test "$libusb" != "no" ; then | ||||
+ cat > $TMPC << EOF | + cat > $TMPC << EOF | ||||
+#include <libusb.h> | +#include <libusb.h> | ||||
+ | + | ||||
+int main(void) { return libusb_get_port_path(NULL, NULL, NULL, 0); } | +int main(void) { return libusb_get_port_path(NULL, NULL, NULL, 0); } | ||||
+EOF | +EOF | ||||
+ if compile_prog "-Werror" "-lusb -pthread" ; then | + if compile_prog "-Werror" "-lusb -pthread" ; then | ||||
+ libusb="yes" | + libusb="yes" | ||||
+ libusb_cflags="" | + libusb_cflags="" | ||||
+ libusb_libs=-lusb | + libusb_libs=-lusb | ||||
+ libs_softmmu="$libs_softmmu $libusb_libs" | + libs_softmmu="$libs_softmmu $libusb_libs" | ||||
+ else | + else | ||||
if $pkg_config --atleast-version=1.0.13 libusb-1.0; then | if $pkg_config --atleast-version=1.0.13 libusb-1.0; then | ||||
libusb="yes" | libusb="yes" | ||||
libusb_cflags=$($pkg_config --cflags libusb-1.0) | libusb_cflags=$($pkg_config --cflags libusb-1.0) | ||||
@@ -3662,6 +3676,7 @@ if test "$libusb" != "no" ; then | @@ -4011,6 +4015,7 @@ if test "$libusb" != "no" ; then | ||||
fi | fi | ||||
libusb="no" | libusb="no" | ||||
fi | fi | ||||
+ fi | + fi | ||||
fi | fi | ||||
# check for usbredirparser for usb network redirection support | # check for usbredirparser for usb network redirection support |