Make gtk-doc not a hard dependency of GLib

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=674314

diff --git a/autogen.sh b/autogen.sh
index 01011d986748f070cc1840e3b5ce7bde57cc5a91..892b57b3b8d9878d36435ef09625e22ccf8efe1e 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,10 +7,13 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd "$srcdir"
 
-GTKDOCIZE=`which gtkdocize`
+GTKDOCIZE=$(which gtkdocize 2>/dev/null)
 if test -z $GTKDOCIZE; then
-        echo "*** No GTK-Doc found, please install it ***"
-        exit 1
+        echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
+        rm -f gtk-doc.make
+        echo 'EXTRA_DIST =' > gtk-doc.make
+else
+        gtkdocize || exit $?
 fi
 
 AUTORECONF=`which autoreconf`
@@ -24,7 +27,6 @@ fi
 # regenerated from their corresponding *.in files by ./configure anyway.
 touch README INSTALL
 
-gtkdocize || exit $?
 autoreconf --force --install --verbose || exit $?
 
 cd "$olddir"

diff --git a/configure.ac b/configure.ac
index 93d0f30461366d039b7bb11396ecf61b3a0f2d1b..c39f6a41a05c8669e7e070878253188968134d4e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2585,8 +2585,13 @@ AS_IF([ test $cross_compiling = yes && test x$enable_modular_tests = xyes], [
 dnl **************************
 dnl *** Checks for gtk-doc ***
 dnl **************************
-
+# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
+# it on it's own line.
+m4_ifdef([GTK_DOC_CHECK], [
 GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
+],[
+AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
+])
 
 AC_ARG_ENABLE(man,
               [AC_HELP_STRING([--enable-man],

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2349f44f6d376e608047474088f96a6d0422c27c..03580e8b06996cab1e7559bbabd95d0433c8a5af 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,7 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
+if ENABLE_GTK_DOC
 SUBDIRS = reference
+endif
 
 EXTRA_DIST += debugging.txt macros.txt