From cc0f6f0232e471031546faec64239cf91a2a4b83 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 12 Feb 2001 20:25:58 +0000 Subject: [PATCH] Add check for gtk-doc version. Mon Feb 12 15:01:09 2001 Owen Taylor * configure.in (gtk_doc_min_version): Add check for gtk-doc version. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-12 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ configure.in | 17 ++++++++++++++++- 9 files changed, 48 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ac1d7fde..860f8360 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 12 15:01:09 2001 Owen Taylor + + * configure.in (gtk_doc_min_version): Add check for gtk-doc version. + 2001-02-10 Tor Lillqvist * gtypes.h diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ac1d7fde..860f8360 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Mon Feb 12 15:01:09 2001 Owen Taylor + + * configure.in (gtk_doc_min_version): Add check for gtk-doc version. + 2001-02-10 Tor Lillqvist * gtypes.h diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ac1d7fde..860f8360 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Mon Feb 12 15:01:09 2001 Owen Taylor + + * configure.in (gtk_doc_min_version): Add check for gtk-doc version. + 2001-02-10 Tor Lillqvist * gtypes.h diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ac1d7fde..860f8360 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +Mon Feb 12 15:01:09 2001 Owen Taylor + + * configure.in (gtk_doc_min_version): Add check for gtk-doc version. + 2001-02-10 Tor Lillqvist * gtypes.h diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ac1d7fde..860f8360 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Mon Feb 12 15:01:09 2001 Owen Taylor + + * configure.in (gtk_doc_min_version): Add check for gtk-doc version. + 2001-02-10 Tor Lillqvist * gtypes.h diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ac1d7fde..860f8360 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Mon Feb 12 15:01:09 2001 Owen Taylor + + * configure.in (gtk_doc_min_version): Add check for gtk-doc version. + 2001-02-10 Tor Lillqvist * gtypes.h diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ac1d7fde..860f8360 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Mon Feb 12 15:01:09 2001 Owen Taylor + + * configure.in (gtk_doc_min_version): Add check for gtk-doc version. + 2001-02-10 Tor Lillqvist * gtypes.h diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ac1d7fde..860f8360 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Mon Feb 12 15:01:09 2001 Owen Taylor + + * configure.in (gtk_doc_min_version): Add check for gtk-doc version. + 2001-02-10 Tor Lillqvist * gtypes.h diff --git a/configure.in b/configure.in index 0baf1eec..d5105ca5 100644 --- a/configure.in +++ b/configure.in @@ -1264,8 +1264,23 @@ fi 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 <= "$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) -- 2.34.1