diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-18 18:42:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-18 18:42:44 +0200 |
| commit | 1e605745c151be5ba5ee7d9ca8be67e3a41217c4 (patch) | |
| tree | 54226a8074f770358ac1ea8fe5b749b0e89c5e8a /configure.in | |
| parent | 6c89ab0fdbdb3a286f56b4676bdff5a7eaca3f74 (diff) | |
Honor preset VALGRIND_CFLAGS in configure.
Diffstat (limited to 'configure.in')
| -rwxr-xr-x | configure.in | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 203d70b50a1f..7db548b5e04f 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], []) |