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.

2 files changed, 96 insertions, 213 deletions

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 613ae228d..1ab59449a 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,91 @@
+2006-08-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Add a bootstrap procedure, so that the CVS version contains fewer
+	files and we bootstrap the rest from gnulib, gettext, etc.
+	* 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.
+	(libcoreutils_a_LIBADD, lib_OBJECTS, BUILT_SOURCES, CLEANFILES):
+	(MAINTAINERCLEANFILES, MOSTLYCLEANDIRS, MOSTLYCLEANFILES):
+	(SUFFIXES, EXTRA_DIST, all-local, charset_alias, charset_tmp):
+	(install-exec-local, uninstall-local, charset.alias, .sin.sed):
+	(stdbool.h, stdint.h, fnmatch.h, arpa/inet.h, netinet/in.h):
+	(sys/socket.h, getopt.h): Remove.
+
+	* Makefile.in, README, __fpending.c, __fpending.h, acl.c, acl.h:
+	* alloca.c, alloca_.h, allocsa.c, allocsa.h, argmatch.c, argmatch.h:
+	* asnprintf.c, asprintf.c, at-func.c, atexit.c, backupfile.c:
+	* backupfile.h, base64.c, base64.h, basename.c, bcopy.c, c-strtod.c:
+	* c-strtod.h, c-strtold.c, calloc.c, canon-host.c, canon-host.h:
+	* canonicalize.c, canonicalize.h, chdir-long.c, chdir-long.h:
+	* chdir-safer.c, chdir-safer.h, chown.c, cloexec.c, cloexec.h:
+	* close-stream.c, close-stream.h, closeout.c, closeout.h:
+	* config.charset, creat-safer.c, cycle-check.c, cycle-check.h:
+	* dev-ino.h, diacrit.c, diacrit.h, dirchownmod.c, dirchownmod.h:
+	* dirfd.c, dirfd.h, dirname.c, dirname.h, dup-safer.c, dup2.c:
+	* error.c, error.h, euidaccess.c, euidaccess.h, exclude.c:
+	* exclude.h, exit.h, exitfail.c, exitfail.h, fchown-stub.c:
+	* fcntl--.h, fcntl-safer.h, fd-safer.c, file-type.c, file-type.h:
+	* fileblocks.c, filemode.c, filemode.h, filenamecat.c:
+	* filenamecat.h, fnmatch.c, fnmatch_.h, fnmatch_loop.c:
+	* fopen-safer.c, fprintftime.c, fprintftime.h, free.c, fsusage.c:
+	* fsusage.h, ftruncate.c, fts-cycle.c, fts.c, fts_.h, full-read.c:
+	* full-read.h, full-write.c, full-write.h, gai_strerror.c:
+	* getaddrinfo.c, getaddrinfo.h, getcwd.c, getcwd.h, getdate.h:
+	* getdate.y, getdelim.c, getdelim.h, getgroups.c, gethostname.c:
+	* gethrxtime.c, gethrxtime.h, getline.c, getline.h, getloadavg.c:
+	* getndelim2.c, getndelim2.h, getopt.c, getopt1.c, getopt_.h:
+	* getopt_int.h, getpagesize.h, getpass.c, getpass.h, gettext.h:
+	* gettime.c, gettimeofday.c, getugroups.c, getusershell.c:
+	* group-member.c, group-member.h, hard-locale.c, hard-locale.h:
+	* hash-pjw.c, hash-pjw.h, hash.c, hash.h, human.c, human.h:
+	* idcache.c, imaxtostr.c, inet_ntop.c, inet_ntop.h, intprops.h:
+	* inttostr.c, inttostr.h, lchmod.h, lchown.c, lchown.h:
+	* linebuffer.c, linebuffer.h, localcharset.c, localcharset.h:
+	* long-options.c, long-options.h, lstat.c, lstat.h, malloc.c:
+	* mbchar.c, mbchar.h, mbswidth.c, mbswidth.h, mbuiter.h, md5.c:
+	* md5.h, memcasecmp.c, memcasecmp.h, memchr.c, memcmp.c, memcoll.c:
+	* memcoll.h, memcpy.c, memmove.c, mempcpy.c, mempcpy.h, memrchr.c:
+	* memrchr.h, memset.c, mkancesdirs.c, mkancesdirs.h, mkdir-p.c:
+	* mkdir-p.h, mkdir.c, mkdirat.c, mkstemp-safer.c, mkstemp.c:
+	* mktime.c, modechange.c, modechange.h, mountlist.c, mountlist.h:
+	* nanosleep.c, obstack.c, obstack.h, offtostr.c, open-safer.c:
+	* openat-die.c, openat-priv.h, openat.c, openat.h, pathmax.h:
+	* physmem.c, physmem.h, pipe-safer.c, posixtm.c, posixtm.h:
+	* posixver.c, posixver.h, printf-args.c, printf-args.h:
+	* printf-parse.h, putenv.c, quote.c, quote.h, quotearg.c:
+	* quotearg.h, raise.c, readlink.c, readtokens.c, readtokens.h:
+	* readtokens0.c, readtokens0.h, readutmp.c, readutmp.h, realloc.c:
+	* ref-add.sin, ref-del.sin, regcomp.c, regex.c, regex.h:
+	* regex_internal.c, regex_internal.h, regexec.c, rename.c, rmdir.c:
+	* rpmatch.c, safe-read.c, safe-read.h, safe-write.c, safe-write.h:
+	* same-inode.h, same.c, same.h, save-cwd.c, save-cwd.h, savedir.c:
+	* savedir.h, setenv.c, setenv.h, settime.c, sha1.c, sha1.h:
+	* sig2str.c, sig2str.h, snprintf.c, snprintf.h, socket_.h:
+	* stat-macros.h, stat-time.h, stdbool_.h, stdint_.h, stdio--.h:
+	* stdio-safer.h, stdlib--.h, stdlib-safer.h, stpcpy.c, strcase.h:
+	* strcasecmp.c, strcspn.c, strdup.c, strdup.h, strftime.c:
+	* strftime.h, stripslash.c, strncasecmp.c, strndup.c, strndup.h:
+	* strnlen.c, strnlen.h, strnlen1.c, strnlen1.h, strpbrk.c, strstr.c:
+	* strstr.h, strtod.c, strtoimax.c, strtol.c, strtoll.c, strtoul.c:
+	* strtoull.c, strtoumax.c, strverscmp.c, strverscmp.h, tempname.c:
+	* time_r.c, time_r.h, timespec.h, umaxtostr.c, unicodeio.h:
+	* unistd--.h, unistd-safer.h, unlinkdir.c, unlinkdir.h:
+	* unlocked-io.h, unsetenv.c, userspec.c, userspec.h, utime.c:
+	* utimecmp.c, utimecmp.h, utimens.c, utimens.h, vasnprintf.h:
+	* vasprintf.c, vasprintf.h, verify.h, version-etc-fsf.c:
+	* version-etc.c, version-etc.h, wcwidth.h, xalloc-die.c, xalloc.h:
+	* xgetcwd.c, xgetcwd.h, xgethostname.c, xgethostname.h, xmalloc.c:
+	* xmemcoll.c, xmemcoll.h, xnanosleep.c, xnanosleep.h, xreadlink.c:
+	* xreadlink.h, xstrndup.c, xstrndup.h, xstrtod.c, xstrtod.h:
+	* xstrtoimax.c, xstrtol.c, xstrtol.h, xstrtold.c, xstrtoul.c:
+	* xstrtoumax.c, xtime.h, yesno.c, yesno.h:
+	Remove from CVS, since ../bootstrap generates them automatically.
+
 2006-08-18  Bruno Haible  <bruno@clisp.org>
 
 	* mountlist.c [MOUNTED_GETMNTINFO2]: Include sys/statvfs.h.
