[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/bootstrap,v
From: |
Eric Blake |
Subject: |
Changes to m4/bootstrap,v |
Date: |
Fri, 25 Aug 2006 18:02:17 +0000 |
CVSROOT: /sources/m4
Module name: m4
Changes by: Eric Blake <ericb> 06/08/25 18:02:17
Index: bootstrap
===================================================================
RCS file: /sources/m4/m4/bootstrap,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- bootstrap 11 Aug 2006 15:42:58 -0000 1.37
+++ bootstrap 25 Aug 2006 18:02:17 -0000 1.38
@@ -1,6 +1,6 @@
#! /bin/sh
-# bootstrap (GNU M4) version 2006-08-10
+# bootstrap (GNU M4) version 2006-08-25
# Written by Gary V. Vaughan <address@hidden>
# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -34,15 +34,17 @@
# You can also set the following variables to help $progname
# locate the right tools:
-# AUTORECONF, AWK, GNULIB_TOOL, RM, SED, WGET
+# AUTOPOINT, AUTORECONF, AWK, GNULIB_TOOL, RM, SED, WGET
# This script bootstraps a CVS checkout of GNU M4 by correctly
# calling out to parts of the GNU Build Platform. Currently this
-# requires GNU Gettext 0.15 or better, and Autoconf 2.60 or better, and
-# bleeding edge CVS snapshots of GNU Automake, Libtool & Gnulib.
+# requires GNU Gettext 0.15 or better, and Autoconf 2.60 or better
+# Automake 1.9b or better, and bleeding edge CVS snapshots of
+# Libtool and Gnulib.
# Report bugs to <address@hidden>
+: ${AUTOPOINT=autopoint}
: ${AUTORECONF=autoreconf}
: ${AWK=awk}
: ${GNULIB_TOOL=gnulib-tool}
@@ -309,6 +311,15 @@
*) func_update_po $DOWNLOAD_PO ;;
esac
+## ---------- ##
+## Autopoint. ##
+## ---------- ##
+
+# Released autopoint has the tendency to install macros that have been
+# obsoleted in current gnulib, so run this before gnulib-tool.
+func_echo "running: $AUTOPOINT --force"
+$AUTOPOINT --force
+
## ---------------------------- ##
## Find the gnulib module tree. ##
## ---------------------------- ##
@@ -384,8 +395,10 @@
## Autoreconf. ##
## ----------- ##
-func_echo "running: $AUTORECONF --force --verbose --install --no-recursive"
-$AUTORECONF --force --verbose --install --no-recursive
+# Disable autopoint, since it was already done above.
+func_echo "running: AUTOPOINT=true" \
+ "$AUTORECONF --force --verbose --install --no-recursive"
+AUTOPOINT=true $AUTORECONF --force --verbose --install --no-recursive
## ---------- ##
@@ -399,7 +412,7 @@
)
if test x"$DOWNLOAD_PO" != xno; then
- func_echo "If your pofiles are uptodate, you can rerun bootstrap"
+ func_echo "If your pofiles are up-to-date, you can rerun bootstrap"
func_echo "as \`DOWNLOAD_PO=no $progname' to avoid redownloading."
fi