[Libreoffice-commits] .: configure.ac sal/Library_sal.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk

[Libreoffice Gerrit user]

 configure.ac               |    1 +
 sal/Library_sal.mk         |    5 +----
 vcl/Library_vcl.mk         |    5 +----
 vcl/Library_vclplug_gen.mk |    5 +----
 4 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit 89f80c167112837346ec5a63873f620a07a76493
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Nov 9 19:29:05 2012 +0100

    configure: why not set up VALGRIND_CFLAGS all in one place
    
    Also unbreaks the build because VALGRIND_CFLAGS is now never
    empty with cedd9ebdd260e99e74ad54391c0d0b1d1ebd9891.
    
    Change-Id: Ide5ca799b3656ccaff483ca05dbc18682136345f

diff --git a/configure.ac b/configure.ac
index c968dc2..77a6011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5058,6 +5058,7 @@ if test "$cross_compiling" != "yes" -a -n "$ENABLE_DBGUTIL" -a \
         AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=""])
     fi
     CPPFLAGS=$prev_cppflags
+    VALGRIND_CFLAGS="${VALGRIND_CFLAGS} -DHAVE_MEMCHECK_H=1"
 fi
 AC_SUBST([VALGRIND_CFLAGS])
 
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 73335be..854e95f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -40,10 +40,7 @@ $(eval $(call gb_Library_set_include,sal,\
 ))
 
 $(eval $(call gb_Library_add_defs,sal,\
-	$(if $(VALGRIND_CFLAGS), \
-		$(VALGRIND_CFLAGS) \
-		-DHAVE_MEMCHECK_H=1 \
-	) \
+	$(VALGRIND_CFLAGS) \
 	$(if $(filter $(ALLOC),SYS_ALLOC TCMALLOC JEMALLOC), \
 		-DFORCE_SYSALLOC \
 	) \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 469aa5e..6b1545a 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -471,10 +471,7 @@ vcl_headless_code=\
     vcl/headless/svpvd
 
 $(eval $(call gb_Library_add_defs,vcl,\
-    $(if $(VALGRIND_CFLAGS), \
-        $(VALGRIND_CFLAGS) \
-        -DHAVE_MEMCHECK_H=1 \
-    ) \
+	$(VALGRIND_CFLAGS) \
 ))
 
 ifeq ($(GUIBASE),unx)
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 0f709fd..38b866c 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -123,10 +123,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
 endif
 
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
-    $(if $(VALGRIND_CFLAGS), \
-        $(VALGRIND_CFLAGS) \
-        -DHAVE_MEMCHECK_H=1 \
-    ) \
+	$(VALGRIND_CFLAGS) \
 ))
 
 ## handle Xinerama