diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | configure.in | 26 |
7 files changed, 53 insertions, 9 deletions
@@ -1,3 +1,9 @@ +2002-11-21 15:43:54 2002 Dan Mills <thunder@ximian.com> + + * configure.in: replace gtk-doc version check with an all-sh + version that works better, + also up the required gtk-doc version to 0.10 (#99216). + 2002-11-21 Matthias Clasen <maclas@gmx.de> * configure.in: Generate docs/reference/*/version.xml. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 04d652ac9b..b0fbec6dba 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2002-11-21 15:43:54 2002 Dan Mills <thunder@ximian.com> + + * configure.in: replace gtk-doc version check with an all-sh + version that works better, + also up the required gtk-doc version to 0.10 (#99216). + 2002-11-21 Matthias Clasen <maclas@gmx.de> * configure.in: Generate docs/reference/*/version.xml. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 04d652ac9b..b0fbec6dba 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2002-11-21 15:43:54 2002 Dan Mills <thunder@ximian.com> + + * configure.in: replace gtk-doc version check with an all-sh + version that works better, + also up the required gtk-doc version to 0.10 (#99216). + 2002-11-21 Matthias Clasen <maclas@gmx.de> * configure.in: Generate docs/reference/*/version.xml. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 04d652ac9b..b0fbec6dba 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2002-11-21 15:43:54 2002 Dan Mills <thunder@ximian.com> + + * configure.in: replace gtk-doc version check with an all-sh + version that works better, + also up the required gtk-doc version to 0.10 (#99216). + 2002-11-21 Matthias Clasen <maclas@gmx.de> * configure.in: Generate docs/reference/*/version.xml. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 04d652ac9b..b0fbec6dba 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2002-11-21 15:43:54 2002 Dan Mills <thunder@ximian.com> + + * configure.in: replace gtk-doc version check with an all-sh + version that works better, + also up the required gtk-doc version to 0.10 (#99216). + 2002-11-21 Matthias Clasen <maclas@gmx.de> * configure.in: Generate docs/reference/*/version.xml. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 04d652ac9b..b0fbec6dba 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2002-11-21 15:43:54 2002 Dan Mills <thunder@ximian.com> + + * configure.in: replace gtk-doc version check with an all-sh + version that works better, + also up the required gtk-doc version to 0.10 (#99216). + 2002-11-21 Matthias Clasen <maclas@gmx.de> * configure.in: Generate docs/reference/*/version.xml. diff --git a/configure.in b/configure.in index a2bb77494d..e204ed5ebb 100644 --- a/configure.in +++ b/configure.in @@ -1440,19 +1440,27 @@ AC_SUBST(HTML_DIR) AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) -gtk_doc_min_version=0.9 -if $GTKDOC ; then +gtk_doc_min_version=0.10 +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= }"; gtk_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="$gtk_save_IFS" + + if $GTKDOC ; then AC_MSG_RESULT(yes) - else + else AC_MSG_RESULT(no) - GTKDOC=false - fi + fi fi AC_CHECK_PROG(DB2HTML, db2html, true, false) |