driver/0.24.x: Drop support for unstable valac <= 0.23.1

diff --git a/configure.ac b/configure.ac
index 88e8309260f6100ea745e11657ca6a11d1d22b6d..fcc60bff3c74e10c06b7e37b1e05ab53928f89e8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -86,9 +86,6 @@ AM_CONDITIONAL(HAVE_LIBVALA_0_26_X, test "$have_libvala_0_26_x" = "yes")
 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 b7039ec3c49b316a04dc580b8714d8c39db8227e..1331ac5d8c61f4090cce48afc1166848b9869a7e 100644 (file)
--- a/src/driver/0.24.x/Makefile.am
+++ b/src/driver/0.24.x/Makefile.am
@@ -2,17 +2,12 @@ NULL =
 
 VERSIONED_VAPI_DIR = $(shell 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 \
@@ -61,7 +56,6 @@ 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 e140f0b99ab2036e74dcc85cab990bc0a31e454a..902d28d4ba30644cf592662d05744d017a83627f 100644 (file)
--- a/src/driver/0.24.x/driver.vala
+++ b/src/driver/0.24.x/driver.vala
@@ -43,9 +43,7 @@ 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);

diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am
index 9832c637753ff2a7073bbfb6464ce8cf045e11bd..d3029018edfbc2532c5678dc9c8233a1ed6f60fe 100644 (file)
--- a/src/driver/Makefile.am
+++ b/src/driver/Makefile.am
@@ -16,10 +16,6 @@ if HAVE_LIBVALA_0_22_X
 DRIVER_0_22_X_DIR = 0.22.x
 endif
 
-if HAVE_LIBVALA_0_23_1
-DRIVER_0_24_X_DIR = 0.24.x
-endif
-
 if HAVE_LIBVALA_0_24_X
 DRIVER_0_24_X_DIR = 0.24.x
 endif