[libdmapsharing] Build changes to ensure Vala is optional Signed-off-by: W. Michael Petullo <mike flyn org>



commit 9f72ed7975ee27bf03d9e25247f4ce437d62b538
Author: W. Michael Petullo <mike flyn org>
Date:   Wed Dec 15 17:03:52 2010 -0600

    Build changes to ensure Vala is optional
    Signed-off-by: W. Michael Petullo <mike flyn org>

 autogen.sh   |    2 +-
 configure.ac |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 616af9c..9fcca8c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,6 +6,6 @@ autoconf || exit 1
 autoheader || exit 1
 libtoolize --force || glibtoolize --force || exit 1
 automake -a || exit 1
-./configure $* || exit 1
+./configure --enable-maintainer-mode $* || exit 1
 
 exit 0
diff --git a/configure.ac b/configure.ac
index e66ccc5..8dd358b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,6 +327,7 @@ else
 fi
 
 AM_MAINTAINER_MODE
+AM_CONDITIONAL(HAVE_VALA, false)
 if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
         AM_PROG_VALAC([0.10.0])
         if test "x$VALAC" = "x" ; then
@@ -334,6 +335,7 @@ if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
         fi
 	AC_PATH_PROG(VALA_GEN_INTROSPECT, vala-gen-introspect)
 	AC_PATH_PROG(VAPIGEN, vapigen)
+	AM_CONDITIONAL(HAVE_VALA, true)
 fi
 
 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)
 AC_SUBST(GEE_CFLAGS)
 AC_SUBST(GEE_LIBS)
 
-if test "x$HAVE_GEE" = "xyes" -a "x$HAVE_GTK" = "xyes"; then
-	AM_CONDITIONAL(HAVE_VALA, true)
+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])
 fi
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]