diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-08-24 13:27:56 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2014-08-24 13:27:56 +0200 |
| commit | 795076b221525b769e362c58cf4fe0a32bac279d (patch) | |
| tree | 484c45d4159389dc4c8e83cbd1818fc81c5fcea9 | |
| parent | b2e2e4cfbb5272250f0f8095b872d3953c08d7e5 (diff) | |
| download | vala-795076b221525b769e362c58cf4fe0a32bac279d.tar.gz | |
driver/0.24.x: Drop support for unstable valac <= 0.23.1
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/driver/0.24.x/Makefile.am | 6 | ||||
| -rw-r--r-- | src/driver/0.24.x/driver.vala | 2 | ||||
| -rw-r--r-- | src/driver/Makefile.am | 4 |
4 files changed, 0 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 88e830926..fcc60bff3 100644 --- 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 b7039ec3c..1331ac5d8 100644 --- 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 e140f0b99..902d28d4b 100644 --- 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 9832c6377..d3029018e 100644 --- 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 |