diff options
| author | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2011-03-01 15:43:07 +0100 |
|---|---|---|
| committer | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2011-03-01 15:43:07 +0100 |
| commit | cc25d9d86ff6d156f2a4a05c6ba876e63516f6ed (patch) | |
| tree | 105a0646fd16b13bea8e76c146dce54cc39f2e3a /configure.in | |
| parent | 82b10c6aab95c00855cde85075237a86fd169a5e (diff) | |
#i115784# configure: fix valgrind header check, use VALGRIND_CFLAGS.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/configure.in b/configure.in index e3a4a11c660a..e3ec9ba03654 100644 --- a/configure.in +++ b/configure.in @@ -1156,9 +1156,25 @@ AC_SUBST(PROFULLSWITCH) AC_SUBST(PROEXT) if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then - AC_CHECK_HEADER([valgrind/memcheck.h], [HAVE_VALGRIND_MEMCHECK_H=TRUE], [HAVE_VALGRIND_MEMCHECK_H=FALSE]) + 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(HAVE_VALGRIND_MEMCHECK_H) +AC_SUBST([VALGRIND_CFLAGS]) dnl =================================================================== dnl First setting is whether to include symbols into final build. |