diff options
| author | Andreas Jaeger <aj@gcc.gnu.org> | 2003-03-16 10:34:41 +0100 |
|---|---|---|
| committer | Andreas Jaeger <aj@gcc.gnu.org> | 2003-03-16 10:34:41 +0100 |
| commit | 72bd67f9353752e6ac37c9fe217dd3e2eacbc322 (patch) | |
| tree | 9e82580f8ef11517fb9a885b57f39d284127b214 | |
| parent | 4f907b595a4f1242abc1ce2f5d2aaf0c9d020945 (diff) | |
| download | gcc-72bd67f9353752e6ac37c9fe217dd3e2eacbc322.zip gcc-72bd67f9353752e6ac37c9fe217dd3e2eacbc322.tar.gz gcc-72bd67f9353752e6ac37c9fe217dd3e2eacbc322.tar.bz2 | |
configure.in: Improve check for memcheck.h.
* configure.in: Improve check for memcheck.h.
* configure: Regenerated.
From-SVN: r64430
| -rwxr-xr-x | gcc/configure | 4 | ||||
| -rw-r--r-- | gcc/configure.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/configure b/gcc/configure index 64ca2e0..77e4405 100755 --- a/gcc/configure +++ b/gcc/configure @@ -2179,8 +2179,8 @@ else echo "$ac_t""no" 1>&6 fi - if test "x$valgrind_path" = "x" || test $have_valgrind_h = no; then - { echo "configure: error: *** Can't find both valgrind and valgrind.h" 1>&2; exit 1; } + if test "x$valgrind_path" = "x" || (test $have_valgrind_h = no && test $gcc_cv_header_memcheck_h = no); then + { echo "configure: error: *** Can't find both valgrind and valgrind.h/memcheck.h" 1>&2; exit 1; } fi valgrind_path_defines=-DVALGRIND_PATH='\"'$valgrind_path'\"' valgrind_command="$valgrind_path -q" diff --git a/gcc/configure.in b/gcc/configure.in index d8df284..763cd2a 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -417,8 +417,8 @@ if test x$ac_checking_valgrind != x ; then AC_CHECK_HEADER(valgrind.h, have_valgrind_h=yes, have_valgrind_h=no) AM_PATH_PROG_WITH_TEST(valgrind_path, valgrind, [$ac_dir/$ac_word --version | grep valgrind- >/dev/null 2>&1]) - if test "x$valgrind_path" = "x" || test $have_valgrind_h = no; then - AC_MSG_ERROR([*** Can't find both valgrind and valgrind.h]) + if test "x$valgrind_path" = "x" || (test $have_valgrind_h = no && test $gcc_cv_header_memcheck_h = no); then + AC_MSG_ERROR([*** Can't find both valgrind and valgrind.h/memcheck.h]) fi valgrind_path_defines=-DVALGRIND_PATH='\"'$valgrind_path'\"' valgrind_command="$valgrind_path -q" |