[Libreoffice-commits] online.git: loolwsd/configure.ac

[Tor Lillqvist]

 loolwsd/configure.ac |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

New commits:
commit b7aa4791203d8600d502e584969c663b7bbb8cf4
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 20 20:32:30 2016 +0300

    Add configure options to use a self-built cppunit
    
    I wanted to try loolwsd built with _GLIBCXX_DEBUG defined and thus
    needed cppunit built like that, too. (And Poco, but we already had
    configury to point to a self-built Poco.)

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index f301f60..bb41235 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -76,6 +76,14 @@ AC_ARG_WITH([libpng-libs],
             AS_HELP_STRING([--with-libpng-libs=<path>],
                            [Path to the "lib" directory with the libpng libraries]))
 
+AC_ARG_WITH([cppunit-includes],
+            AS_HELP_STRING([--with-cppunit-includes=<path>],
+                           [Path to the "include" directory with the Cppunit headers]))
+
+AC_ARG_WITH([cppunit-libs],
+            AS_HELP_STRING([--with-cppunit-libs=<path>],
+                           [Path to the "lib" directory with the Cppunit libraries]))
+
 AC_ARG_ENABLE([ssl],
             AS_HELP_STRING([--disable-ssl],
                            [Compile without SSL support]))
@@ -168,10 +176,20 @@ AS_IF([test -n "$with_libpng_includes"],
 AS_IF([test -n "$with_libpng_libs"],
       [LDFLAGS="$LDFLAGS -L${with_libpng_libs}"])
 
+AS_IF([test -n "$with_cppunit_includes"],
+      [CPPFLAGS="$CPPFLAGS -isystem ${with_cppunit_includes}"])
+
+AS_IF([test -n "$with_cppunit_libs"],
+      [LDFLAGS="$LDFLAGS -L${with_cppunit_libs}"])
+
 AS_IF([test `uname -s` = Linux],
       [AS_IF([test -n "$with_poco_libs"],
              [LDFLAGS="$LDFLAGS -Wl,-rpath,${with_poco_libs}"])])
 
+AS_IF([test `uname -s` = Linux],
+      [AS_IF([test -n "$with_cppunit_libs"],
+             [LDFLAGS="$LDFLAGS -Wl,-rpath,${with_cppunit_libs}"])])
+
 AS_IF([test `uname -s` != Darwin],
       [AC_SEARCH_LIBS([dlopen],
                       [dl dld],