driver/0.24.x: Fix build with valac 0.23.1+ git master

diff --git a/configure.ac b/configure.ac
index b8ca0f332ec706b49850a7d2c26677ae4c342c59..513e167857bbdf1e74cff420b9e1fbed748b12c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,9 +80,12 @@ AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
 ## Drivers:
 ##
 
-PKG_CHECK_MODULES(LIBVALA_0_24_X, libvala-0.24 >= 0.17.4, have_libvala_0_24_x="yes", have_libvala_0_24_x="no")
+PKG_CHECK_MODULES(LIBVALA_0_24_X, libvala-0.24 > 0.23.1, have_libvala_0_24_x="yes", have_libvala_0_24_x="no")
 AM_CONDITIONAL(HAVE_LIBVALA_0_24_X, test "$have_libvala_0_24_x" = "yes")
 
+PKG_CHECK_MODULES(LIBVALA_0_23_1, libvala-0.24 <= 0.23.1, have_libvala_0_23_1="yes", have_libvala_0_23_1="no")
+AM_CONDITIONAL(HAVE_LIBVALA_0_23_1, test "$have_libvala_0_23_1" = "yes")
+
 PKG_CHECK_MODULES(LIBVALA_0_22_X, libvala-0.22 >= 0.17.4, have_libvala_0_22_x="yes", have_libvala_0_22_x="no")
 AM_CONDITIONAL(HAVE_LIBVALA_0_22_X, test "$have_libvala_0_22_x" = "yes")
 

diff --git a/src/driver/0.24.x/Makefile.am b/src/driver/0.24.x/Makefile.am
index 37a8255a60c95994469a7141c506ce62335ea0de..0ba1345b0ace186d0abf207ebf55c92a82d7a701 100644 (file)
--- a/src/driver/0.24.x/Makefile.am
+++ b/src/driver/0.24.x/Makefile.am
@@ -2,12 +2,17 @@ NULL =
 
 VERSIONED_VAPI_DIR=`pkg-config libvala-0.24 --variable vapidir`
 
+if HAVE_LIBVALA_0_23_1
+VALAFLAGS = -D VALA_0_23_1
+endif
+
 AM_CFLAGS = \
        -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
        -I $(top_builddir)/src/libvaladoc/ \
        $(GLIB_CFLAGS) \
        $(LIBGEE_CFLAGS) \
        $(LIBGVC_CFLAGS) \
+       $(LIBVALA_0_23_1_CFLAGS) \
        $(LIBVALA_0_24_X_CFLAGS) \
        -g \
        -w \
@@ -56,6 +61,7 @@ libdriver.vala.stamp: $(libdriver_la_VALASOURCES) Makefile
 libdriver_la_LIBADD = \
        $(top_builddir)/src/libvaladoc/libvaladoc.la \
        $(GLIB_LIBS) \
+       $(LIBVALA_0_23_1_LIBS) \
        $(LIBVALA_0_24_X_LIBS) \
        $(LIBGEE_LIBS) \
        $(LIBGVC_LIBS) \

diff --git a/src/driver/0.24.x/driver.vala b/src/driver/0.24.x/driver.vala
index 6bed3b94253aecda9d3488c0312e21773ab8201a..e140f0b99ab2036e74dcc85cab990bc0a31e454a 100644 (file)
--- a/src/driver/0.24.x/driver.vala
+++ b/src/driver/0.24.x/driver.vala
@@ -43,6 +43,9 @@ public class Valadoc.Drivers.Driver : Object, Valadoc.Driver {
 
                gir_writer.write_file ((Vala.CodeContext) tree.data,
                                                           gir_directory,
+#if !VALA_0_23_1
+                                                          "%s-%s.gir".printf (settings.gir_namespace, settings.gir_version),
+#endif
                                                           settings.gir_namespace,
                                                           settings.gir_version,
                                                           settings.pkg_name);