Add check for gtk-doc version.

Mon Feb 12 15:01:38 2001  Owen Taylor  <otaylor@redhat.com>

	* configure.in (gtk_doc_min_version): Add check for
	gtk-doc version.

8 files changed, 100 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7f6861c4..237c5f9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Feb 12 15:01:38 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (gtk_doc_min_version): Add check for
+	gtk-doc version.
+
+Mon Feb 12 12:45:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: srcdir != build dir fix.
+
+	* docs/Makefile.am: Switching over to the new gtk-doc 
+	Makefile.am.
+
 2001-02-11  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pangox.c (font_struct_get_ligatures): memory leak fix
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 7f6861c4..237c5f9d 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,15 @@
+Mon Feb 12 15:01:38 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (gtk_doc_min_version): Add check for
+	gtk-doc version.
+
+Mon Feb 12 12:45:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: srcdir != build dir fix.
+
+	* docs/Makefile.am: Switching over to the new gtk-doc 
+	Makefile.am.
+
 2001-02-11  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pangox.c (font_struct_get_ligatures): memory leak fix
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 7f6861c4..237c5f9d 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,15 @@
+Mon Feb 12 15:01:38 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (gtk_doc_min_version): Add check for
+	gtk-doc version.
+
+Mon Feb 12 12:45:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: srcdir != build dir fix.
+
+	* docs/Makefile.am: Switching over to the new gtk-doc 
+	Makefile.am.
+
 2001-02-11  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pangox.c (font_struct_get_ligatures): memory leak fix
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 7f6861c4..237c5f9d 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,15 @@
+Mon Feb 12 15:01:38 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (gtk_doc_min_version): Add check for
+	gtk-doc version.
+
+Mon Feb 12 12:45:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: srcdir != build dir fix.
+
+	* docs/Makefile.am: Switching over to the new gtk-doc 
+	Makefile.am.
+
 2001-02-11  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pangox.c (font_struct_get_ligatures): memory leak fix
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 7f6861c4..237c5f9d 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,15 @@
+Mon Feb 12 15:01:38 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (gtk_doc_min_version): Add check for
+	gtk-doc version.
+
+Mon Feb 12 12:45:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: srcdir != build dir fix.
+
+	* docs/Makefile.am: Switching over to the new gtk-doc 
+	Makefile.am.
+
 2001-02-11  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pangox.c (font_struct_get_ligatures): memory leak fix
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 7f6861c4..237c5f9d 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,15 @@
+Mon Feb 12 15:01:38 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (gtk_doc_min_version): Add check for
+	gtk-doc version.
+
+Mon Feb 12 12:45:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: srcdir != build dir fix.
+
+	* docs/Makefile.am: Switching over to the new gtk-doc 
+	Makefile.am.
+
 2001-02-11  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pangox.c (font_struct_get_ligatures): memory leak fix
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 7f6861c4..237c5f9d 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,15 @@
+Mon Feb 12 15:01:38 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in (gtk_doc_min_version): Add check for
+	gtk-doc version.
+
+Mon Feb 12 12:45:16 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/Makefile.am: srcdir != build dir fix.
+
+	* docs/Makefile.am: Switching over to the new gtk-doc 
+	Makefile.am.
+
 2001-02-11  Havoc Pennington  <hp@pobox.com>
 
 	* pango/pangox.c (font_struct_get_ligatures): memory leak fix
diff --git a/configure.in b/configure.in
index 94b5f53c..02d9d43a 100644
--- a/configure.in
+++ b/configure.in
@@ -294,6 +294,22 @@ AC_SUBST(HTML_DIR)
 
 
 AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
+
+gtk_doc_min_version=0.6
+if $GTKDOC ; then 
+    gtk_doc_version=`gtkdoc-mkdb --version`
+    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
+    if perl <<EOF ; then
+      exit (("$gtk_doc_version" =~ /^[[0-9]]+\.[[0-9]]+$/) &&
+            ("$gtk_doc_version" >= "$gtk_doc_min_version") ? 0 : 1);
+EOF
+      AC_MSG_RESULT(yes)
+   else
+      AC_MSG_RESULT(no)
+      GTKDOC=false
+   fi
+fi
+
 AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
 AC_SUBST(HAVE_GTK_DOC)