Add a bootstrap procedure, so that the CVS version contains fewer

files and we bootstrap the rest from gnulib, gettext, etc.
* README-cvs: New file.
* bootstrap: New file.
* bootstrap.conf: New file.
* .x-sc_trailing_blank: Remove config-log, .gdb-history.  Add .po.
* configure.ac (AC_PREREQ): Move here from m4/*.m4, for benefit
of gnulib-tool.
(gl_DEFAULT_POSIX2_VERSION, gl_USE_SYSTEM_EXTENSIONS, gl_PERL):
(gl_IGNORE_UNUSED_LIBRARIES): Remove; now done by gnulib.
(gl_EARLY): Add.
(gl_MACROS): Call just after gl_EARLY, just for clarity.
* src/c99-to-c98.diff: Remove patch to ls.c; no longer needed.
* src/kill.c (strtoimax): Remove decl.
* src/ls.c: Include "wcwidth.h" instead of rolling it ourselves.
* src/wc.c: Likewise.
* src/ls.c (sort_files): Rewrite to avoid need for C99-style
declaration, so that we don't need to patch this file.
* src/printf.c (strtoimax, strtoumax): Remove decls.
* src/su.c: Include getpass.h.
(getpass): remove.
* src/system.h: Include mempcpy.h, stpcpy.h, strpbrk.h.
Include inttypes.h unconditionally; remove decls it handles.
* lib/Makefile.am: include gnulib.mk, so that we can remove most of
this file.
(AM_CPPFLAGS): Don't mention -I$(srcdir), since that's now done
for us.
(noinst_LIBRARIES, LDDADD, DEFS): Remove.
(libcoreutils_a_SOURCES): Trim down greatly, just to the files
that aren't in gnulib.
Remove defns gnulib does for us.
* m4/check-decl.m4 (gl_CHECK_DECLS):
Don't include stdio.h, string.h, stdlib.h, unistd.h, sys/time.h,
time.h.  Use AC_CHECK_DECLS_ONCE for free, getenv, geteuid, getlogin,
getuid, lseek, malloc, memchr, realloc.  Don't check for getutent,
memrchr, nanosleep, stpcpy, strndup, strnlen, strstr, strtoul,
strtoull.
(_gl_DECL_HEADERS): Remove; all uses removed.
* m4/jm-macros.m4 (gl_MACROS): Move AC_PREREQ into configure.ac
for the benefit of gnulib-tool.  Call gl_INIT.
Do not call or require macros that gnulib will handle for us.
Don't check for fchmod, hasmntopt, isascii, lchown, listmntent,
mempcpy, realpath, wcrtomb, tzset.
(gl_CHECK_ALL_HEADERS): Don't check for sys/statvfs.h, sys/vfs.h,
sys/mount.h.
(gl_CHECK_ALL_TYPES): Require AC_TYPE_UNSIGNED_LONG_LONG_INT.
Don't check for struct stat.st_blksize.
Don't require AC_STRUCT_ST_DM_MODE, gt_TYPE_SSIZE_T,
gl_AC_TYPE_UINT32_T, gl_AC_TYPE_UINTMAX_T, gl_AC_TYPE_UINTPTR_T,
gl_AC_TYPE_UNSIGNED_LONG_LONG.
* m4/prereq.m4 (gl_PREREQ): Require gl_FUNC_XFTS, gl_ROOT_DEV_INO.
Don't require macros that gnulib does for us.
* m4/stat-prog.m4 (cu_PREREQ_STAT_PROG): Don't check for
sys/sysmacros.h.  Don't check for statvfs.  Use AC_CHECK_HEADERS_ONCE
for netinet/in.h, nfs/nfs_clnt.h, nfs/vfs.h.
Don't require gl_AC_TYPE_LONG_LONG, gt_HEADER_INTTYPES_H.

1 files changed, 97 insertions, 0 deletions

diff --git a/bootstrap.conf b/bootstrap.conf
new file mode 100644
index 000000000..6124e13da
--- /dev/null
+++ b/bootstrap.conf
@@ -0,0 +1,97 @@
+# Bootstrap configuration.
+
+# Copyright (C) 2006 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+
+# We don't need these modules, even though gnulib-tool mistakenly
+# includes them because of gettext dependencies.
+avoided_gnulib_modules='
+	--avoid=lock
+	--avoid=size_max
+	--avoid=xsize
+'
+
+# These modules are obsolete and can probably be removed soon,
+# but leave them in for now to minimize changes.
+obsolete_gnulib_modules='
+	atexit free memchr memcmp memcpy memmove memset rename
+	strcspn strtod strtol utime
+'
+
+# gnulib modules used by this package.
+gnulib_modules="
+	$avoided_gnulib_modules
+	$obsolete_gnulib_modules
+	acl alloca argmatch assert backupfile base64 c-strtod
+	c-strtold calloc canon-host canonicalize chown cloexec
+	closeout cycle-check d-ino d-type diacrit dirfd dirname dup2
+	error euidaccess exclude exitfail fcntl-safer fdl file-type
+	fileblocks filemode filenamecat fnmatch-gnu fopen-safer
+	fprintftime fsusage ftruncate fts getdate getgroups gethrxtime
+	getline getloadavg getndelim2 getopt getpagesize getpass-gnu
+	gettext gettime gettimeofday getugroups getusershell
+	group-member hard-locale hash hash-pjw host-os human idcache
+	inttostr lchmod lchown lib-ignore linebuffer link-follow
+	long-options lstat malloc mbswidth md5 memcasecmp mempcpy
+	memrchr mkancesdirs mkdir mkdir-p mkstemp mktime modechange
+	mountlist obstack pathmax perl physmem posixtm posixver putenv
+	quote quotearg raise readlink readtokens readtokens0 readutmp
+	realloc regex rmdir rmdir-errno rpmatch safe-read same
+	save-cwd savedir settime sha1 sig2str ssize_t stat-macros
+	stat-time stdbool stdint stdlib-safer stpcpy strcase strftime
+	strpbrk strtoimax strtoumax strverscmp timespec tzset
+	unicodeio unistd-safer unlink-busy unlinkdir unlocked-io
+	uptime userspec utimecmp utimens vasprintf version-etc-fsf
+	wcwidth winsz-ioctl winsz-termios xalloc xgetcwd xgethostname
+	xmemcoll xnanosleep xreadlink xstrtod xstrtoimax xstrtol
+	xstrtold xstrtoumax yesno
+"
+
+# Other locale categories that need message catalogs.
+EXTRA_LOCALE_CATEGORIES=LC_TIME
+
+# Additional xgettext options to use.  Use "\\\newline" to break lines.
+XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
+ --from-code=UTF-8\\\
+ --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\\\
+ --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
+ --flag=wrapf:1:c-format\\\
+'
+
+# Clean up after getting gnulib and gettext files.
+bootstrap_conf_cleanup() {
+
+  # Gettext supplies these files, but we don't need them since
+  # we don't have an intl subdirectory.
+  files_to_remove='
+    m4/glibc2.m4
+    m4/intdiv0.m4
+    m4/inttypes-h.m4
+    m4/inttypes-pri.m4
+    m4/lcmessage.m4
+    m4/lock.m4
+    m4/printf-posix.m4
+    m4/size_max.m4
+    m4/uintmax_t.m4
+    m4/ulonglong.m4
+    m4/visibility.m4
+    m4/xsize.m4
+  '
+  echo $0: rm -f $files_to_remove &&
+  rm -f $files_to_remove
+}