[Libreoffice-commits] online.git: loolwsd/configure.ac loolwsd/.gitignore loolwsd/loolwsd-systemplate-setup loolwsd/loolwsd-systemplate-setup.in loolwsd/README

[Henry Castro]

 loolwsd/.gitignore                   |    1 
 loolwsd/README                       |    1 
 loolwsd/configure.ac                 |    3 
 loolwsd/loolwsd-systemplate-setup    |  186 -----------------------------------
 loolwsd/loolwsd-systemplate-setup.in |  186 +++++++++++++++++++++++++++++++++++
 5 files changed, 190 insertions(+), 187 deletions(-)

New commits:
commit ad8844e7aa2d907c8419d8f2a507894b6d6e1763
Author: Henry Castro <hcastro at collabora.com>
Date:   Mon Dec 28 14:04:07 2015 -0400

    loolwsd: fix systemplate when --enable-debug poco library

diff --git a/loolwsd/.gitignore b/loolwsd/.gitignore
index a50e3e6..2da8030 100644
--- a/loolwsd/.gitignore
+++ b/loolwsd/.gitignore
@@ -22,6 +22,7 @@
 /test-driver
 /jails
 /loolwsd.spec
+/loolwsd-systemplate-setup
 
 *.o
 *.exe
diff --git a/loolwsd/README b/loolwsd/README
index 39550cc..4586db0 100644
--- a/loolwsd/README
+++ b/loolwsd/README
@@ -71,6 +71,7 @@ Now you need to set up a minimal chroot system, and directory for the jails:
     ROOTFORJAILS=`pwd`/jails       # or tweak for your system
 
     rm -Rf ${SYSTEMPLATE} # clean
+    chmod +x loolwsd-systemplate-setup
     ./loolwsd-systemplate-setup ${SYSTEMPLATE} ${MASTER}/instdir # build template
     mkdir -p ${ROOTFORJAILS} # create location for transient jails.
 
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index fe58ce8..cfc4d8f 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -52,7 +52,7 @@ AC_ARG_ENABLE([tests],
                            [Build and run unit tests]))
 
 # Handle options
-AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
+AS_IF([test "$enable_debug" = yes],
       [POCO_DEBUG_SUFFIX=d],
       [POCO_DEBUG_SUFFIX=])
 
@@ -151,6 +151,7 @@ AC_DEFINE_UNQUOTED([LOOLWSD_CACHEDIR],["$LOOLWSD_CACHEDIR"],[Cache folder])
 AC_SUBST(LOOLWSD_CACHEDIR)
 
 AC_CONFIG_FILES([Makefile
+                 loolwsd-systemplate-setup
                  test/Makefile
                  loolwsd.spec])
 AC_OUTPUT
diff --git a/loolwsd/loolwsd-systemplate-setup b/loolwsd/loolwsd-systemplate-setup.in
similarity index 97%
rename from loolwsd/loolwsd-systemplate-setup
rename to loolwsd/loolwsd-systemplate-setup.in
index c2f4483..6eef947 100755
--- a/loolwsd/loolwsd-systemplate-setup
+++ b/loolwsd/loolwsd-systemplate-setup.in
@@ -129,7 +129,7 @@ if ! test $? = 0; then
   exit 1;
 fi
 
-gcc_link='g++ -o $dummy -lcap -lpng -ldl  -lPocoNet -lPocoUtil -lPocoXML -lPocoJSON -lPocoFoundation $dummy.o'
+gcc_link='g++ -o $dummy @LIBS@ $dummy.o'
 (eval "$gcc_link") 2>$dummy.err
 
 if ! test $? = 0; then