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, 12 insertions, 159 deletions

diff --git a/m4/prereq.m4 b/m4/prereq.m4
index 116372bbc..d3ecc90eb 100644
--- a/m4/prereq.m4
+++ b/m4/prereq.m4
@@ -1,4 +1,4 @@
-#serial 72
+#serial 73
 
 dnl We use gl_ for non Autoconf macros.
 m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -7,7 +7,7 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 # directory of the coreutils package.
 
 
-# Copyright (C) 1998 2000, 2001, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 1998, 2000, 2001, 2003, 2004, 2005, 2006 Free Software
 # Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -29,172 +29,25 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
 
 AC_DEFUN([gl_PREREQ],
 [
-  # We don't yet use c-stack.c.
+  # gnulib settings.
+  AC_REQUIRE([gl_FUNC_NONREENTRANT_EUIDACCESS])
+
+  # We don't use c-stack.c.
   # AC_REQUIRE([gl_C_STACK])
 
-  AC_REQUIRE([AM_STDBOOL_H])
-  AC_REQUIRE([gl_ALLOCSA])
-  AC_REQUIRE([gl_BACKUPFILE])
-  AC_REQUIRE([gl_BASENAME])
-  AC_REQUIRE([gl_C_STRTOD])
-  AC_REQUIRE([gl_C_STRTOLD])
-  AC_REQUIRE([gl_CANON_HOST])
-  AC_REQUIRE([gl_CLOEXEC])
-  AC_REQUIRE([gl_CLOSE_STREAM])
-  AC_REQUIRE([gl_CLOSEOUT])
-  AC_REQUIRE([gl_DIRNAME])
-  AC_REQUIRE([gl_ERROR])
-  AC_REQUIRE([gl_EXCLUDE])
-  AC_REQUIRE([gl_EXITFAIL])
-  AC_REQUIRE([gl_FCNTL_SAFER])
+  # Invoke macros of modules that may migrate into gnulib.
+  # There's no need to list gnulib modules here, since gnulib-tool
+  # handles that; see ../bootstrap.conf.
+  AC_REQUIRE([gl_EUIDACCESS_STAT])
   AC_REQUIRE([gl_FD_REOPEN])
-  AC_REQUIRE([gl_FILEBLOCKS])
-  AC_REQUIRE([gl_FILEMODE])
-  AC_REQUIRE([gl_FILE_NAME_CONCAT])
-  AC_REQUIRE([gl_FILE_TYPE])
-  AC_REQUIRE([gl_FSUSAGE])
-  AC_REQUIRE([gl_FOPEN_SAFER])
-  AC_REQUIRE([gl_FUNC_ALLOCA])
-  AC_REQUIRE([gl_FUNC_ATEXIT])
-  AC_REQUIRE([gl_FUNC_DUP2])
-  AC_REQUIRE([gl_FUNC_FNMATCH_GNU])
-  AC_REQUIRE([gl_FUNC_GETHOSTNAME])
-  AC_REQUIRE([gl_FUNC_GETLINE])
-  AC_REQUIRE([AC_FUNC_GETLOADAVG])
-  AC_REQUIRE([gl_FUNC_GETPASS_GNU])
-  AC_REQUIRE([gl_FUNC_GETUSERSHELL])
-  AC_REQUIRE([gl_FUNC_LSTAT])
-  AC_REQUIRE([gl_FUNC_MEMCHR])
-  AC_REQUIRE([gl_FUNC_MEMCPY])
-  AC_REQUIRE([gl_FUNC_MEMMOVE])
-  AC_REQUIRE([gl_FUNC_MEMPCPY])
-  AC_REQUIRE([gl_FUNC_MEMRCHR])
-  AC_REQUIRE([gl_FUNC_MEMSET])
-  AC_REQUIRE([gl_FUNC_MKDIR_TRAILING_SLASH])
-  AC_REQUIRE([gl_FUNC_MKTIME])
-  AC_REQUIRE([gl_FUNC_MKSTEMP])
-  AC_REQUIRE([gl_FUNC_NONREENTRANT_EUIDACCESS])
-  AC_REQUIRE([gl_FUNC_READLINK])
-  AC_REQUIRE([gl_FUNC_RMDIR])
-  AC_REQUIRE([gl_FUNC_RPMATCH])
-  AC_REQUIRE([gt_FUNC_SETENV])
-  AC_REQUIRE([gl_FUNC_SIG2STR])
-  AC_REQUIRE([gl_FUNC_SNPRINTF])
-  AC_REQUIRE([gl_FUNC_STPCPY])
-  AC_REQUIRE([gl_FUNC_STRCSPN])
-  AC_REQUIRE([gl_FUNC_STRDUP])
-  AC_REQUIRE([gl_FUNC_STRNDUP])
-  AC_REQUIRE([gl_FUNC_STRNLEN])
-  AC_REQUIRE([gl_FUNC_STRPBRK])
-  AC_REQUIRE([gl_FUNC_STRSTR])
-  AC_REQUIRE([gl_FUNC_STRTOD])
-  AC_REQUIRE([gl_FUNC_STRTOIMAX])
-  AC_REQUIRE([gl_FUNC_STRTOLL])
-  AC_REQUIRE([gl_FUNC_STRTOL])
-  AC_REQUIRE([gl_FUNC_STRTOULL])
-  AC_REQUIRE([gl_FUNC_STRTOUL])
-  AC_REQUIRE([gl_FUNC_STRTOUMAX])
-  AC_REQUIRE([gl_FUNC_STRVERSCMP])
-  AC_REQUIRE([gl_FUNC_TZSET_CLOBBER])
-  AC_REQUIRE([gl_FUNC_VASNPRINTF])
-  AC_REQUIRE([gl_FUNC_VASPRINTF])
-  AC_REQUIRE([gl_FUNC_WCWIDTH])
-  AC_REQUIRE([gl_GETADDRINFO])
-  AC_REQUIRE([gl_GETDATE])
-  AC_REQUIRE([gl_GETHRXTIME])
-  AC_REQUIRE([gl_GETNDELIM2])
-  AC_REQUIRE([gl_GETOPT])
-  AC_REQUIRE([gl_GETPAGESIZE])
-  AC_REQUIRE([gl_GETTIME])
-  AC_REQUIRE([gl_GETUGROUPS])
-  AC_REQUIRE([gl_HARD_LOCALE])
-  AC_REQUIRE([gl_HASH])
-  AC_REQUIRE([gl_HASH_PJW])
-  AC_REQUIRE([gl_HEADER_ARPA_INET])
-  AC_REQUIRE([gl_HEADER_NETINET_IN])
-  AC_REQUIRE([gl_HEADER_SYS_SOCKET])
-  AC_REQUIRE([gl_HUMAN])
-  AC_REQUIRE([gl_IDCACHE])
-  AC_REQUIRE([gl_INET_NTOP])
-  AC_REQUIRE([gl_INTTOSTR])
-  AC_REQUIRE([gl_LINEBUFFER])
-  AC_REQUIRE([gl_LOCALCHARSET])
-  AC_REQUIRE([gl_LONG_OPTIONS])
-  AC_REQUIRE([gl_MBCHAR])
-  AC_REQUIRE([gl_MBITER])
-  AC_REQUIRE([gl_MBSWIDTH])
-  AC_REQUIRE([gl_MD5])
-  AC_REQUIRE([gl_MEMCOLL])
+  AC_REQUIRE([gl_FUNC_XFTS])
   AC_REQUIRE([gl_MEMXFRM])
-  AC_REQUIRE([gl_MKANCESDIRS])
-  AC_REQUIRE([gl_MKDIR_PARENTS])
-  AC_REQUIRE([gl_MODECHANGE])
-  AC_REQUIRE([gl_MOUNTLIST])
-  AC_REQUIRE([gl_OBSTACK])
-  AC_REQUIRE([gl_PATHMAX])
-  AC_REQUIRE([gl_PHYSMEM])
-  AC_REQUIRE([gl_POSIXTM])
-  AC_REQUIRE([gl_POSIXVER])
-  AC_REQUIRE([gl_QUOTEARG])
-  AC_REQUIRE([gl_QUOTE])
   AC_REQUIRE([gl_RANDINT])
   AC_REQUIRE([gl_RANDPERM])
   AC_REQUIRE([gl_RANDREAD])
-  AC_REQUIRE([gl_READTOKENS])
-  AC_REQUIRE([gl_READUTMP])
-  AC_REQUIRE([gl_REGEX])
-  AC_REQUIRE([gl_SAFE_READ])
-  AC_REQUIRE([gl_SAFE_WRITE])
-  AC_REQUIRE([gl_SAME])
-  AC_REQUIRE([gl_SAVEDIR])
-  AC_REQUIRE([gl_SAVE_CWD])
-  AC_REQUIRE([gl_SETTIME])
-  AC_REQUIRE([gl_SHA1])
+  AC_REQUIRE([gl_ROOT_DEV_INO])
   AC_REQUIRE([gl_SHA256])
   AC_REQUIRE([gl_SHA512])
-  AC_REQUIRE([gl_STAT_MACROS])
-  AC_REQUIRE([gl_STAT_TIME])
-  AC_REQUIRE([gl_STDARG_H])
-  AC_REQUIRE([gl_STDINT_H])
-  AC_REQUIRE([gl_STDLIB_SAFER])
-  AC_REQUIRE([gl_STRCASE])
   AC_REQUIRE([gl_STRINTCMP])
   AC_REQUIRE([gl_STRNUMCMP])
-  AC_REQUIRE([gl_STRIPSLASH])
-  AC_REQUIRE([gl_TIMESPEC])
-  AC_REQUIRE([gl_TIME_R])
-  AC_REQUIRE([gl_TYPE_SOCKLEN_T])
-  AC_REQUIRE([gl_UNICODEIO])
-  AC_REQUIRE([gl_UNISTD_SAFER])
-  AC_REQUIRE([gl_UNLINKDIR])
-  AC_REQUIRE([gl_USERSPEC])
-  AC_REQUIRE([gl_UTIMECMP])
-  AC_REQUIRE([gl_UTIMENS])
-  AC_REQUIRE([gl_XALLOC])
-  AC_REQUIRE([gl_XGETCWD])
-  AC_REQUIRE([gl_XNANOSLEEP])
-  AC_REQUIRE([gl_XREADLINK])
-  AC_REQUIRE([gl_XSTRTOD])
-  AC_REQUIRE([gl_XSTRTOL])
-  AC_REQUIRE([gl_XSTRTOLD])
-  AC_REQUIRE([gl_YESNO])
-  AC_REQUIRE([AC_FUNC_CALLOC])
-  AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO])
-  AC_REQUIRE([gl_FUNC_GNU_STRFTIME])
-  AC_REQUIRE([AC_FUNC_MALLOC])
-  AC_REQUIRE([gl_FUNC_MEMCMP])
-  AC_REQUIRE([gl_FUNC_NANOSLEEP])
-  AC_REQUIRE([gl_FUNC_PUTENV])
-  AC_REQUIRE([AC_FUNC_REALLOC])
-  AC_REQUIRE([gl_FUNC_UTIME])
-  AC_REQUIRE([gl_XSTRTOIMAX])
-  AC_REQUIRE([gl_XSTRTOUMAX])
-  AC_REQUIRE([vb_FUNC_RENAME])
-  AC_REQUIRE([gl_FUNC_FTS])
-  AC_REQUIRE([gl_MEMCASECMP])
-  AC_REQUIRE([gl_STRIPSLASH])
-  AC_REQUIRE([gl_LINEBUFFER])
-  AC_REQUIRE([gl_ARGMATCH])
-  AC_REQUIRE([gl_CYCLE_CHECK])
-  AC_REQUIRE([gl_EUIDACCESS_STAT])
 ])