Commit 55a84173 authored by W. Michael Petullo's avatar W. Michael Petullo
Browse files

Do not use AM_CONDITIONAL within a shell conditional


Signed-off-by: W. Michael Petullo's avatarW. Michael Petullo <mike@flyn.org>
parent e0261c16
......@@ -338,15 +338,14 @@ AM_CONDITIONAL(USE_GSTREAMERAPP, test x"$HAVE_GSTREAMERAPP" = "xyes")
AC_SUBST(GSTREAMERAPP_CFLAGS)
AC_SUBST(GSTREAMERAPP_LIBS)
AM_CONDITIONAL(HAVE_VALA, false)
if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
AM_PROG_VALAC([0.11.4])
if test "x$VALAC" = "x" ; then
AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
fi
AC_PATH_PROG(VALA_GEN_INTROSPECT, vala-gen-introspect)
AC_PATH_PROG(VAPIGEN, vapigen)
AM_CONDITIONAL(HAVE_VALA, true)
AM_PROG_VALAC([0.11.4])
AM_CONDITIONAL(HAVE_VALAC, test -x "$VALAC")
AC_PATH_PROG(VALA_GEN_INTROSPECT, vala-gen-introspect)
AC_PATH_PROG(VAPIGEN, vapigen)
AM_CONDITIONAL(BUILD_VAPI, test -n "$VALA_GEN_INTROSPECT" -a -n "$VAPIGEN")
if test -n "$BUILD_VAPI" ; then
AC_WARN([will not build vapi])
fi
PKG_CHECK_MODULES(GTK, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
......@@ -360,20 +359,15 @@ AM_CONDITIONAL(HAVE_GEE, test "x$HAVE_GEE" = "xyes")
AC_SUBST(GEE_CFLAGS)
AC_SUBST(GEE_LIBS)
if test "x$HAVE_VALA" = "xyes" -a "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes"; then
AM_CONDITIONAL(BUILD_DPAPVIEW, true)
else
AM_CONDITIONAL(BUILD_DPAPVIEW, false)
AC_WARN([Will not build dpapview])
AM_CONDITIONAL(BUILD_DPAPVIEW, test "x$HAVE_VALA" = "xyes" -a "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes")
if test -n "$BUILD_DPAPVIEW" ; then
AC_WARN([will not build dpapview])
fi
AM_CONDITIONAL(HAVE_CHECK, false)
if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
AM_CONDITIONAL(HAVE_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
PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],have_check=yes,have_check=no)
AM_CONDITIONAL(HAVE_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
AC_CHECK_LIB(z, uncompress)
......
......@@ -52,7 +52,7 @@ test_dmap_server_LDADD = \
$(IMAGEMAGICK_LIBS) \
$(MDNS_LIBS)
if MAINTAINER_MODE
if HAVE_VALAC
BUILT_SOURCES = dacplisten.stamp dpapview.stamp dmapcopy.stamp dmapserve.stamp
dacplisten.stamp: $(dacplisten_VALASOURCES)
......@@ -170,7 +170,7 @@ EXTRA_DIST = \
$(dmapserve_VALABUILTSOURCES) \
dpapview.ui
if MAINTAINER_MODE
if HAVE_VALAC
CLEANFILES = \
$(BUILT_SOURCES) \
$(dpapview_VALABUILTSOURCES)
......
if MAINTAINER_MODE
if BUILD_VAPI
libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi: libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@-uninstalled.files libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@-uninstalled.namespace
PKG_CONFIG_PATH=$(top_builddir):${PKG_CONFIG_PATH} $(VALA_GEN_INTROSPECT) libdmapsharing-@API_VERSION@-uninstalled libdmapsharing-@API_VERSION@-daap
@mv libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@-uninstalled.gi libdmapsharing-@API_VERSION@-daap/libdmapsharing-@API_VERSION@.gi
......@@ -91,7 +91,7 @@ DISTCLEANFILES = \
libdmapsharing-@API_VERSION@-dmap/libdmapsharing-@API_VERSION@-uninstalled.files \
libdmapsharing-@API_VERSION@-dpap/libdmapsharing-@API_VERSION@-uninstalled.files
if MAINTAINER_MODE
if BUILD_VAPI
CLEANFILES += \
libdmapsharing-@API_VERSION@.vapi
endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment