[Libreoffice-commits] .: 2 commits - configure.in

[Stephan Bergmann]

 configure.in |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 1e605745c151be5ba5ee7d9ca8be67e3a41217c4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Sep 18 18:42:44 2011 +0200

    Honor preset VALGRIND_CFLAGS in configure.

diff --git a/configure.in b/configure.in
index 203d70b..7db548b 100755
--- a/configure.in
+++ b/configure.in
@@ -3241,15 +3241,13 @@ AC_SUBST(ALIGNOF_DOUBLE)
 dnl ===================================================================
 dnl Check if valgrind.h is available
 dnl ===================================================================
-if test "$cross_compiling" != "yes" -a "$enable_dbgutil" != "no"; then
+if test "$cross_compiling" != "yes" -a "$enable_dbgutil" != "no" -a \
+        -z "$VALGRIND_CFLAGS"; then
     dnl Test $prefix (currently only testing for /usr and /usr/local)
     dnl so that VALGRIND_CFLAGS = -I$prefix/include/valgrind
-    VALGRIND_CFLAGS=""
     prev_cppflags=$CPPFLAGS
-    if test -z "$VALGRIND_CFLAGS"; then
-        CPPFLAGS="-I/usr/include/valgrind"
-        AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [unset ac_cv_header_valgrind_h])
-    fi
+    CPPFLAGS="-I/usr/include/valgrind"
+    AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [unset ac_cv_header_valgrind_h])
     if test -z "$VALGRIND_CFLAGS"; then
         CPPFLAGS="-I/usr/local/include/valgrind"
         AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [])
commit 6c89ab0fdbdb3a286f56b4676bdff5a7eaca3f74
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Sep 18 17:00:08 2011 +0200

    Removed unhelpful --enable-werror warning.

diff --git a/configure.in b/configure.in
index 4d26a47..203d70b 100755
--- a/configure.in
+++ b/configure.in
@@ -2264,9 +2264,6 @@ AC_MSG_CHECKING([whether to turn warnings to errors])
 if test -n "$enable_werror" && test "$enable_werror" != "no"; then
     ENABLE_WERROR="TRUE"
     AC_MSG_RESULT([yes])
-    AC_MSG_WARN([Turning warnings to errors has no effect in modules or])
-    AC_MSG_WARN([on platforms where it has been disabled explicitly])
-    echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitly" >> warn
 else
     ENABLE_WERROR="FALSE"
     AC_MSG_RESULT([no])