[gxml] Fixed documentation generation valadoc - gtk-doc build

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 297d50e237257103e1f1bd8eb9b0294a5b16f2eb
Author: Daniel Espinosa <esodan gmail com>
Date:   Sun May 3 08:47:50 2015 -0500

    Fixed documentation generation valadoc - gtk-doc build

 configure.ac                      |   18 ++++++++++++------
 docs/valadoc/Makefile.am          |    1 +
 docs/valadoc/devhelp/Makefile.am  |    3 ++-
 docs/valadoc/gir-docs/Makefile.am |    3 ++-
 docs/valadoc/gtk-doc/Makefile.am  |    3 ++-
 vapi/xlibxml-1.0.vapi             |   12 ++++++------
 6 files changed, 25 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1aa4295..745eaa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -115,7 +115,8 @@ 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.20.0
+VALA_REQUIRED=0.26.0
+LIBVALA_REQUIRED=0.26
 GEE_REQUIRED=0.10.5
 LIBXML_REQUIRED=2.7
 GIO_MODULES="gio-2.0 >= 2.16"
@@ -145,7 +146,7 @@ GOBJECT_INTROSPECTION_CHECK([1.32.0])
 # Documentation with Valadoc
 AC_ARG_ENABLE([docs],
               AS_HELP_STRING([--enable-docs],[Enable documentation generation]),
-             [enable_docs=$enableval], [enable_docs=no])
+        [enable_docs=$enableval], [enable_docs=no])
 AM_CONDITIONAL([ENABLE_DOCS], [test x$enable_docs = xyes])
 
 have_valadoc=no
@@ -156,7 +157,7 @@ if test x$enable_docs = xyes; then
   then
       AC_MSG_RESULT([valadoc documentation not build because not found])
   else
-      VAPIDIR=`$PKG_CONFIG --variable=vapidir libvalac-$VALA_REQUIRED`
+      VAPIDIR=`$PKG_CONFIG --variable=vapidir libvala-$LIBVALA_REQUIRED`
       have_valadoc="yes"
       AC_SUBST(VALADOC)
   fi
@@ -166,15 +167,20 @@ AM_CONDITIONAL([HAVE_VALADOC], [test x$have_valadoc = xyes])
 
 AC_ARG_ENABLE([devhelp-docs],
               AS_HELP_STRING([--enable-devhelp-docs],[Enable DevHelp documentation generation]),
-             [enable_devhelp_docs=$enableval], [enable_devhelp_docs=no])
+        [enable_devhelp_docs=$enableval], [enable_devhelp_docs=no])
 
 AC_ARG_ENABLE([gtk-docs],
               AS_HELP_STRING([--enable-gtk-docs],[Enable gtk-doc documentation generation]),
-             [enable_gtk_docs=$enableval], [enable_gtk_docs=no])
+        [enable_gtk_docs=$enableval], [enable_gtk_docs=no])
+
+have_gtkdoc=no
+if test x$enable_gtk_docs = xyes; then
+  PKG_CHECK_MODULES([GTKDOC], gtk-doc)
+fi
 
 AC_ARG_ENABLE([gir-docs],
               AS_HELP_STRING([--enable-gir-docs],[Enable documented GIR generation]),
-             [enable_gir_docs=$enableval], [enable_gir_docs=no])
+        [enable_gir_docs=$enableval], [enable_gir_docs=no])
 
 
 dnl Find yelp-build program
diff --git a/docs/valadoc/Makefile.am b/docs/valadoc/Makefile.am
index da0c37c..0fe83c6 100644
--- a/docs/valadoc/Makefile.am
+++ b/docs/valadoc/Makefile.am
@@ -83,6 +83,7 @@ gxml_doc_files = \
 
 # todo: find out what dependencies I want/need to set
 gxml_doc_deps = \
+       xlibxml-1.0 \
        gio-2.0 \
        gee-0.8 \
        libxml-2.0 \
