diff options
| author | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2011-03-02 18:30:24 +0100 |
|---|---|---|
| committer | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2011-03-02 18:30:24 +0100 |
| commit | 49d263bee6c8375c674eb73b663800a44803439b (patch) | |
| tree | 3d70287ae69242ad2fbc79659f3ce1a1d0bed30c /configure.in | |
| parent | ea0b43d274bab13b399690292a861427b7563af9 (diff) | |
#i115784# configure: move header checks after compiler checks.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/configure.in b/configure.in index e3ec9ba03654..1495a355fc54 100644 --- a/configure.in +++ b/configure.in @@ -1155,27 +1155,6 @@ AC_SUBST(PRODUCT) AC_SUBST(PROFULLSWITCH) AC_SUBST(PROEXT) -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 First setting is whether to include symbols into final build. dnl =================================================================== @@ -1967,6 +1946,30 @@ fi AC_SUBST(LFS_CFLAGS) dnl =================================================================== +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 Check if cups/cups.h is available dnl =================================================================== if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then |