diff options
author | Simon Josefsson <simon@josefsson.org> | 2009-11-06 17:21:43 +0100 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2009-11-06 17:21:43 +0100 |
commit | 467beb9c1fc0c73a3cf834f60fb6fdf0673de15d (patch) | |
tree | 006a2b087203b8dd703202e8b3757e2eadab3cb7 | |
parent | fbe8f98598db6c5f239429a96ff0b1ad28eef009 (diff) | |
download | gnutls-467beb9c1fc0c73a3cf834f60fb6fdf0673de15d.tar.gz |
Fix --disable-valgrind-tests.
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | m4/valgrind.m4 | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index b24b3e11d4..9686aaebc2 100644 --- a/configure.ac +++ b/configure.ac @@ -299,7 +299,7 @@ AC_MSG_NOTICE([summary of build options: Compiler: ${CC} Warning flags: errors: ${WERROR_CFLAGS} warnings: ${WARN_CFLAGS} Library types: Shared=${enable_shared}, Static=${enable_static} - Valgrind: ${VALGRIND} + Valgrind: $opt_valgrind_tests ${VALGRIND} Guile wrappers: $opt_guile_bindings C++ library: $use_cxx OpenSSL library: $enable_openssl diff --git a/m4/valgrind.m4 b/m4/valgrind.m4 index 5a8006a5c7..e22370f4f5 100644 --- a/m4/valgrind.m4 +++ b/m4/valgrind.m4 @@ -1,4 +1,4 @@ -# valgrind.m4 serial 1 +# valgrind.m4 serial 2 dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,20 +11,23 @@ dnl From Simon Josefsson # Check if valgrind is available, and set VALGRIND to it if available. AC_DEFUN([sj_VALGRIND], [ + AC_ARG_ENABLE(valgrind-tests, + AS_HELP_STRING([--enable-valgrind-tests], + [run self tests under valgrind]), + [opt_valgrind_tests=$enableval], [opt_valgrind_tests=yes]) + # Run self-tests under valgrind? - if test "$cross_compiling" = no; then + if test "$opt_valgrind_tests" = "yes" && test "$cross_compiling" = no; then AC_CHECK_PROGS(VALGRIND, valgrind) fi + if test -n "$VALGRIND" && $VALGRIND true > /dev/null 2>&1; then opt_valgrind_tests=yes else opt_valgrind_tests=no VALGRIND= fi + AC_MSG_CHECKING([whether self tests are run under valgrind]) - AC_ARG_ENABLE(valgrind-tests, - AS_HELP_STRING([--enable-valgrind-tests], - [run self tests under valgrind]), - opt_valgrind_tests=$enableval) AC_MSG_RESULT($opt_valgrind_tests) ]) |