[gxml] Revert to requiring Vala 0.34



commit ba1a0cdba2a2934f8912fa394e430a4b2a332fa8
Author: Daniel Espinosa <esodan gmail com>
Date:   Mon Mar 6 09:54:40 2017 -0600

    Revert to requiring Vala 0.34
    
    Vala 0.34.6, will have backports required from libxml2 bindings.
    
    Fixed substitutions on valac.m4
    
    Removed Xmlx namespace from documentation, will be removed in next
    versions of GXml.
    
    Fixed documentation generation.

 configure.ac                      |    2 +-
 docs/valadoc/devhelp/Makefile.am  |    2 +-
 docs/valadoc/gir-docs/Makefile.am |    3 +--
 docs/valadoc/gtk-doc/Makefile.am  |    3 +--
 m4/valac.m4                       |    4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d4c2da0..9aab47c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,7 @@ AC_SUBST(GXML_LOCALEDIR)
 # TODO: what do we do about libvala's versioning?  set it back to -0.18 and see what happens when we 
upgraded from Fedora 18 to 19
 
 GLIB_REQUIRED=2.32.0
-VALA_REQUIRED=0.35.6.7
+VALA_REQUIRED=0.34
 LIBVALA_REQUIRED=0.34
 GEE_REQUIRED=0.18.0
 LIBXML_REQUIRED=2.7
diff --git a/docs/valadoc/devhelp/Makefile.am b/docs/valadoc/devhelp/Makefile.am
index 46c9fe2..56c8070 100644
--- a/docs/valadoc/devhelp/Makefile.am
+++ b/docs/valadoc/devhelp/Makefile.am
@@ -2,7 +2,7 @@
 CLEANFILES=
 
 VALADOC_FLAGS = \
-       --driver $(VALAC_VERSION) \
+       --driver $(VALA_API_VERSION) \
        --force \
        --package-name=GXml-$(API_VERSION) \
        --package-version=$(PACKAGE_VERSION) \
diff --git a/docs/valadoc/gir-docs/Makefile.am b/docs/valadoc/gir-docs/Makefile.am
index 419625a..0f6a5de 100644
--- a/docs/valadoc/gir-docs/Makefile.am
+++ b/docs/valadoc/gir-docs/Makefile.am
@@ -2,7 +2,7 @@
 CLEANFILES=
 
 VALADOC_FLAGS = \
-       --driver $(VALAC_VERSION) \
+       --driver $(VALA_API_VERSION) \
        --force \
        --package-name=gxml-$(API_VERSION) \
        --package-version=$(PACKAGE_VERSION) \
@@ -12,7 +12,6 @@ VALADOC_FLAGS = \
        --pkg gee-0.8 \
        --vapidir=$(top_srcdir)/gxml \
        --vapidir=$(top_srcdir)/vapi \
-       $(top_srcdir)/vapi/xlibxml-1.0.vapi \
        $(top_srcdir)/vapi/config.vapi
 
 sources= \
diff --git a/docs/valadoc/gtk-doc/Makefile.am b/docs/valadoc/gtk-doc/Makefile.am
index 91150c2..d319c15 100644
--- a/docs/valadoc/gtk-doc/Makefile.am
+++ b/docs/valadoc/gtk-doc/Makefile.am
@@ -2,7 +2,7 @@
 CLEANFILES=
 
 VALADOC_FLAGS = \
-       --driver $(VALAC_VERSION) \
+       --driver $(VALA_API_VERSION) \
        --force \
        --package-name=gxml-$(API_VERSION) \
        --package-version=$(PACKAGE_VERSION) \
@@ -12,7 +12,6 @@ VALADOC_FLAGS = \
        --pkg gee-0.8 \
        --vapidir=$(top_srcdir)/gxml \
        --vapidir=$(top_srcdir)/vapi \
-       $(top_srcdir)/vapi/xlibxml-1.0.vapi \
        $(top_srcdir)/vapi/config.vapi
 
 sources= \
diff --git a/m4/valac.m4 b/m4/valac.m4
index 1448ef0..a66211a 100644
--- a/m4/valac.m4
+++ b/m4/valac.m4
@@ -30,7 +30,7 @@ m4_define([_VALAC_CHECK_INTERNAL],
     ], [
       check_prog=yes
       AC_MSG_CHECKING([for VALA_API_VERSION])
-      VALAC_API_VERSION=`$VALAC --api-version`
+      VALA_API_VERSION=`$VALAC --api-version`
       AC_MSG_RESULT([$VALAC_API_VERSION])
       AC_MSG_CHECKING([for VAPIDIR])
       VAPIDIR=$datarootdir/vala-$VALAC_API_VERSION/vapi
@@ -68,7 +68,7 @@ m4_define([_VALAC_CHECK_INTERNAL],
   AC_SUBST([VAPIGEN_MAKEFILE])
   AC_SUBST([GEN_INTROSPECT])
   AC_SUBST([VALA_GEN_INTROSPECT])
-  AC_SUBST([VALAC_API_VERSION])
+  AC_SUBST([VALA_API_VERSION])
 ])
 
 dnl Check VAPIGEN


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]