diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-27 15:35:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-27 15:35:02 +0100 |
| commit | 49313b0626356f4726dc3bd52b237bbb81928a36 (patch) | |
| tree | 6c566f26d5d56a61f2d5eb814512893a12bcf4c5 /configure.ac | |
| parent | a0a58556f36cbf396f5139e18881720ed838ddd4 (diff) | |
Make python3 work with custom VALGRIND_CFLAGS
Change-Id: Ia4b08a1b20bf46af4d06c0478ed8e795ee543703
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index c0dc0ae1b511..71dcd56302fb 100644 --- a/configure.ac +++ b/configure.ac @@ -5074,25 +5074,21 @@ AC_SUBST(ALIGNOF_LONG) AC_SUBST(ALIGNOF_DOUBLE) dnl =================================================================== -dnl Check if valgrind.h is available +dnl Check if valgrind headers are available dnl =================================================================== -if test "$cross_compiling" != "yes" -a -n "$ENABLE_DBGUTIL" -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 +if test "$cross_compiling" = yes -o "$ENABLE_DBGUTIL" != TRUE; then + ENABLE_VALGRIND=FALSE +else prev_cppflags=$CPPFLAGS - 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], []) - fi - if test -n "$VALGRIND_CFLAGS"; then - CPPFLAGS=$VALGRIND_CFLAGS - AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=""]) - fi + CPPFLAGS="$CPPFLAGS $VALGRIND_CFLAGS" + AC_CHECK_HEADER([valgrind/valgrind.h], + [ENABLE_VALGRIND=TRUE],[ENABLE_VALGRIND=FALSE]) CPPFLAGS=$prev_cppflags fi +AC_SUBST([ENABLE_VALGRIND]) +if test "$ENABLE_VALGRIND" = FALSE; then + VALGRIND_CFLAGS= +fi AC_SUBST([VALGRIND_CFLAGS]) dnl =================================================================== |