Commit 9f72ed79 authored by W. Michael Petullo's avatar W. Michael Petullo
Browse files

Build changes to ensure Vala is optional


Signed-off-by: W. Michael Petullo's avatarW. Michael Petullo <mike@flyn.org>
parent 3bd4fcb6
...@@ -6,6 +6,6 @@ autoconf || exit 1 ...@@ -6,6 +6,6 @@ autoconf || exit 1
autoheader || exit 1 autoheader || exit 1
libtoolize --force || glibtoolize --force || exit 1 libtoolize --force || glibtoolize --force || exit 1
automake -a || exit 1 automake -a || exit 1
./configure $* || exit 1 ./configure --enable-maintainer-mode $* || exit 1
exit 0 exit 0
...@@ -327,6 +327,7 @@ else ...@@ -327,6 +327,7 @@ else
fi fi
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AM_CONDITIONAL(HAVE_VALA, false)
if test "x$USE_MAINTAINER_MODE" = "xyes" ; then if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
AM_PROG_VALAC([0.10.0]) AM_PROG_VALAC([0.10.0])
if test "x$VALAC" = "x" ; then if test "x$VALAC" = "x" ; then
...@@ -334,6 +335,7 @@ if test "x$USE_MAINTAINER_MODE" = "xyes" ; then ...@@ -334,6 +335,7 @@ if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
fi fi
AC_PATH_PROG(VALA_GEN_INTROSPECT, vala-gen-introspect) AC_PATH_PROG(VALA_GEN_INTROSPECT, vala-gen-introspect)
AC_PATH_PROG(VAPIGEN, vapigen) AC_PATH_PROG(VAPIGEN, vapigen)
AM_CONDITIONAL(HAVE_VALA, true)
fi fi
PKG_CHECK_MODULES(GTK, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no) PKG_CHECK_MODULES(GTK, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
...@@ -346,9 +348,10 @@ PKG_CHECK_MODULES(GEE, gee-1.0, HAVE_GEE=yes, HAVE_GEE=no) ...@@ -346,9 +348,10 @@ PKG_CHECK_MODULES(GEE, gee-1.0, HAVE_GEE=yes, HAVE_GEE=no)
AC_SUBST(GEE_CFLAGS) AC_SUBST(GEE_CFLAGS)
AC_SUBST(GEE_LIBS) AC_SUBST(GEE_LIBS)
if test "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes"; then if test "x$HAVE_VALA" = "xyes" -a "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes"; then
AM_CONDITIONAL(HAVE_VALA, true) AM_CONDITIONAL(BUILD_DPAPVIEW, true)
else else
AM_CONDITIONAL(BUILD_DPAPVIEW, false)
AC_WARN([Will not build dpapview]) AC_WARN([Will not build dpapview])
fi fi
......
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