[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PULL v2 13/20] configure: Support pkg-config for zlib
From: |
Laurent Vivier |
Subject: |
[Qemu-arm] [PULL v2 13/20] configure: Support pkg-config for zlib |
Date: |
Tue, 30 Oct 2018 12:23:30 +0100 |
From: Stefan Weil <address@hidden>
This is needed for builds with the mingw64-* packages from Cygwin,
but also works for Linux.
Move the zlib test also more to the end because users should
get information on the really important missing packages
(which also require zlib) first.
Signed-off-by: Stefan Weil <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
configure | 40 +++++++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/configure b/configure
index 1ee09bd112..a02df30dde 100755
--- a/configure
+++ b/configure
@@ -2151,23 +2151,6 @@ EOF
fi
fi
-#########################################
-# zlib check
-
-if test "$zlib" != "no" ; then
- cat > $TMPC << EOF
-#include <zlib.h>
-int main(void) { zlibVersion(); return 0; }
-EOF
- if compile_prog "" "-lz" ; then
- :
- else
- error_exit "zlib check failed" \
- "Make sure to have the zlib libs and headers installed."
- fi
-fi
-LIBS="$LIBS -lz"
-
##########################################
# lzo check
@@ -3479,6 +3462,29 @@ if ! compile_prog "$glib_cflags -Werror" "$glib_libs" ;
then
fi
fi
+#########################################
+# zlib check
+
+if test "$zlib" != "no" ; then
+ if $pkg_config --exists zlib; then
+ zlib_cflags=$($pkg_config --cflags zlib)
+ zlib_libs=$($pkg_config --libs zlib)
+ QEMU_CFLAGS="$zlib_cflags $QEMU_CFLAGS"
+ LIBS="$zlib_libs $LIBS"
+ else
+ cat > $TMPC << EOF
+#include <zlib.h>
+int main(void) { zlibVersion(); return 0; }
+EOF
+ if compile_prog "" "-lz" ; then
+ LIBS="$LIBS -lz"
+ else
+ error_exit "zlib check failed" \
+ "Make sure to have the zlib libs and headers installed."
+ fi
+ fi
+fi
+
##########################################
# SHA command probe for modules
if test "$modules" = yes; then
--
2.17.2
- [Qemu-arm] [PULL v2 11/20] cpu.h: fix a typo in comment, (continued)
- [Qemu-arm] [PULL v2 11/20] cpu.h: fix a typo in comment, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 02/20] vga_int: remove unused function protype, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 19/20] ppc: move at24c to its own CONFIG_ symbol, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 05/20] qemu-iotests: fix filename containing checks, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 10/20] linux-user: fix comment s/atomic_write/atomic_set/, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 14/20] qobject: Catch another straggler for use of qdict_put_str(), Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 03/20] memory.h: fix typos in comments, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 18/20] hw/intc/gicv3: Remove useless parenthesis around DIV_ROUND_UP macro, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 04/20] tests/tcg/README: fix location for lm32 tests, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 16/20] tests/bios-tables-test: Remove an useless cast, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 13/20] configure: Support pkg-config for zlib,
Laurent Vivier <=
- [Qemu-arm] [PULL v2 17/20] hw/pci-host: Remove useless parenthesis around DIV_ROUND_UP macro, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 20/20] milkymist-minimac2: Use qemu_log_mask(GUEST_ERROR) instead of error_report, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 15/20] xen: Use the PCI_DEVICE macro, Laurent Vivier, 2018/10/30
- [Qemu-arm] [PULL v2 12/20] tests: Fix typos in comments and help message (found by codespell), Laurent Vivier, 2018/10/30
- Re: [Qemu-arm] [PULL v2 00/20] Qemu trivial for 3.1 patches, Peter Maydell, 2018/10/30