diff options
| author | Padraig O'Briain <padraigo@src.gnome.org> | 2002-11-21 15:30:28 +0000 |
|---|---|---|
| committer | Padraig O'Briain <padraigo@src.gnome.org> | 2002-11-21 15:30:28 +0000 |
| commit | ba095cf05a4f88c9b836fdbf8713946d247b2352 (patch) | |
| tree | 9ba934e91931d1e28a73ccb144a70954c5d48468 | |
| parent | 8f4a6da49a191e356b79995eb512717d084e127c (diff) | |
| download | atk-ba095cf05a4f88c9b836fdbf8713946d247b2352.tar.gz | |
Upadte to take account of gtk-doc-version being 0.10 Updated version
* configure.in: Upadte to take account of gtk-doc-version being 0.10
Updated version required to 0.9
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 25 |
2 files changed, 21 insertions, 9 deletions
@@ -1,3 +1,8 @@ +2002-11-21 Padraig O'Briain <padraig.obriain@sun.com> + + * configure.in: Upadte to take account of gtk-doc-version being 0.10 + Updated version required to 0.9 + 2002-11-20 Bill Haneman <bill.haneman@sun.com> * atk/atkobject.h: diff --git a/configure.in b/configure.in index c3eb2e8..c091f74 100644 --- a/configure.in +++ b/configure.in @@ -135,21 +135,28 @@ PKG_CHECK_MODULES(DEP, glib-2.0 >= $GLIB_REQUIRED_VERSION $GLIB_PACKAGES, , AC_M # Rerun PKG_CONFIG to add gthread-2.0 cflags, but not libs DEP_CFLAGS=`$PKG_CONFIG --cflags $GLIB_PACKAGES gthread-2.0` +gtk_doc_min_version=0.9 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 + IFS="${IFS= }"; atk_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="$atk_save_IFS" + + if $GTKDOC ; then + AC_MSG_RESULT(yes) + else AC_MSG_RESULT(no) - GTKDOC=false - fi + fi fi atktargetlib=libatk-$ATK_API_VERSION.la |