summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-02-12 20:25:58 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-02-12 20:25:58 +0000
commitcc0f6f0232e471031546faec64239cf91a2a4b83 (patch)
treea60c1db0ac1c2677a88b82eb571706785464804b
parentd6fe9f43b3e3fee7f440c7f451bcbfb56a4ffddc (diff)
Add check for gtk-doc version.GLIB_1_2_9PRE1
Mon Feb 12 15:01:09 2001 Owen Taylor <otaylor@redhat.com> * configure.in (gtk_doc_min_version): Add check for gtk-doc version.
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-04
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-124
-rw-r--r--ChangeLog.pre-2-24
-rw-r--r--ChangeLog.pre-2-44
-rw-r--r--ChangeLog.pre-2-64
-rw-r--r--ChangeLog.pre-2-84
-rw-r--r--configure.in17
9 files changed, 48 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ac1d7fde1..860f83603 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 12 15:01:09 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (gtk_doc_min_version): Add check for gtk-doc version.
+
2001-02-10 Tor Lillqvist <tml@iki.fi>
* gtypes.h
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index ac1d7fde1..860f83603 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Mon Feb 12 15:01:09 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (gtk_doc_min_version): Add check for gtk-doc version.
+
2001-02-10 Tor Lillqvist <tml@iki.fi>
* gtypes.h
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ac1d7fde1..860f83603 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Mon Feb 12 15:01:09 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (gtk_doc_min_version): Add check for gtk-doc version.
+
2001-02-10 Tor Lillqvist <tml@iki.fi>
* gtypes.h
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ac1d7fde1..860f83603 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Mon Feb 12 15:01:09 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (gtk_doc_min_version): Add check for gtk-doc version.
+
2001-02-10 Tor Lillqvist <tml@iki.fi>
* gtypes.h
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ac1d7fde1..860f83603 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Mon Feb 12 15:01:09 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (gtk_doc_min_version): Add check for gtk-doc version.
+
2001-02-10 Tor Lillqvist <tml@iki.fi>
* gtypes.h
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ac1d7fde1..860f83603 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Mon Feb 12 15:01:09 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (gtk_doc_min_version): Add check for gtk-doc version.
+
2001-02-10 Tor Lillqvist <tml@iki.fi>
* gtypes.h
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ac1d7fde1..860f83603 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Mon Feb 12 15:01:09 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (gtk_doc_min_version): Add check for gtk-doc version.
+
2001-02-10 Tor Lillqvist <tml@iki.fi>
* gtypes.h
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ac1d7fde1..860f83603 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Mon Feb 12 15:01:09 2001 Owen Taylor <otaylor@redhat.com>
+
+ * configure.in (gtk_doc_min_version): Add check for gtk-doc version.
+
2001-02-10 Tor Lillqvist <tml@iki.fi>
* gtypes.h
diff --git a/configure.in b/configure.in
index 0baf1eec9..d5105ca53 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 <<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)