Use static system libz.a so Xvnc doesn't depend on libz.so.1. As a result, we don...

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

diff --git a/release/build-compat-linux b/release/build-compat-linux
index f343508fb97f926c6e1bba12dae9bf022aa45892..6a7bcc5c827d93d7bccb33f4fb7675d49ca819f2 100755 (executable)
--- a/release/build-compat-linux
+++ b/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

diff --git a/release/build-compat-linux-m32 b/release/build-compat-linux-m32
index 0e43c858fffe1edb8be68897895aa4bc46024c82..f691c29cf1aa3c688682ed4d31a8578485a75b80 100755 (executable)
--- a/release/build-compat-linux-m32
+++ b/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

diff --git a/unix/build-xorg-7.4 b/unix/build-xorg-7.4
index da33d5d07110d715ac265365d4c43837ff09033e..69b5a03c6b236e66b928be010f944c8427d588a7 100755 (executable)
--- a/unix/build-xorg-7.4
+++ b/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