Use static system libz.a so Xvnc doesn't depend on libz.so.1. As a result, we don't need to build the included zlib anymore.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3943 3789f03b-4d11-0410-bbf8-ca57d06f2519

release/build-compat-linux

@@ -27,10 +27,15 @@ ln -fs `gcc $CFLAGS -print-file-name=libstdc++.a` ./xorg.build/lib
 if [ -f ./xorg.build/lib/libcrypto.a ]; then
 	rm -f ./xorg.build/lib/libcrypto.a
 fi
+if [ -f ./xorg.build/lib/libz.a ]; then
+	rm -f ./xorg.build/lib/libz.a
+fi
 if [ "`uname -m`" = "x86_64" ]; then
 	ln -fs /usr/lib64/libcrypto.a ./xorg.build/lib
+	ln -fs /usr/lib64/libz.a ./xorg.build/lib
 else
 	ln -fs /usr/lib/libcrypto.a ./xorg.build/lib
+	ln -fs /usr/lib/libz.a ./xorg.build/lib	
 fi
 . build-xorg-7.4 $1 -static
 popd

release/build-compat-linux-m32

@@ -29,6 +29,10 @@ ln -fs `gcc $CFLAGS -print-file-name=libstdc++.a` ./xorg.build/lib
 if [ -f ./xorg.build/lib/libcrypto.a ]; then
 	rm -f ./xorg.build/lib/libcrypto.a
 fi
+if [ -f ./xorg.build/lib/libz.a ]; then
+	rm -f ./xorg.build/lib/libz.a
+fi
 ln -fs /usr/lib/libcrypto.a ./xorg.build/lib
+ln -fs /usr/lib/libz.a ./xorg.build/lib
 . build-xorg-7.4 $1 -static --host i686-pc-linux-gnu
 popd

unix/build-xorg-7.4

@@ -103,12 +103,8 @@ build ()
     # Build VNC
     echo "*** Building VNC ***"
     cd ..
-    VNCCFGFLAGS=
-    if [ $STATIC = 1 ]; then
-        VNCCFGFLAGS=--with-included-zlib
-    fi
     make distclean || true
-    ./configure ${1+"$@"} ${VNCCFGFLAGS} --prefix=${PREFIX}
+    ./configure ${1+"$@"} --prefix=${PREFIX}
     make
     cd unix