diff options
| author | Rodney Dawes <dobey@novell.com> | 2005-01-22 15:22:30 +0000 |
|---|---|---|
| committer | Rodney Dawes <dobey@src.gnome.org> | 2005-01-22 15:22:30 +0000 |
| commit | eebf878d4850685cd901edb884106f0a2ddde47d (patch) | |
| tree | 102cd1da98b0b96bb3fb36f864f1e78820c6fbd3 | |
| parent | 83c1ee7944624c0cd45eda8155d1dc232f4d620b (diff) | |
| download | gnome-common-eebf878d4850685cd901edb884106f0a2ddde47d.tar.gz | |
Fix the (AC|IT)_PROG_INTLTOOL support for both places where we grep for it
2005-01-22 Rodney Dawes <dobey@novell.com>
* gnome-autogen.sh: Fix the (AC|IT)_PROG_INTLTOOL support for
both places where we grep for it
(version_check): If we are checking for automake = 1.4, then make
sure we error out with that error when we find it, and not >= 1.4
since we don't actually check for >= 1.4
Fixes #129903
svn path=/trunk/; revision=3487
| -rw-r--r-- | macros2/ChangeLog | 14 | ||||
| -rw-r--r-- | macros2/gnome-autogen.sh | 11 |
2 files changed, 20 insertions, 5 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index cf90c24..5f34369 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,7 +1,17 @@ +2005-01-22 Rodney Dawes <dobey@novell.com> + + * gnome-autogen.sh: Fix the (AC|IT)_PROG_INTLTOOL support for + both places where we grep for it + (version_check): If we are checking for automake = 1.4, then make + sure we error out with that error when we find it, and not >= 1.4 + since we don't actually check for >= 1.4 + + Fixes #129903 + 2004-11-24 Mariano Suárez-Alvarez <mariano@gnome.org> - * gnome-autogen.sh: grep wants basic regexps, not extended ones: fix the - regular expression for INTLTOOL. + * gnome-autogen.sh: grep wants basic regexps, not extended ones: + fix the regular expression for INTLTOOL. 2004-11-24 Rodney Dawes <dobey@novell.com> diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index e83c4e4..ca97e75 100644 --- a/macros2/gnome-autogen.sh +++ b/macros2/gnome-autogen.sh @@ -77,7 +77,12 @@ version_check() { return 0 fi - printbold "checking for $vc_package >= $vc_min_version..." + if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then + vc_comparator="=" + else + vc_comparator=">=" + fi + printbold "checking for $vc_package $vc_comparator $vc_min_version..." for vc_checkprog in $vc_checkprogs; do echo $ECHO_N " testing $vc_checkprog... " if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then @@ -97,7 +102,7 @@ version_check() { fi done if [ "$vc_status" != 0 ]; then - printerr "***Error***: You must have $vc_package >= $vc_min_version installed" + printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed" printerr " to build $PKG_NAME. Download the appropriate package for" printerr " from your distribution or get the source tarball at" printerr " $vc_source" @@ -340,7 +345,7 @@ for configure_ac in $configure_files; do fi fi - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null; then + if grep "^\(AC\|IT\)_PROG_INTLTOOL" $basename >/dev/null; then printbold "Running $INTLTOOLIZE..." $INTLTOOLIZE --force --copy --automake || exit 1 fi |