[libchamplain/libchamplain-0-6] Always install vala bindings

[Jiří Techet <jiritechet src gnome org>]

commit 9385680c9daee191c180690faeeef886f275f91b
Author: JiÅ?í Techet <techet gmail com>
Date:   Wed Jun 16 22:19:09 2010 +0200

    Always install vala bindings
    
    ...and make only the vala demos built conditionally
    
    Signed-off-by: JiÅ?í Techet <techet gmail com>

 Makefile.am                     |    2 +-
 bindings/Makefile.am            |    4 +---
 bindings/vala/Makefile.am       |    6 +++++-
 bindings/vala/demos/Makefile.am |    1 +
 configure.ac                    |   12 ++++++------
 5 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 25fe110..9cfb951 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ endif
 pkgconfig_DATA = $(pcfiles)
 pkgconfigdir = $(libdir)/pkgconfig
 
-DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-gtk --enable-python --enable-vala --enable-introspection
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-gtk --enable-python --enable-vala-demos --enable-introspection
 
 EXTRA_DIST = \
 	champlain-gtk.pc.in \
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 13c6559..d36a605 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -4,6 +4,4 @@ if ENABLE_PYTHON
   SUBDIRS+=python
 endif
 
-if ENABLE_VALA
-  SUBDIRS+=vala
-endif
\ No newline at end of file
+SUBDIRS+=vala
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 76d852a..154bb49 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = champlain demos
+SUBDIRS = champlain
+
+if ENABLE_VALA_DEMOS
+  SUBDIRS += demos
+endif
 
 if ENABLE_GTK
   SUBDIRS += champlain-gtk
diff --git a/bindings/vala/demos/Makefile.am b/bindings/vala/demos/Makefile.am
index 40d112d..2859a98 100644
--- a/bindings/vala/demos/Makefile.am
+++ b/bindings/vala/demos/Makefile.am
@@ -15,3 +15,4 @@ VALAFLAGS = \
 launcher_LDADD = \
 	$(DEPS_LIBS) \
 	$(top_builddir)/champlain/libchamplain- CHAMPLAIN_API_VERSION@.la
+
diff --git a/configure.ac b/configure.ac
index 747e74b..edeb650 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,17 +193,17 @@ AM_CONDITIONAL(ENABLE_PYTHON, test "x$enable_python" = "xyes")
 GOBJECT_INTROSPECTION_CHECK([0.6.3])
 
 # -----------------------------------------------------------
-# Enable vala (default to "no")
+# Enable vala demos (default to "no")
 # -----------------------------------------------------------
 
 AC_PATH_PROG(VAPIGEN, vapigen, vapigen)
 AC_SUBST(VAPIGEN)
 
 AC_ARG_ENABLE(vala,
-  AC_HELP_STRING([--enable-vala],[Include vala champlain (and champlain-gtk)]),
-    enable_vala=$enableval, enable_vala=no )
+  AC_HELP_STRING([--enable-vala-demos],[Build vala bindings demos]),
+    enable_vala_demos=$enableval, enable_vala_demos=no )
 
-if test "x$enable_vala" = "xyes"; then
+if test "x$enable_vala_demos" = "xyes"; then
   AM_PROG_VALAC([0.8.0])
 
   if test "x$VALAC" = "x" ; then
@@ -211,7 +211,7 @@ if test "x$enable_vala" = "xyes"; then
   fi
 fi
 
-AM_CONDITIONAL(ENABLE_VALA, test "x$enable_vala" = "xyes")
+AM_CONDITIONAL(ENABLE_VALA_DEMOS, test "x$enable_vala_demos" = "xyes")
 
 # -----------------------------------------------------------
 # Generate features header file
@@ -293,7 +293,7 @@ echo "  Memphis source: ${enable_memphis}"
 echo ""
 echo "Bindings:"
 echo "       Python bindings: ${enable_python}"
-echo "       Vala bindings: ${enable_vala}"
+echo "       Vala bindings: yes"
 echo " gobject-introspection: ${enable_introspection}"
 echo ""