-[ --enable-unit-test Check for UT dependencies],
-[ PKG_CHECK_MODULES([LIBCPPUTEST],[cpputest])
- AC_CHECK_PROG(VALGRIND_CHECK, valgrind, yes)
- AS_IF([test x"$VALGRIND_CHECK" != x"yes"], [AC_MSG_ERROR([Install valgrind to run UT.])])
- UNIT_TEST_ENABLED=true
-],
-[ UNIT_TEST_ENABLED=false ])
-AM_CONDITIONAL([UNIT_TEST_ENABLED], [$UNIT_TEST_ENABLED])
+ [--disable-unit-test], [Disable unit tests]
+)
+
+AS_IF([test x"$enable_unit_test" != x"no"],
+ [
+ PKG_CHECK_MODULES([LIBCPPUTEST],[cpputest])
+ AM_CONDITIONAL([UNIT_TEST_ENABLED], [true])
+ ],
+ [
+ AM_CONDITIONAL([UNIT_TEST_ENABLED], [false])
+ ]
+)
+
+AC_ARG_ENABLE([unit-test-memcheck],
+ [AS_HELP_STRING([--disable-unit-test-memcheck], [Do not run unit tests with valgrind])]
+)
+
+AS_IF([test x"$enable_unit_test_memcheck" != x"no"],
+ [
+ AC_CHECK_PROG(VALGRIND_CHECK, valgrind, yes)
+ AM_CONDITIONAL([UNIT_TEST_MEMCHECK_ENABLED], [true])
+ ],
+ [
+ AM_CONDITIONAL([UNIT_TEST_MEMCHECK_ENABLED], [false])
+ ]
+)
+