[Libreoffice-commits] core.git: configure.ac

[Norbert Thiebaud]

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

New commits:
commit 0a911d9a6b72f656ea2780d4a8e35f2b9c3d52c8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Jan 15 08:33:51 2015 -0600

    do not _override_ werror even if LODE_HOME is present
    
    Change-Id: I8ea6dbf5fbe6c7706d833dddf43b31128f079017

diff --git a/configure.ac b/configure.ac
index ac3dc4e..b147aa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4538,7 +4538,7 @@ if test -n "$enable_werror" -a "$enable_werror" != "no"; then
     ENABLE_WERROR="TRUE"
     AC_MSG_RESULT([yes])
 else
-    if test -n "$LODE_HOME"; then
+    if test -n "$LODE_HOME" -a -z "$enable_werror"; then
         ENABLE_WERROR="TRUE"
         AC_MSG_RESULT([yes])
     else