Merge commit 'ooo/DEV300_m103'

Conflicts:
configure
configure.in
instsetoo_native/util/openoffice.lst
set_soenv.in
solenv/bin/cws.pl
solenv/bin/modules/installer/simplepackage.pm
solenv/gbuild/LinkTarget.mk
solenv/gbuild/extensions/post_PackModule.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/windows.mk
solenv/inc/installationtest.mk
solenv/inc/minor.mk
soltools/cpp/_eval.c

1 files changed, 27 insertions, 4 deletions

diff --git a/configure.in b/configure.in
index 838ddf57dcde..623573f80bb7 100755
--- a/configure.in
+++ b/configure.in
@@ -2359,8 +2359,31 @@ AC_SUBST(WORDS_BIGENDIAN)
 AC_SUBST(LFS_CFLAGS)
 
 dnl ===================================================================
-dnl Check the whether vba need to be delivered as an uno package or part
-dnl of the install
+dnl Check if valgrind.h is available 
+dnl ===================================================================
+if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; 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
+   if test -z "$VALGRIND_CFLAGS"; then
+      CPPFLAGS="-I/usr/local/include/valgrind"
+      AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [])
+   fi
+   if test -n "$VALGRIND_CFLAGS"; then
+      CPPFLAGS=$VALGRIND_CFLAGS
+      AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=""])
+   fi
+   CPPFLAGS=$prev_cppflags
+fi
+AC_SUBST([VALGRIND_CFLAGS])
+
+dnl ===================================================================
+dnl Whether to link to libcrypt.
 dnl ===================================================================
 
 
@@ -3809,9 +3832,9 @@ if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then
          AC_MSG_RESULT(yes)
       fi
       if echo "$WITH_MINGW" | $EGREP -q "/"; then
-         if ! test -x "`echo $WITH_MINGW | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGW | $SED -e s/g++/strip/)); fi
+         if ! test -x "`echo $WITH_MINGW | $SED -e s/[cg]++/strip/`"; then MINGWSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGW | $SED -e s/[cg]++/strip/)); fi
       else
-         AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGW | $SED -e s/g++/strip/`, false)
+         AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGW | $SED -e s/[cg]++/strip/`, false)
       fi
       if test "$MINGWSTRIP" = "false"; then
          AC_MSG_ERROR(MinGW32 binutils needed. Install them.)