Use some shell magic rather than perl to check for the right gtk-doc

Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Use some shell magic rather than
        perl to check for the right gtk-doc version to
        avoid having to worry about finding Perl.
        Make checks handle 0.10 > 0.9. (#99120, Dan Mills)
        Check for 0.10, since we need that for
        --output-format=xml.

7 files changed, 73 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index b7a3c53b..d3e8e766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Use some shell magic rather than 
+	perl to check for the right gtk-doc version to
+	avoid having to worry about finding Perl. 
+	Make checks handle 0.10 > 0.9. (#99120, Dan Mills)
+	Check for 0.10, since we need that for 
+	--output-format=xml.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index b7a3c53b..d3e8e766 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,12 @@
+Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Use some shell magic rather than 
+	perl to check for the right gtk-doc version to
+	avoid having to worry about finding Perl. 
+	Make checks handle 0.10 > 0.9. (#99120, Dan Mills)
+	Check for 0.10, since we need that for 
+	--output-format=xml.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index b7a3c53b..d3e8e766 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,12 @@
+Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Use some shell magic rather than 
+	perl to check for the right gtk-doc version to
+	avoid having to worry about finding Perl. 
+	Make checks handle 0.10 > 0.9. (#99120, Dan Mills)
+	Check for 0.10, since we need that for 
+	--output-format=xml.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index b7a3c53b..d3e8e766 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,12 @@
+Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Use some shell magic rather than 
+	perl to check for the right gtk-doc version to
+	avoid having to worry about finding Perl. 
+	Make checks handle 0.10 > 0.9. (#99120, Dan Mills)
+	Check for 0.10, since we need that for 
+	--output-format=xml.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index b7a3c53b..d3e8e766 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,12 @@
+Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Use some shell magic rather than 
+	perl to check for the right gtk-doc version to
+	avoid having to worry about finding Perl. 
+	Make checks handle 0.10 > 0.9. (#99120, Dan Mills)
+	Check for 0.10, since we need that for 
+	--output-format=xml.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index b7a3c53b..d3e8e766 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,12 @@
+Thu Nov 21 00:26:40 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* configure.in: Use some shell magic rather than 
+	perl to check for the right gtk-doc version to
+	avoid having to worry about finding Perl. 
+	Make checks handle 0.10 > 0.9. (#99120, Dan Mills)
+	Check for 0.10, since we need that for 
+	--output-format=xml.
+
 2002-11-12  Tor Lillqvist  <tml@iki.fi>
 
 	* pango/pangowin32-fontcache.c (free_cache_entry,
diff --git a/configure.in b/configure.in
index e39f6d7b..c865f575 100644
--- a/configure.in
+++ b/configure.in
@@ -540,22 +540,32 @@ fi
 
 AC_SUBST(HTML_DIR)
 
+#
+# Check for sufficiently new gtk-doc
+#
+gtk_doc_min_version=0.10
 
 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
+
+    IFS="${IFS= 	}"; pango_save_IFS="$IFS"; IFS="."
+    set $gtk_doc_version
+    for min in $gtk_doc_min_version ; do
+        cur=$1; shift
+        if test -z $min ; then break; fi
+        if test -z $cur ; then GTKDOC=false; break; fi
+        if test $cur -gt $min ; then break ; fi
+        if test $cur -lt $min ; then GTKDOC=false; break ; fi
+    done
+    IFS="$pango_save_IFS"
+
+    if $GTKDOC ; then
       AC_MSG_RESULT(yes)
-   else
+    else
       AC_MSG_RESULT(no)
-      GTKDOC=false
-   fi
+    fi
 fi
 
 AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)