Prevent vncviewer, vncconfig, and x0vncserver from linking against static X11 libs in unix/xorg.build/lib

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

release/build-compat-linux

@@ -11,31 +11,31 @@ fi
 
 SCRIPTDIR=`dirname $0`
 pushd $SCRIPTDIR/../unix
-if [ ! -d ./xorg.build/lib ]; then
-	mkdir -p ./xorg.build/lib
+if [ ! -d ./xorg.build/syslib ]; then
+	mkdir -p ./xorg.build/syslib
 fi
 CFLAGS='-O3 -static-libgcc'
 CXXFLAGS=$CFLAGS
-LDFLAGS=$CFLAGS' -L'`pwd`'/xorg.build/lib'
+LDFLAGS=$CFLAGS' -L'`pwd`'/xorg.build/syslib'
 export CFLAGS
 export CXXFLAGS
 export LDFLAGS
-if [ -f ./xorg.build/lib/libstdc++.a ]; then
-	rm -f ./xorg.build/lib/libstdc++.a
+if [ -f ./xorg.build/syslib/libstdc++.a ]; then
+	rm -f ./xorg.build/syslib/libstdc++.a
 fi
-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
+ln -fs `gcc $CFLAGS -print-file-name=libstdc++.a` ./xorg.build/syslib
+if [ -f ./xorg.build/syslib/libcrypto.a ]; then
+	rm -f ./xorg.build/syslib/libcrypto.a
 fi
-if [ -f ./xorg.build/lib/libz.a ]; then
-	rm -f ./xorg.build/lib/libz.a
+if [ -f ./xorg.build/syslib/libz.a ]; then
+	rm -f ./xorg.build/syslib/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
+	ln -fs /usr/lib64/libcrypto.a ./xorg.build/syslib
+	ln -fs /usr/lib64/libz.a ./xorg.build/syslib
 else
-	ln -fs /usr/lib/libcrypto.a ./xorg.build/lib
-	ln -fs /usr/lib/libz.a ./xorg.build/lib	
+	ln -fs /usr/lib/libcrypto.a ./xorg.build/syslib
+	ln -fs /usr/lib/libz.a ./xorg.build/syslib	
 fi
 . build-xorg-7.4 $1 -static
 popd

release/build-compat-linux-m32

@@ -13,26 +13,26 @@ fi
 
 SCRIPTDIR=`dirname $0`
 pushd $SCRIPTDIR/../unix
-if [ ! -d ./xorg.build/lib ]; then
-	mkdir -p ./xorg.build/lib
+if [ ! -d ./xorg.build/syslib ]; then
+	mkdir -p ./xorg.build/syslib
 fi
 CFLAGS='-m32 -O3 -static-libgcc'
 CXXFLAGS=$CFLAGS
-LDFLAGS=$CFLAGS' -L'`pwd`'/xorg.build/lib'
+LDFLAGS=$CFLAGS' -L'`pwd`'/xorg.build/syslib'
 export CFLAGS
 export CXXFLAGS
 export LDFLAGS
-if [ -f ./xorg.build/lib/libstdc++.a ]; then
-	rm -f ./xorg.build/lib/libstdc++.a
+if [ -f ./xorg.build/syslib/libstdc++.a ]; then
+	rm -f ./xorg.build/syslib/libstdc++.a
 fi
-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
+ln -fs `gcc $CFLAGS -print-file-name=libstdc++.a` ./xorg.build/syslib
+if [ -f ./xorg.build/syslib/libcrypto.a ]; then
+	rm -f ./xorg.build/syslib/libcrypto.a
 fi
-if [ -f ./xorg.build/lib/libz.a ]; then
-	rm -f ./xorg.build/lib/libz.a
+if [ -f ./xorg.build/syslib/libz.a ]; then
+	rm -f ./xorg.build/syslib/libz.a
 fi
-ln -fs /usr/lib/libcrypto.a ./xorg.build/lib
-ln -fs /usr/lib/libz.a ./xorg.build/lib
+ln -fs /usr/lib/libcrypto.a ./xorg.build/syslib
+ln -fs /usr/lib/libz.a ./xorg.build/syslib
 . build-xorg-7.4 $1 -static --host i686-pc-linux-gnu
 popd