[Libreoffice-commits] .: configure.ac

[Libreoffice Gerrit user]

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

New commits:
commit d91c37274fda0d18eeba684e905c2a2201d85134
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 9 19:59:04 2012 +0100

    configure: oops, let's try to fix that valgrind thing again...
    
    Change-Id: I151aa45838edbaa713b40716e45a75e812b7c782

diff --git a/configure.ac b/configure.ac
index 77a6011..f7bf0f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5057,8 +5057,10 @@ if test "$cross_compiling" != "yes" -a -n "$ENABLE_DBGUTIL" -a \
         CPPFLAGS=$VALGRIND_CFLAGS
         AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=""])
     fi
+    if test -n "$VALGRIND_CFLAGS"; then
+        VALGRIND_CFLAGS="${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1"
+    fi
     CPPFLAGS=$prev_cppflags
-    VALGRIND_CFLAGS="${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1"
 fi
 AC_SUBST([VALGRIND_CFLAGS])