|
|
@ -1,17 +1,33 @@ |
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
|
|
index d14e193..645b341 100644
|
|
|
|
--- a/configure.ac
|
|
|
|
+++ b/configure.ac
|
|
|
|
@@ -233,7 +233,13 @@ else
|
|
|
|
AM_CONDITIONAL(USE_LIBDB, false) |
|
|
|
fi |
|
|
|
@@ -192,18 +192,18 @@ AM_CONDITIONAL(USE_GSTREAMER, test x"$HAVE_GSTREAMER" = "xyes")
|
|
|
|
AC_SUBST(GSTREAMER_CFLAGS) |
|
|
|
AC_SUBST(GSTREAMER_LIBS) |
|
|
|
|
|
|
|
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
|
|
|
|
+dnl Test if --enable-unit-test given
|
|
|
|
+AC_ARG_ENABLE(unit-test, [AC_HELP_STRING([--enable-unit-test],[enable unit test])])
|
|
|
|
+if test "x$enable_unit_test" = "xyes" ; then
|
|
|
|
+ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
|
|
|
|
-dnl Check for check
|
|
|
|
-PKG_CHECK_MODULES(CHECK, check >= 0.9.4, HAVE_CHECK=yes, HAVE_CHECK=no)
|
|
|
|
-
|
|
|
|
-if test x"$HAVE_CHECK" = "xyes"; then
|
|
|
|
- AC_DEFINE(HAVE_CHECK, 1, [Define if check support is enabled])
|
|
|
|
+dnl Check for check, which dmapd uses for its unit tests
|
|
|
|
+AC_ARG_ENABLE(check, [ --disable-check do not build check support], enable_check=$enableval, enable_check=yes)
|
|
|
|
+if test x$enable_check = xyes; then
|
|
|
|
+ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
|
|
|
|
+ AM_CONDITIONAL(USE_CHECK, test x"$have_check" = "xyes")
|
|
|
|
+ if test "x$have_check" = "xyes"; then
|
|
|
|
+ AC_DEFINE(HAVE_CHECK, 1, [Define if check support is enabled])
|
|
|
|
+ fi
|
|
|
|
+else
|
|
|
|
+ have_check=no
|
|
|
|
+fi
|
|
|
|
AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes") |
|
|
|
+ AM_CONDITIONAL(USE_CHECK, false)
|
|
|
|
fi |
|
|
|
|
|
|
|
-AM_CONDITIONAL(USE_CHECK, test x"$HAVE_CHECK" = "xyes")
|
|
|
|
-
|
|
|
|
-AC_SUBST(CHECK_CFLAGS)
|
|
|
|
-AC_SUBST(CHECK_LIBS)
|
|
|
|
-
|
|
|
|
AM_CONDITIONAL(FLYN, test "$FLYN") |
|
|
|
|
|
|
|
AC_OUTPUT([ |