aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2011-07-26 12:30:40 +0300
committerAnthony Liguori <aliguori@us.ibm.com>2011-07-29 09:33:56 -0500
commit1ece9905747fb42ab6b2797c8ddde56496f14796 (patch)
tree80fde3745ee7562b677455138e1d07aac358c9b6
parentc7f4111a06208b46c6d05934d2a1e5cfbebc0180 (diff)
downloadqemu-1ece9905747fb42ab6b2797c8ddde56496f14796.zip
qemu-1ece9905747fb42ab6b2797c8ddde56496f14796.tar.gz
qemu-1ece9905747fb42ab6b2797c8ddde56496f14796.tar.bz2
configure: add --disable-zlib-test
This is required for building libcacard which doesn't itself require zlib without bringing in this requirement to the build environment. Signed-off-by: Alon Levy <alevy@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rwxr-xr-xconfigure23
1 files changed, 14 insertions, 9 deletions
diff --git a/configure b/configure
index 0e07132..e80a1e9 100755
--- a/configure
+++ b/configure
@@ -179,6 +179,7 @@ smartcard=""
smartcard_nss=""
usb_redir=""
opengl=""
+zlib="yes"
# parse CC options first
for opt do
@@ -751,6 +752,8 @@ for opt do
;;
--enable-usb-redir) usb_redir="yes"
;;
+ --disable-zlib-test) zlib="no"
+ ;;
*) echo "ERROR: unknown option $opt"; show_help="yes"
;;
esac
@@ -1190,18 +1193,20 @@ fi
##########################################
# zlib check
-cat > $TMPC << EOF
+if test "$zlib" != "no" ; then
+ cat > $TMPC << EOF
#include <zlib.h>
int main(void) { zlibVersion(); return 0; }
EOF
-if compile_prog "" "-lz" ; then
- :
-else
- echo
- echo "Error: zlib check failed"
- echo "Make sure to have the zlib libs and headers installed."
- echo
- exit 1
+ if compile_prog "" "-lz" ; then
+ :
+ else
+ echo
+ echo "Error: zlib check failed"
+ echo "Make sure to have the zlib libs and headers installed."
+ echo
+ exit 1
+ fi
fi
##########################################