Use vala-0.10 or vala-0.12 package instead of vala-1.0.

diff --git a/.gitignore b/.gitignore
index 246a866176410f5b3a536cb580f3aff088222791..221b5ac0c217fe10522045cc3a81aa50ce5f849a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ Makefile
 *.stamp
 *.gir
 *.vapi
+*.deps
 .deps
 .libs
 

diff --git a/configure.in b/configure.in
index fe6dc82525db9facace53b673419c3e12847bfce..2400705af72a1843f0c5ef1cfe4cb7d3795d3c8e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -46,9 +46,17 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-PKG_CHECK_MODULES(LIBVALA, vala-1.0 >= $LIBVALA_REQUIRED)
+PKG_CHECK_EXISTS(vala-0.12,
+  [
+    PKG_CHECK_MODULES(LIBVALA, vala-0.12 >= $LIBVALA_REQUIRED)
+    VALA_PACKAGE=vala-0.12
+  ], [
+    PKG_CHECK_MODULES(LIBVALA, vala-0.10 >= $LIBVALA_REQUIRED)
+    VALA_PACKAGE=vala-0.10
+  ])
 AC_SUBST(LIBVALA_CFLAGS)
 AC_SUBST(LIBVALA_LIBS)
+AC_SUBST(VALA_PACKAGE)
 
 PKG_CHECK_MODULES(LIBGEE, gee-1.0 >= $LIBGEE_REQUIRED)
 AC_SUBST(LIBGEE_CFLAGS)
