Attempt to link statically with gnutls if -static is specified, so that Xvnc and...

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

diff --git a/unix/build-xorg b/unix/build-xorg
index 97eac3c075a82746eebe458bf42a86a45f244e9d..78c991da66d22fd4b82ec97beae14512220793d5 100755 (executable)
--- a/unix/build-xorg
+++ b/unix/build-xorg
@@ -332,6 +332,12 @@ if [ $STATIC = 1 -a "$MODE" = "build" ]; then
     if [ -f ./xorg.build/syslib/libz.a ]; then
        rm -f ./xorg.build/syslib/libz.a
     fi
+    if [ -f ./xorg.build/syslib/libgcrypt.a ]; then
+       rm -f ./xorg.build/syslib/libgcrypt.a
+    fi
+    if [ -f ./xorg.build/syslib/libgnutls.a ]; then
+       rm -f ./xorg.build/syslib/libgnutls.a
+    fi
     IS64BIT=`echo -e "#ifdef __x86_64__\nis64bit_yes\n#else\nis64bit_no\n#endif" | $CC $CFLAGS -E - | grep is64bit`
     STATICLIBDIR=
     case $IS64BIT in
@@ -360,6 +366,16 @@ if [ $STATIC = 1 -a "$MODE" = "build" ]; then
     else
        ln -fs $STATICLIBDIR/libz.a ./xorg.build/syslib
     fi
+    if [ ! -f $STATICLIBDIR/libgcrypt.a ]; then
+       echo WARNING: Cannot find suitable libgcrypt.a.  Xvnc will depend on libgcrypt.so ...
+    else
+       ln -fs $STATICLIBDIR/libgcrypt.a ./xorg.build/syslib
+    fi
+    if [ ! -f $STATICLIBDIR/libgnutls.a ]; then
+       echo WARNING: Cannot find suitable libgnutls.a.  Xvnc will depend on libgnutls.so ...
+    else
+       ln -fs $STATICLIBDIR/libgnutls.a ./xorg.build/syslib
+    fi
 fi
 
 export ACLOCAL="aclocal -I ${PREFIX}/share/aclocal"