[gxml/gxml-0.12] Enable documentation generation by default

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 521e1ff19c1fa68b5dad47fa80855f5d080e0bf5
Author: Daniel Espinosa <esodan gmail com>
Date:   Tue Oct 25 23:46:29 2016 -0500

    Enable documentation generation by default

 Makefile.am  |    6 +-----
 configure.ac |   40 ++++++++++++++++------------------------
 2 files changed, 17 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index fe0019a..35d404b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,11 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 
 # Set up subdirectories to traverse
-SUBDIRS = gxml test po examples debian
-
-if ENABLE_DOCS
-SUBDIRS += docs
-endif
+SUBDIRS = gxml test po examples debian docs
 
 # Define available flags
 DISTCHECK_CONFIGURE_FLAGS = \
diff --git a/configure.ac b/configure.ac
index d1c5973..76cb37f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
 # Release Version
 m4_define([project_major_version], [0])
 m4_define([project_minor_version], [12])
-m4_define([project_micro_version], [0])
+m4_define([project_micro_version], [1])
 m4_define([project_nano_version], [0])
 
 # LT_VERSION
@@ -147,16 +147,12 @@ GOBJECT_INTROSPECTION_CHECK([1.32.0])
 AC_PATH_PROG(YELP_BUILD, [yelp-build], [no])
 AC_PATH_PROG([VALADOC], [valadoc], [no])
 
-AC_ARG_ENABLE([docs],
-              AS_HELP_STRING([--enable-docs],[Enable documentation generation]),
-        [enable_docs=$enableval], [enable_docs=no])
-AM_CONDITIONAL([ENABLE_DOCS], [test x$enable_docs = xyes])
 
 have_valadoc=no
-if test x$enable_docs = xyes -a "x$VALADOC" = "xno"; then
-               AC_MSG_RESULT([Required documentation but no valadoc found])
+if test "x$VALADOC" = "xno"; then
+               have_valadoc="no"
        else
-       have_valadoc="yes"
+               have_valadoc="yes"
 fi
 AM_CONDITIONAL([HAVE_VALADOC], [test x$have_valadoc = xyes])
 
@@ -166,13 +162,11 @@ PKG_CHECK_MODULES([GTKDOC], gtk-doc,[
     ],[
     found_gtk_docs=no
     ])
-if test x$enable_docs = xyes; then
-  if test x$have_valadoc = xyes; then
-    if test $found_gtk_docs=xyes; then
-      build_gtkdoc=yes
-    else
-      build_gtkdoc=no
-    fi
+if test x$have_valadoc = xyes; then
+  if test $found_gtk_docs=xyes; then
+    build_gtkdoc=yes
+  else
+    build_gtkdoc=no
   fi
 fi
 AM_CONDITIONAL([BUILD_GTK_DOCS], [test "x$build_gtkdoc" = "xyes"])
@@ -180,15 +174,13 @@ AM_CONDITIONAL([BUILD_GTK_DOCS], [test "x$build_gtkdoc" = "xyes"])
 build_devhelp=no
 build_mallard_doc=no
 build_gir_doc=no
-if test x$enable_docs = xyes; then
-  if test x$have_valadoc = "xyes"; then
-    if test x$YELP_BUILD != "xno"; then
-      build_devhelp=yes
-      YELP_HELP_INIT
-      build_mallard_doc=yes;
-    else
-      build_devhelp=no;
-    fi
+if test x$have_valadoc = "xyes"; then
+  if test x$YELP_BUILD != "xno"; then
+    build_devhelp=yes
+    YELP_HELP_INIT
+    build_mallard_doc=yes;
+  else
+    build_devhelp=no;
   fi
 fi
 AM_CONDITIONAL([BUILD_DEVHELP_DOCS], [test "x$build_devhelp" = "xyes"])