diff --git a/docs/valadoc/devhelp/Makefile.am b/docs/valadoc/devhelp/Makefile.am
index 5b99272..2238bb5 100644
--- a/docs/valadoc/devhelp/Makefile.am
+++ b/docs/valadoc/devhelp/Makefile.am
@@ -11,7 +11,8 @@ VALADOC_FLAGS = \
        --pkg libxml-2.0 \
        --pkg gee-0.8 \
        --vapidir=$(top_srcdir)/gxml \
-       --vapidir=$(top_srcdir)/vapi
+       --vapidir=$(top_srcdir)/vapi \
+       $(top_srcdir)/vapi/xlibxml-1.0.vapi
 
 sources= \
        $(top_srcdir)/gxml/*.vala
diff --git a/docs/valadoc/gir-docs/Makefile.am b/docs/valadoc/gir-docs/Makefile.am
index 65a620b..eb75518 100644
--- a/docs/valadoc/gir-docs/Makefile.am
+++ b/docs/valadoc/gir-docs/Makefile.am
@@ -11,7 +11,8 @@ VALADOC_FLAGS = \
        --pkg libxml-2.0 \
        --pkg gee-0.8 \
        --vapidir=$(top_srcdir)/gxml \
-       --vapidir=$(top_srcdir)/vapi
+       --vapidir=$(top_srcdir)/vapi \
+       $(top_srcdir)/vapi/xlibxml-1.0.vapi
 
 sources= \
        $(top_srcdir)/gxml/*.vala
diff --git a/docs/valadoc/gtk-doc/Makefile.am b/docs/valadoc/gtk-doc/Makefile.am
index 99e2096..5ef06d5 100644
--- a/docs/valadoc/gtk-doc/Makefile.am
+++ b/docs/valadoc/gtk-doc/Makefile.am
@@ -11,7 +11,8 @@ VALADOC_FLAGS = \
        --pkg libxml-2.0 \
        --pkg gee-0.8 \
        --vapidir=$(top_srcdir)/gxml \
-       --vapidir=$(top_srcdir)/vapi
+       --vapidir=$(top_srcdir)/vapi \
+       $(top_srcdir)/vapi/xlibxml-1.0.vapi
 
 sources= \
        $(top_srcdir)/gxml/*.vala
diff --git a/vapi/xlibxml-1.0.vapi b/vapi/xlibxml-1.0.vapi
index 19b33a7..8590dfd 100644
--- a/vapi/xlibxml-1.0.vapi
+++ b/vapi/xlibxml-1.0.vapi
@@ -16,18 +16,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  *
  * Author:
- *     Daniel Espinosa <esodan gmail com>
+ * Daniel Espinosa <esodan gmail com>
  */
 [CCode (cheader_filename = "gxml/xlibxml.h")]
 namespace Xmlx {
   [CCode (cname = "gxml_doc_get_intsubset_entities", cheader_filename = "gxml/xlibxml.h")]
-  static Xml.HashTable doc_get_dtd_entities (Xml.Doc *doc);
+  public static Xml.HashTable doc_get_dtd_entities (Xml.Doc *doc);
   [CCode (cname = "gxml_validate_name", cheader_filename = "gxml//xlibxml.h")]
-  static int validate_name (string name, int space);
+  public static int validate_name (string name, int space);
   [CCode (cname = "gxml_parser_context_get_last_error", cheader_filename = "gxml/xlibxml.h")]
-  static Xml.Error* parser_context_get_last_error (Xml.ParserCtxt ctx);
+  public static Xml.Error* parser_context_get_last_error (Xml.ParserCtxt ctx);
   [CCode (cname = "gxml_get_last_error", cheader_filename = "gxml/xlibxml.h")]
-  static Xml.Error* get_last_error ();
+  public static Xml.Error* get_last_error ();
   [CCode (cname = "gxml_doc_get_ns_list", array_null_terminated = true, cheader_filename = "gxml/xlibxml.h")]
-  static Xml.Ns*[] doc_get_ns_list (Xml.Doc* doc, Xml.Node* node);
+  public static Xml.Ns*[] doc_get_ns_list (Xml.Doc* doc, Xml.Node* node);
 }