diff options
| author | Emanuele Aina <em@nerd.ocracy.org> | 2007-06-26 13:52:49 +0000 |
|---|---|---|
| committer | Emanuele Aina <em@nerd.ocracy.org> | 2007-06-26 13:52:49 +0000 |
| commit | ecd806d9ca7b6a5623b6940fb6d9875526a76e56 (patch) | |
| tree | 9b3e377bced0c73170756ebba9e67791e218e0bb /m4 | |
| parent | 0e15968b5ee1c61bf9e1720e5240b598a1143660 (diff) | |
| download | telepathy-salut-ecd806d9ca7b6a5623b6940fb6d9875526a76e56.tar.gz | |
Allow specifying the Valgrind version for the SALUT_VALGRIND macro
20070626135249-f974e-6aa4befe1ddb18615b25bda3fb8d74001473ce3e.gz
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/salut-args.m4 | 2 | ||||
| -rw-r--r-- | m4/salut-valgrind.m4 | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/m4/salut-args.m4 b/m4/salut-args.m4 index 433113a2..80abdc32 100644 --- a/m4/salut-args.m4 +++ b/m4/salut-args.m4 @@ -48,7 +48,7 @@ AC_DEFUN([SALUT_ARG_VALGRIND], ], [enable=no]) - SALUT_VALGRIND($enable) + SALUT_VALGRIND($enable, [2.1]) ]) AC_DEFUN([SALUT_ARG_COVERAGE], diff --git a/m4/salut-valgrind.m4 b/m4/salut-valgrind.m4 index 6c1ffd51..8bb679d6 100644 --- a/m4/salut-valgrind.m4 +++ b/m4/salut-valgrind.m4 @@ -3,9 +3,13 @@ dnl Detect Valgrind location and flags AC_DEFUN([SALUT_VALGRIND], [ enable=$1 + if test -n "$2"; then + valgrind_req=$2 + else + valgrind_req="2.1" + fi - VALGRIND_REQ="2.1" - PKG_CHECK_MODULES(VALGRIND, valgrind > $VALGRIND_REQ, + PKG_CHECK_MODULES(VALGRIND, valgrind > "$valgrind_req", have_valgrind_runtime="yes", have_valgrind_runtime="no") AC_PATH_PROG(VALGRIND_PATH, valgrind) |