Merge pull request #10225 from flyn-org/dmapd

dmapd: update to 0.0.83
This commit is contained in:
Rosen Penev 2019-10-14 11:23:27 -07:00 committed by GitHub
commit 23d7466773
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 36 deletions

View File

@ -8,20 +8,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dmapd
PKG_VERSION:=0.0.82
PKG_VERSION:=0.0.83
PKG_RELEASE:=1
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=GPLv2
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.flyn.org/projects/dmapd
PKG_HASH:=7dc1a10d6c1363491492f159f7864d57194384b8007013088ca3b6c220e9e3f6
PKG_HASH:=ab372ff217d2a74a33d62098fe501da663e5dded0df67e2c2c83d968fa9ac7b9
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk

View File

@ -1,33 +0,0 @@
diff --git a/configure.ac b/configure.ac
index d14e193..645b341 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
-AM_CONDITIONAL(USE_CHECK, test x"$HAVE_CHECK" = "xyes")
-
-AC_SUBST(CHECK_CFLAGS)
-AC_SUBST(CHECK_LIBS)
-
AM_CONDITIONAL(FLYN, test "$FLYN")
AC_OUTPUT([