cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

dmapd: update to 0.0.82

Browse Source 
Signed-off-by: W. Michael Petullo <mike@flyn.org>
This commit is contained in:
W. Michael Petullo
2019-05-19 22:34:05 -04:00
parent c2870de91f
commit 21a3086e44
2 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/dmapd/patches/001-make_unit_test_optional.patch
+28 -12
View File
@@ -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)
@@ -192,18 +192,18 @@ AM_CONDITIONAL(USE_GSTREAMER, test x"$HAVE_GSTREAMER" = "xyes")
AC_SUBST(GSTREAMER_CFLAGS)
AC_SUBST(GSTREAMER_LIBS)
-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
+ AM_CONDITIONAL(USE_CHECK, false)
fi
-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)
+else
+ have_check=no
+fi
AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
-AM_CONDITIONAL(USE_CHECK, test x"$HAVE_CHECK" = "xyes")
-
-AC_SUBST(CHECK_CFLAGS)
-AC_SUBST(CHECK_LIBS)
-
AM_CONDITIONAL(FLYN, test "$FLYN")
AC_OUTPUT([