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

[Miklos Vajna]

 loolwsd/configure.ac |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 31982808f42d12882fd85d2361f2492aacd821fc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Oct 28 16:36:57 2015 +0100

    loolwsd: disable -Wshadow with self-built poco
    
    poco itself isn't warning-free wrt. -Wshadow, so we can only use it if
    it's at a location where the system suppresses such warnings.

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 59c23a6..eb56278 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -61,7 +61,9 @@ AS_IF([test "$enable_debug" = yes],
 # Test for build environment
 
 CXXFLAGS="$CXXFLAGS -std=c++11"
-CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wshadow -Werror"
+CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror"
+AS_IF([test -z "$with_poco_libs"],
+      [CXXFLAGS="$CXXFLAGS -Wshadow"])
 
 AS_IF([test -n "$with_lokit_path"],
       [CPPFLAGS="$CPPFLAGS -I${with_lokit_path}"])