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

Miklos Vajna vmiklos at collabora.co.uk
Mon Jan 4 10:26:38 PST 2016


 loolwsd/configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0920fb6f1ab0584dc7bd1e07f7d8141b6c98cb72
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jan 4 09:16:22 2016 +0100

    configure: set POCO_DEBUG_SUFFIX only for self-built poco again
    
    This partially reverts ad8844e7aa2d907c8419d8f2a507894b6d6e1763
    (loolwsd: fix systemplate when --enable-debug poco library, 2015-12-28).
    Otherwise the linker will try to use the "d" suffix for the system poco
    libraries as well, and will fail.
    
    Change-Id: I8f963077650f22a3811119b038349bb1e5da9489
    Reviewed-on: https://gerrit.libreoffice.org/21072
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Tested-by: Henry Castro <hcastro at collabora.com>

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index cfc4d8f..648dcc4 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],
+AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
       [POCO_DEBUG_SUFFIX=d],
       [POCO_DEBUG_SUFFIX=])
 


More information about the Libreoffice-commits mailing list