[libdmapsharing] Do not try to build dpapview when GTK3 is not present
- From: W. Michael Petullo <wmpetullo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdmapsharing] Do not try to build dpapview when GTK3 is not present
- Date: Fri, 3 Jul 2020 16:22:51 +0000 (UTC)
commit 2d8030a98282be1409a660ee2fa23761863dd4a6
Author: W. Michael Petullo <mike flyn org>
Date: Fri Jul 3 11:22:01 2020 -0500
Do not try to build dpapview when GTK3 is not present
Closes #33.
configure.ac | 8 ++++++--
tests/Makefile.am | 8 +++++---
2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index df54ab3..73202db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -362,12 +362,16 @@ AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
PKG_CHECK_MODULES(GEE, gee-0.8, HAVE_GEE=yes, HAVE_GEE=no)
-AM_CONDITIONAL(HAVE_GEE, test "x$HAVE_GEE" = "xyes")
AC_SUBST(GEE_CFLAGS)
AC_SUBST(GEE_LIBS)
-AM_CONDITIONAL(BUILD_DPAPVIEW, test "x$HAVE_VALA" = "xyes" -a "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes")
+AM_CONDITIONAL(BUILD_VALATESTS, test -x "$VALAC" -a "x$HAVE_GEE" = "xyes")
+if test -n "$BUILD_VALATESTS" ; then
+ AC_MSG_WARN([Will not build Vala tests])
+fi
+
+AM_CONDITIONAL(BUILD_DPAPVIEW, test -x "$VALAC" -a "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes")
if test -n "$BUILD_DPAPVIEW" ; then
AC_MSG_WARN([Will not build dpapview])
fi
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ffc79bc..3bff00e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,10 +1,12 @@
if TESTS_ENABLED
noinst_PROGRAMS = test-dmap-client test-dmap-server
-if BUILD_VAPI
-if HAVE_GEE
-noinst_PROGRAMS += dacplisten dpapview dmapcopy dmapserve
+if BUILD_VALATESTS
+noinst_PROGRAMS += dacplisten dmapcopy dmapserve
endif
+
+if BUILD_DPAPVIEW
+noinst_PROGRAMS += dpapview
endif
# Automake documentation mentions LDADD, but it does not work;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]