Add gtk-doc checks for newly added docs/reference/ subdir.

Tue Sep  5 20:16:27 2000  Owen Taylor  <otaylor@redhat.com>

	* configure.in docs/Makefile.am: Add gtk-doc checks
	for newly added docs/reference/ subdir.

diff --git a/ChangeLog b/ChangeLog
index e7af6f6..6c82597 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep  5 20:16:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in docs/Makefile.am: Add gtk-doc checks
+       for newly added docs/reference/ subdir.
+
 2000-09-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e7af6f6..6c82597 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Sep  5 20:16:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in docs/Makefile.am: Add gtk-doc checks
+       for newly added docs/reference/ subdir.
+
 2000-09-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e7af6f6..6c82597 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Sep  5 20:16:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in docs/Makefile.am: Add gtk-doc checks
+       for newly added docs/reference/ subdir.
+
 2000-09-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index e7af6f6..6c82597 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Tue Sep  5 20:16:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in docs/Makefile.am: Add gtk-doc checks
+       for newly added docs/reference/ subdir.
+
 2000-09-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e7af6f6..6c82597 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Sep  5 20:16:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in docs/Makefile.am: Add gtk-doc checks
+       for newly added docs/reference/ subdir.
+
 2000-09-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e7af6f6..6c82597 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Sep  5 20:16:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in docs/Makefile.am: Add gtk-doc checks
+       for newly added docs/reference/ subdir.
+
 2000-09-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e7af6f6..6c82597 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Sep  5 20:16:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in docs/Makefile.am: Add gtk-doc checks
+       for newly added docs/reference/ subdir.
+
 2000-09-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e7af6f6..6c82597 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Sep  5 20:16:27 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in docs/Makefile.am: Add gtk-doc checks
+       for newly added docs/reference/ subdir.
+
 2000-09-05  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gthread.c (g_thread_error_quark): Don't use a G_LOCK, as it

diff --git a/configure.in b/configure.in
index dae9d8d..f4cee62 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1094,6 +1094,42 @@ GLIB_SYSDEFS(
        glibconfig-sysdefs.h,
        =)
 
+dnl **************************
+dnl *** Checks for gtk-doc ***
+dnl **************************
+
+AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
+
+if test "x$with_html_dir" = "x" ; then
+  HTML_DIR='${datadir}/gtk-doc/html'
+else
+  HTML_DIR=$with_html_dir
+fi
+
+AC_SUBST(HTML_DIR)
+
+
+AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
+AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
+AC_SUBST(HAVE_GTK_DOC)
+
+AC_CHECK_PROG(DB2HTML, db2html, true, false)
+AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
+
+dnl Let people disable the gtk-doc stuff.
+AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
+
+if test x$enable_gtk_doc = xauto ; then
+  if test x$GTKDOC = xtrue ; then
+    enable_gtk_doc=yes
+  else
+    enable_gtk_doc=no 
+  fi
+fi
+
+dnl NOTE: We need to use a separate automake conditional for this
+dnl       to make this work with the tarballs.
+AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
 
 dnl ******************************
 dnl *** output the whole stuff ***
@@ -1569,6 +1605,7 @@ gobject/Makefile
 gthread/Makefile
 docs/Makefile
 docs/glib-config.1
+docs/reference/Makefile
 tests/Makefile
 ],[case "$CONFIG_FILES" in
 *glib-config-2.0*)chmod +x glib-config-2.0;;

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2a46dec..af426bf 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+SUBDIRS = reference
+
 man_MANS = glib-config.1
 
 EXTRA_DIST = glib-config.1.in