CVSROOT: /sources/m4
Module name: m4
Branch: branch-1_4
Changes by: Eric Blake <ericb> 07/09/24 18:03:22
Index: bootstrap
===================================================================
RCS file: /sources/m4/m4/bootstrap,v
retrieving revision 1.31.2.6
retrieving revision 1.31.2.7
diff -u -b -r1.31.2.6 -r1.31.2.7
--- bootstrap 4 Aug 2007 20:40:09 -0000 1.31.2.6
+++ bootstrap 24 Sep 2007 18:03:21 -0000 1.31.2.7
@@ -1,6 +1,6 @@
#! /bin/sh
-# bootstrap (GNU M4) version 2007-07-24
+# bootstrap (GNU M4) version 2007-09-24
# Written by Gary V. Vaughan <[EMAIL PROTECTED]>
# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
@@ -28,12 +28,12 @@
# You can also set the following variables to help $progname
# locate the right tools:
-# AUTORECONF, GNULIB_TOOL, RM, SED
+# AUTORECONF, GNULIB_TOOL, M4, RM, SED
-# This script bootstraps a CVS checkout of GNU M4 by correctly
+# 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 Autoconf 2.60, GNU Automake 1.9.6, and bleeding edge
-# CVS snapshots of GNU Gnulib.
+# git or CVS snapshots of GNU Gnulib.
# Report bugs to <[EMAIL PROTECTED]>
@@ -42,6 +42,12 @@
: ${RM=rm -f}
: ${SED=sed}
+# Ensure file names are sorted consistently across platforms.
+LC_ALL=C
+export LC_ALL
+
+config_macro_dir=m4
+
dirname="s,/[^/]*$,,"
basename="s,^.*/,,g"
@@ -199,6 +205,30 @@
fi
}
+## ---------------- ##
+## Version control. ##
+## ---------------- ##
+
+# gnulib-tool updates m4/.{git,cvs}ignore and lib/.{git,cvs}ignore, and
+# keeping generated files under version control does not make sense.
+# Since lib is entirely ignored, we only need to prepopulate the 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
+.gitignore
+gnulib-comp.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
+
## ---------------------------- ##
## Find the gnulib module tree. ##
## ---------------------------- ##
@@ -215,7 +245,7 @@
# Resolve symbolic link.
sedexpr1='s, -> ,#%%#,'
sedexpr2='s,^.*#%%#\(.*\)$,\1,p'
- linkval=`LC_ALL=C ls -l "$gnulibdir" | $SED "$sedexpr1" | $SED -n
"$sedexpr2"`
+ linkval=`ls -l "$gnulibdir" | $SED "$sedexpr1" | $SED -n "$sedexpr2"`
test -n "$linkval" || break
case "$linkval" in