@@ -128,7 +216,7 @@
 
 2006-07-19  Mike Frysinger  <vapier@gentoo.org>
 
-	* lib/mountlist.c [ME_REMOTE]: Filter out cifs.
+	* mountlist.c [ME_REMOTE]: Filter out cifs.
 	Reported by Toralf Förster in <http://bugs.gentoo.org/141012>.
 
 2006-07-20  Jim Meyering  <jim@meyering.net>
@@ -161,7 +249,7 @@
 	New arg PMODE_BITS, to keep track of which mode bits the user
 	mentioned; it treats S_ISUID and S_ISGID speciall.
 	All callers changed.
-	* lib/modechange.h: Likewise.
+	* modechange.h: Likewise.
 
 2006-07-16  Jim Meyering  <jim@meyering.net>
 
@@ -187,7 +275,7 @@
 
 	2006-07-06  Jim Hyslop  <jhyslop@dreampossible.ca>  (tiny change)
 
-	* lib/getaddrinfo.c: Changes to compile under MSVC6: changed
+	* getaddrinfo.c: Changes to compile under MSVC6: changed
 	'#if WIN32_NATIVE' to '#ifdef' & moved WSAAPI macro inside
 	brackets.  Other minor changes to suppress some compiler
 	warnings.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 54c795ced..1a3ec764a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -17,225 +17,20 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 
-AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
+include gnulib.mk
 
-noinst_LIBRARIES = libcoreutils.a
+AM_CPPFLAGS += -I..
+AM_CFLAGS = $(WARNING_CFLAGS) $(WERROR_CFLAGS)
 
 noinst_PROGRAMS = t-fpending
-LDADD = $(noinst_LIBRARIES)
-
-AM_CPPFLAGS = -I.. -I$(srcdir)
-DEFS += -DLIBDIR=\"$(libdir)\"
 
-libcoreutils_a_SOURCES = \
-  allocsa.c allocsa.h \
-  base64.c base64.h \
+libcoreutils_a_SOURCES += \
   buffer-lcm.c buffer-lcm.h \
-  euidaccess.h \
-  exit.h \
-  full-read.c full-read.h \
-  full-write.c full-write.h \
-  getaddrinfo.h \
-  gettext.h \
-  inet_ntop.h \
-  localcharset.c localcharset.h \
-  mbchar.h \
-  mbswidth.c mbswidth.h \
-  mbuiter.h \
-  readtokens0.c readtokens0.h \
-  setenv.h \
-  snprintf.h \
-  strcase.h \
-  strnlen1.c strnlen1.h \
-  strstr.h \
-  unicodeio.c unicodeio.h \
-  verify.h \
-  wcwidth.h \
-  xalloc-die.c \
-  xgethostname.c xgethostname.h \
   xmemcoll.c xmemcoll.h \
