ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alon Levy 2011-07-26 12:30:40 +03:00 committed by Anthony Liguori
parent c7f4111a06
commit 1ece990574
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure vendored
View File

@ -179,6 +179,7 @@ smartcard=""
smartcard_nss="" smartcard_nss=""
usb_redir="" usb_redir=""
opengl="" opengl=""
zlib="yes"
# parse CC options first # parse CC options first
for opt do for opt do
@ -751,6 +752,8 @@ for opt do
;; ;;
--enable-usb-redir) usb_redir="yes" --enable-usb-redir) usb_redir="yes"
;; ;;
--disable-zlib-test) zlib="no"
;;
*) echo "ERROR: unknown option $opt"; show_help="yes" *) echo "ERROR: unknown option $opt"; show_help="yes"
;; ;;
esac esac
@ -1190,18 +1193,20 @@ fi
########################################## ##########################################
# zlib check # zlib check
cat > $TMPC << EOF if test "$zlib" != "no" ; then
cat > $TMPC << EOF
#include <zlib.h> #include <zlib.h>
int main(void) { zlibVersion(); return 0; } int main(void) { zlibVersion(); return 0; }
EOF EOF
if compile_prog "" "-lz" ; then if compile_prog "" "-lz" ; then
: :
else else
echo echo
echo "Error: zlib check failed" echo "Error: zlib check failed"
echo "Make sure to have the zlib libs and headers installed." echo "Make sure to have the zlib libs and headers installed."
echo echo
exit 1 exit 1
fi
fi fi
########################################## ##########################################