diff options
| author | James Henstridge <james@jamesh.id.au> | 2004-08-30 13:39:27 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2004-08-30 13:39:27 +0000 |
| commit | 252cdb9e372045dc5a34d7877fca1fc0a00579d9 (patch) | |
| tree | 3fd16619a1be3091b922000e1e6de863592b6b5d | |
| parent | a6446e3b2bfc69488fe5d428449b375143da6164 (diff) | |
| download | gnome-common-252cdb9e372045dc5a34d7877fca1fc0a00579d9.tar.gz | |
fix up error message when a required M4 file isn't found. Fixes bug
2004-08-30 James Henstridge <james@jamesh.id.au>
* macros2/gnome-autogen.sh: fix up error message when a required
M4 file isn't found. Fixes bug #147417.
* macros2/gnome-autogen.sh: Revert Rodney's changes, since
glib-gettextize has been fixed on the HEAD and 2.4 branches.
svn path=/trunk/; revision=3474
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | macros2/gnome-autogen.sh | 12 |
2 files changed, 9 insertions, 11 deletions
@@ -1,3 +1,11 @@ +2004-08-30 James Henstridge <james@jamesh.id.au> + + * macros2/gnome-autogen.sh: fix up error message when a required + M4 file isn't found. Fixes bug #147417. + + * macros2/gnome-autogen.sh: Revert Rodney's changes, since + glib-gettextize has been fixed on the HEAD and 2.4 branches. + 2004-06-10 Rodney Dawes <dobey@ximian.com> * macros2/gnome-autogen.sh: Add code to check for mkinstalldirs in diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index 3c6dee9..8a64fa2 100644 --- a/macros2/gnome-autogen.sh +++ b/macros2/gnome-autogen.sh @@ -212,7 +212,7 @@ check_m4macros() { printerr "***Error***: some autoconf macros required to build $PKG_NAME" printerr " were not found in your aclocal path, or some forbidden" printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_PATH?" + printerr " ACLOCAL_FLAGS?" printerr fi return $cm_status @@ -271,11 +271,6 @@ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1 ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` -# We need to do this for the craaaaaaazy mkinstalldirs usage of glib-gettext -AUTOMAKE_VERSION=`echo $AUTOMAKE | sed s/automake-//` -ACLOCAL_DIR=`$ACLOCAL --print-ac-dir` -AUTOMAKE_DIR=`echo $ACLOCAL_DIR | sed s/aclocal/automake-$AUTOMAKE_VERSION/` - if $want_libtool; then version_check libtool LIBTOOLIZE libtoolize $REQUIRED_LIBTOOL_VERSION \ "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" || DIE=1 @@ -353,11 +348,6 @@ for configure_ac in $configure_files; do if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 - # This is to copy in mkinstalldirs for glib-gettext - if [ -x $AUTOMAKE_DIR/mkinstalldirs ]; then - echo " copying mkinstalldirs... " - cp -f $AUTOMAKE_DIR/mkinstalldirs $dirname - fi elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then printbold "Running autopoint..." |