* bootstrap: Here. (require): Be more tolerant w.r.t. version messages. --- ChangeLog | 7 +++++++ bootstrap | 4 +++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index bcb4064..dedc814 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-03-08 Roland Levillain <roland@lrde.epita.fr> + Require Doxygen 1.5.6 at bootstrapping time. + + * bootstrap: Here. + (require): Be more tolerant w.r.t. version messages. + +2010-03-08 Roland Levillain <roland@lrde.epita.fr> + * bootstrap: Fix a typo in an error message. 2010-03-03 Roland Levillain <roland@lrde.epita.fr> diff --git a/bootstrap b/bootstrap index fc71583..62cc724 100755 --- a/bootstrap +++ b/bootstrap @@ -83,7 +83,7 @@ version_compare () # Test that TOOL exists, and its version is at least REQUIREMENT. require () { - local version=$($1 --version | sed -n 's/.*[^0-9.]\([0-9][0-9.]*\).*/\1/p;q') + local version=$($1 --version | sed -n 's/[^0-9.]*\([0-9][0-9.]*\).*/\1/p;q') test x"$version" != x || fatal "$1 is required" case $(version_compare "$2" "$version") in @@ -125,6 +125,8 @@ done export LIBTOOLIZE=$libtoolize require $libtoolize 1.5.22 +require doxygen 1.5.6 + # Tell what's going on. set -x -- 1.5.6.5