[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: |
Tue, 25 Sep 2007 14:08:54 +0000 |
CVSROOT: /sources/m4
Module name: m4
Changes by: Eric Blake <ericb> 07/09/25 14:08:53
Index: bootstrap
===================================================================
RCS file: /sources/m4/m4/bootstrap,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- bootstrap 3 Sep 2007 22:11:41 -0000 1.53
+++ bootstrap 25 Sep 2007 14:08:52 -0000 1.54
@@ -1,6 +1,6 @@
#! /bin/sh
-# bootstrap (GNU M4) version 2007-08-29
+# bootstrap (GNU M4) version 2007-09-24
# Written by Gary V. Vaughan <address@hidden>
# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -22,7 +22,7 @@
# Usage: $progname [options]
-# -f --force bootstrap even when sources are not from CVS
+# -f --force bootstrap even when sources are not from git
# -p ARG --download-po=ARG whether to download pofiles [yes]
# -v --version print version information
# -h,-? --help print short or long help message
@@ -34,11 +34,11 @@
# locate the right tools:
# AUTOPOINT, AUTORECONF, AWK, GNULIB_TOOL, M4, RM, SED, WGET
-# This script bootstraps a CVS checkout of GNU M4 by correctly calling
+# This script bootstraps a git or CVS checkout of GNU M4 by correctly calling
# out to parts of the GNU Build Platform. Currently this requires GNU
# Gettext 0.16 or better, Autoconf 2.60 or better, GNU M4 1.4.x or
# better, a CVS snapshot of Automake 1.10a or better, a CVS snapshot
-# of Libtool 2.1a or better, and the latest CVS checkout of Gnulib.
+# of Libtool 2.1a or better, and the latest git or CVS checkout of Gnulib.
# Libtool must be installed; either with the same --prefix as
# automake, or made accessible to aclocal's search path via
# $AUTOMAKE_prefix/share/aclocal/dirlist.
@@ -196,7 +196,7 @@
}
# Parse options once, thoroughly. This comes as soon as possible in
-# the script to make things like `commit --version' happen quickly.
+# the script to make things like `bootstrap --version' happen quickly.
{
# sed scripts:
my_sed_single_opt='1s/^\(..\).*$/\1/;q'
@@ -248,7 +248,7 @@
$exit_cmd $EXIT_FAILURE
if test -n "$CVS_only_file" && test ! -r "$CVS_only_file"; then
- func_fatal_error "Bootstrapping from a non-CVS distribution is risky."
+ func_fatal_error "Bootstrapping from a non-git distribution is risky."
fi
}
@@ -328,22 +328,28 @@
## Version control. ##
## ---------------- ##
-# gnulib-tool updates ltdl/m4/.cvsignore and gnu/.cvsignore, and keeping
-# generated files under version control does not make sense. Prepopulate
-# ltdl/m4's version with generated files not tracked by gnulib-tool.
-if test -f $config_macro_dir/.cvsignore ; then
+# gnulib-tool updates ltdl/m4/.{git,cvs}ignore and gnu/.{git,cvs}ignore, and
+# keeping generated files under version control does not make sense. Since
+# gnu is entirely ignored, we only need to prepopulate the ltdl/m4 ignore
+# files with generated files not tracked by gnulib-tool.
+if test -f $config_macro_dir/.gitignore ; then
:
else
func_echo "creating initial $config_macro_dir/.cvsignore"
cat > $config_macro_dir/.cvsignore <<\EOF
+# files created by gnulib, but that gnulib doesn't track
*~
.cvsignore
-argz.m4
+.gitignore
+gnulib-comp.m4
+# files manually imported, rather than using gnulib-tool
+getopt.m4
+xstrtol.m4
+# files created by autopoint
codeset.m4
gettext.m4
glibc2.m4
glibc21.m4
-gnulib-comp.m4
iconv.m4
intdiv0.m4
intl.m4
@@ -355,15 +361,9 @@
lib-ld.m4
lib-link.m4
lib-prefix.m4
-libtool.m4
lock.m4
longdouble.m4
longlong.m4
-ltdl.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-lt~obsolete.m4
nls.m4
po.m4
printf-posix.m4
@@ -376,8 +376,18 @@
wchar_t.m4
wint_t.m4
xsize.m4
-xstrtol.m4
+# files created by libtoolize
+argz.m4
+libtool.m4
+ltdl.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
+# gnulib-tool edits below here
EOF
+ func_echo "creating initial $config_macro_dir/.gitignore"
+ cp $config_macro_dir/.cvsignore $config_macro_dir/.gitignore
fi
## ---------- ##