From 12c6764f509cfcb012a6663e4d01dc618d2ae1a3 Mon Sep 17 00:00:00 2001
From: dscho <dscho>
Date: Fri, 30 Mar 2007 23:43:18 +0000
Subject: [PATCH] build x11vnc with static libraries (at least for now)

Maybe at a later stage, we want x11vnc to pick up on existing
libvncserver.so and libvncclient.so, but right now, x11vnc and the
libraries progress together (and thus it is better to build static,
necessarily up-to-date libraries for x11vnc).
---
 prepare_x11vnc_dist.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/prepare_x11vnc_dist.sh b/prepare_x11vnc_dist.sh
index e6fb1cc..f953d3d 100644
--- a/prepare_x11vnc_dist.sh
+++ b/prepare_x11vnc_dist.sh
@@ -12,6 +12,7 @@ sed -e "s/LibVNCServer, [^,)]*\([(,]\)*/x11vnc, $VERSION\1/g" \
     -e "s/\(contrib\|examples\|vncterm\|test\|client_examples\)\/Makefile//g" \
     -e "s/LibVNCServer.spec/x11vnc.spec/g" \
     -e "s/^.*libvncserver-config//g" \
+    -e "s/AC_PROG_LIBTOOL/AC_PROG_RANLIB/" \
 > configure.ac
 
 mv Makefile.am Makefile.am.LibVNCServer
@@ -74,14 +75,29 @@ mv libvncserver/Makefile.am libvncserver/Makefile.am.LibVNCServer
 
 cat libvncserver/Makefile.am.LibVNCServer | \
 sed -e "s/\(include\|LIB\|lib\)_/noinst_/g" \
+    -e "s/_la_/_a_/" \
+    -e "s/\.la/.a/" \
+    -e "s/_LTLIBRARIES/_LIBRARIES/" \
 > libvncserver/Makefile.am
 
 mv libvncclient/Makefile.am libvncclient/Makefile.am.LibVNCServer
 
 cat libvncclient/Makefile.am.LibVNCServer | \
 sed -e "s/\(include\|LIB\|lib\)_/noinst_/g" \
+    -e "s/_la_/_a_/" \
+    -e "s/\.la/.a/" \
+    -e "s/_LTLIBRARIES/_LIBRARIES/" \
 > libvncclient/Makefile.am
 
+mv x11vnc/Makefile.am x11vnc/Makefile.am.LibVNCServer
+
+cat x11vnc/Makefile.am.LibVNCServer | \
+sed -e "s/_la_/_a_/" \
+    -e "s/\.la/.a/g" \
+    -e "s/_LTLIBRARIES/_LIBRARIES/" \
+> x11vnc/Makefile.am
+
+
 cp classes/Makefile.am classes/Makefile.am.LibVNCServer
 echo 'pkgdatadir = $(datadir)/@PACKAGE@/classes' >> classes/Makefile.am
 echo 'pkgdata_DATA=VncViewer.jar index.vnc' >> classes/Makefile.am
@@ -102,7 +118,7 @@ sed -e "s/^\(_PKG.*\)\$PACKAGE\(.*\)$/\1LibVNCServer\2/" \
 > acinclude.m4
 
 make x11vnc-${VERSION}.tar.gz
-for f in configure.ac Makefile.am libvncserver/Makefile.am libvncclient/Makefile.am classes/Makefile.am classes/ssl/Makefile.am acinclude.m4 README; do
+for f in configure.ac Makefile.am x11vnc/Makefile.am libvncserver/Makefile.am libvncclient/Makefile.am classes/Makefile.am classes/ssl/Makefile.am acinclude.m4 README; do
 	mv -f $f.LibVNCServer $f
 done