-  xmemxfrm.c xmemxfrm.h \
-  xstrndup.c xstrndup.h \
-  xstrtoimax.c \
-  xstrtoumax.c
-
-libcoreutils_a_SOURCES += \
-  printf-args.h \
-  printf-parse.h \
-  vasprintf.h \
-  vasnprintf.h
-
-libcoreutils_a_LIBADD = $(LIBOBJS) $(ALLOCA)
-
-lib_OBJECTS = $(libcoreutils_a_OBJECTS)
-
-
-BUILT_SOURCES = getdate.c
-CLEANFILES =
-MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-MOSTLYCLEANDIRS =
-MOSTLYCLEANFILES =
-SUFFIXES =
-
-EXTRA_DIST = getdate.c config.charset ref-add.sin ref-del.sin \
-  getndelim2.c getndelim2.h
-
-# We need the following in order to install a simple file in $(libdir)
-# which is shared with other installed packages. We use a list of referencing
-# packages so that "make uninstall" will remove the file if and only if it
-# is not used by another installed package.
-# On systems with glibc-2.1 or newer, the file is redundant, therefore we
-# avoid installing it.
-
-all-local: charset.alias ref-add.sed ref-del.sed
-
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-install-exec-local: all-local
-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
-	if test -f $(charset_alias); then \
-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	  rm -f $(charset_tmp) ; \
-	else \
-	  if test $(GLIBC21) = no; then \
-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
-	    rm -f $(charset_tmp) ; \
-	  fi ; \
-	fi
-
-uninstall-local: all-local
-	if test -f $(charset_alias); then \
-	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
-	  if grep '^# Packages using this file: $$' $(charset_tmp) \
-	      > /dev/null; then \
-	    rm -f $(charset_alias); \
-	  else \
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
-	  fi; \
-	  rm -f $(charset_tmp); \
-	fi
-
-charset.alias: config.charset
-	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
-	mv t-$@ $@
-
-SUFFIXES += .sed .sin
-.sin.sed:
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
-	mv t-$@ $@
-
-CLEANFILES += charset.alias ref-add.sed ref-del.sed
-
-BUILT_SOURCES += $(STDBOOL_H)
-EXTRA_DIST += stdbool_.h
-MOSTLYCLEANFILES += stdbool.h stdbool.h-t
-# Create stdbool.h on systems that lack a working one.
-stdbool.h: stdbool_.h
-	sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t
-	mv $@-t $@
-
-BUILT_SOURCES += $(STDINT_H)
-EXTRA_DIST += stdint_.h
-
-# We need the following in order to create <stdint.h> when the system
-# doesn't have one that works with the given compiler.
-stdint.h: stdint_.h
-	sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
-	    -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-	    -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
-	    -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
-	    -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
-	    -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
-	    -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
-	    -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
-	    -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
-	    -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
-	    -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
-	    -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
-	    -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
-	    -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
-	    -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
-	    -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
-	    -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
-	    -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
-	    -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
-	    -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
-	    -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-	    < $(srcdir)/stdint_.h > $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += stdint.h stdint.h-t
-
-BUILT_SOURCES += $(ALLOCA_H)
-EXTRA_DIST += alloca_.h
-
-# We need the following in order to create an <alloca.h> when the system
-# doesn't have one that works with the given compiler.
-all-local $(lib_OBJECTS): $(ALLOCA_H)
-alloca.h: alloca_.h
-	cp $(srcdir)/alloca_.h $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += alloca.h alloca.h-t
-
-BUILT_SOURCES += $(FNMATCH_H)
-EXTRA_DIST += fnmatch_.h fnmatch_loop.c
-
-# We need the following in order to create an <fnmatch.h> when the system
-# doesn't have one that supports the required API.
-all-local $(lib_OBJECTS): $(FNMATCH_H)
-fnmatch.h: fnmatch_.h
-	cp $(srcdir)/fnmatch_.h $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
-
-BUILT_SOURCES += $(GETOPT_H)
-EXTRA_DIST += getopt_.h getopt_int.h
-
-BUILT_SOURCES += $(ARPA_INET_H)
-
-# We need the following in order to create <arpa/inet.h> when the system
-# doesn't have one.
-arpa/inet.h:
-	test -d arpa || mkdir arpa
-	echo '#include <sys/socket.h>' >$@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
-MOSTLYCLEANDIRS += arpa
-
-BUILT_SOURCES += $(SYS_SOCKET_H)
-EXTRA_DIST += socket_.h
-
-BUILT_SOURCES += $(NETINET_IN_H)
-
-# We need the following in order to create <netinet/in.h> when the system
-# doesn't have one.
-netinet/in.h:
-	test -d netinet || mkdir netinet
-	echo '#include <sys/socket.h>' >$@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
-MOSTLYCLEANDIRS += netinet
-
-# We need the following in order to create <sys/socket.h> when the system
-# doesn't have one that works with the given compiler.
-sys/socket.h: socket_.h
-	test -d sys || mkdir sys
-	cp $(srcdir)/socket_.h $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
-MOSTLYCLEANDIRS += sys
+  xmemxfrm.c xmemxfrm.h
 
 check: unit-test
 
 .PHONY: unit-test
 unit-test: t-fpending
 	./t-fpending > /dev/null
-
-# We need the following in order to create an <getopt.h> when the system
-# doesn't have one that works with the given compiler.
-all-local $(lib_OBJECTS): $(GETOPT_H)
-getopt.h: getopt_.h
-	cp $(srcdir)/getopt_.h $@-t
-	mv $@-t $@
-MOSTLYCLEANFILES += getopt.h getopt.h-t