summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2010-01-18 08:57:09 +0100
committerSimon Josefsson <simon@josefsson.org>2010-01-18 08:57:09 +0100
commit744278ac9cb9d356eb1b487a395928060c552b61 (patch)
tree9b799a322f394aadc908b3a6a8db5c3dafc08c6a /m4
parent74c942d2c95fb64b70189b63502a105219b6ebda (diff)
downloadlibtasn1-744278ac9cb9d356eb1b487a395928060c552b61.tar.gz
libtasn1-744278ac9cb9d356eb1b487a395928060c552b61.tar.bz2
libtasn1-744278ac9cb9d356eb1b487a395928060c552b61.zip
Make it work.
Diffstat (limited to 'm4')
-rw-r--r--m4/valgrind.m417
1 files changed, 10 insertions, 7 deletions
diff --git a/m4/valgrind.m4 b/m4/valgrind.m4
index 7d687af..e22370f 100644
--- a/m4/valgrind.m4
+++ b/m4/valgrind.m4
@@ -1,5 +1,5 @@
-# valgrind.m4 serial 1
-dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# 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,
dnl with or without modifications, as long as this notice is preserved.
@@ -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)
])