@@ -62,6 +70,7 @@ AC_SUBST(LIBGDKPIXBUF_LIBS)
 
 AC_CONFIG_FILES([Makefile
                  src/libvaladoc/valadoc-1.0.pc
+                 src/libvaladoc/valadoc-1.0.deps
                  src/Makefile
                  icons/Makefile
                  doc/Makefile

diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index 8527e11f32dd702b85d250bf2f1fa98f8b2e2471..701fc17d8ca219c2c47fd9ee7d002375600a1699 100644 (file)
--- a/src/doclets/devhelp/Makefile.am
+++ b/src/doclets/devhelp/Makefile.am
@@ -37,7 +37,7 @@ libdoclet_la_SOURCES =      \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg vala-1.0 --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
+       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc --pkg $(VALA_PACKAGE) --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
        touch $@
 
 

diff --git a/src/doclets/gtkdoc/Makefile.am b/src/doclets/gtkdoc/Makefile.am
index 6a1c76c948cb539ef4a59d52a650205059acf3f1..c985357ad8e0aa3600c22abe46503fe6edcd5435 100644 (file)
--- a/src/doclets/gtkdoc/Makefile.am
+++ b/src/doclets/gtkdoc/Makefile.am
@@ -42,7 +42,7 @@ libdoclet_la_SOURCES =  \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc  --pkg vala-1.0 --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
+       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc  --pkg $(VALA_PACKAGE) --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
        touch $@
 
 

diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index 4177352cb5b660af54f26617c008bc99a1e3cdc7..12612a246fb72d94a11d92ad274233e29fb83bc8 100644 (file)
--- a/src/doclets/htm/Makefile.am
+++ b/src/doclets/htm/Makefile.am
@@ -37,7 +37,7 @@ libdoclet_la_SOURCES =  \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc  --pkg vala-1.0 --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
+       $(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc  --pkg $(VALA_PACKAGE) --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
        touch $@
 
 

diff --git a/src/doclets/valadoc.org/Makefile.am b/src/doclets/valadoc.org/Makefile.am
index a2e7d1c028e36499d13ff885b2fb5dd62b5cafde..2313124e0d91ad84610ada0abd7b5b2ccf521e36 100755 (executable)
--- a/src/doclets/valadoc.org/Makefile.am
+++ b/src/doclets/valadoc.org/Makefile.am
@@ -11,7 +11,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
 
 
 libdoclet.vala.stamp: $(libdoclet_VALASOURCES)
-       $(VALAC) -C --vapidir $(top_srcdir)/src/libvaladoc/ --vapidir $(top_srcdir)/src/vapi/ --pkg vala-1.0 --pkg gee-1.0 --pkg valadoc-1.0 --basedir . --save-temps $^
+       $(VALAC) -C --vapidir $(top_srcdir)/src/libvaladoc/ --vapidir $(top_srcdir)/src/vapi/ --pkg $(VALA_PACKAGE) --pkg gee-1.0 --pkg valadoc-1.0 --basedir . --save-temps $^
        touch $@
 
 

diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index d95cd941fa9f0911a8a602d76d4c37670c7a9bbd..cde45008653a03f56b8a172b7a2a580698f6163b 100644 (file)
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-globalvapidir = `pkg-config vala-1.0 --variable vapidir`
+globalvapidir = `pkg-config $(VALA_PACKAGE) --variable vapidir`
 
 
 AM_CFLAGS = \
@@ -147,7 +147,7 @@ libvaladocincludedir = $(includedir)/
 
 
 libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
-       $(VALAC) $(VALAFLAGS) -C -H valadoc-1.0.h --pkg gee-1.0 --pkg vala-1.0 --pkg libgvc --pkg gmodule-2.0 --pkg libgvc --vapidir $(top_srcdir)/src/vapi --pkg config --library valadoc-1.0 --basedir $(top_srcdir)/src/libvaladoc/ --save-temps $^
+       $(VALAC) $(VALAFLAGS) -C -H valadoc-1.0.h --pkg gee-1.0 --pkg $(VALA_PACKAGE) --pkg libgvc --pkg gmodule-2.0 --pkg libgvc --vapidir $(top_srcdir)/src/vapi --pkg config --library valadoc-1.0 --basedir $(top_srcdir)/src/libvaladoc/ --save-temps $^
        touch $@
 
 
@@ -181,6 +181,10 @@ MAINTAINERCLEANFILES =                        \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = valadoc-1.0.pc
 
+valadoc-1.0.deps: valadoc-1.0.deps.in
+       cat $^ > $@
+       echo $(VALA_PACKAGE) >> $@
+
 vapidir = $(datadir)/vala/vapi
 vapi_DATA =     \
        valadoc-1.0.vapi \

diff --git a/src/libvaladoc/valadoc-1.0.deps b/src/libvaladoc/valadoc-1.0.deps
deleted file mode 100644 (file)
index 5871359..0000000
--- a/src/libvaladoc/valadoc-1.0.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-vala-1.0
-libgvc

diff --git a/src/libvaladoc/valadoc-1.0.deps.in b/src/libvaladoc/valadoc-1.0.deps.in
new file mode 100644 (file)
index 0000000..1745f3d
--- /dev/null
+++ b/src/libvaladoc/valadoc-1.0.deps.in
@@ -0,0 +1 @@
+libgvc

diff --git a/src/valadoc/Makefile.am b/src/valadoc/Makefile.am
index c6c05198c1c06d9f816f0e85d63f8fd9d087aef4..67bae8b9a59da1d1364fc87f761c1da2519f8cfe 100644 (file)
--- a/src/valadoc/Makefile.am
+++ b/src/valadoc/Makefile.am
@@ -40,7 +40,7 @@ valadoc_LDADD =                 \
 
 
 valadoc.vala.stamp: $(valadoc_VALASOURCES)
-       $(VALAC) -C --pkg config --pkg vala-1.0 --pkg gee-1.0 --pkg gmodule-2.0 --vapidir $(top_srcdir)/src/vapi/ --vapidir ../libvaladoc/ --pkg valadoc-1.0 $^
+       $(VALAC) -C --pkg config --pkg $(VALA_PACKAGE) --pkg gee-1.0 --pkg gmodule-2.0 --vapidir $(top_srcdir)/src/vapi/ --vapidir ../libvaladoc/ --pkg valadoc-1.0 $^
        touch $@