From 09307c5f14083d02eb1521e9c46f2170602b4b71 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 13 Apr 2007 21:23:04 +0000
Subject: [PATCH] * bootstrap (gnulib_tool_option_extras): Put this back; it
 was inadvertently omitted from gnulib. (gnulib_tool_option): Use it. *
 .cvsignore: Add *._bootmp*. * lib/.cvsignore: Add stdlib.h, stdlib_.h,
 time.h, time_.h, unistd.h. Remove alloca.c, alloca.h, alloca_.h, exit.h,
 getdelim.c, getdelim.h, getline.c, getline.h, malloc.c, mbchar.c, mbchar.h,
 mbuiter.h, memchr.c, regcomp.c, regex.c, regex.h, regex_internal.c,
 regex_internal.h, regexec.c, rpmatch.c, stdint.h, stdint_.h, strcase.h,
 strcasecmp.c, strncasecmp.c, strnlen1.c, strnlen1.h, timespec.h, wcwidth.h. *
 m4/.cvsignore: Add stdlib_h.m4, time_h.m4. Remove alloca.m4, codeset.m4,
 getdelim.m4, getline.m4, longlong.m4, mbchar.m4, mbiter.m4, mbrtowc.m4,
 memchr.m4, regex.m4, rpmatch.m4, ssize_t.m4, stdint.m4 strcase.m4,
 timespec.m4, ulonglong.m4, wchar_t.m4, wcwidth.m4, wint_t.m4.

---
 .cvsignore     |  1 +
 ChangeLog      | 18 ++++++++++++++++++
 bootstrap      |  3 +++
 lib/.cvsignore | 34 +++++-----------------------------
 m4/.cvsignore  | 21 ++-------------------
 5 files changed, 29 insertions(+), 48 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f3ea3c0..ab29b28 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
+*._bootmp*
 *.cache
 *.doc
 *.gz
diff --git a/ChangeLog b/ChangeLog
index c65cb9f..54462c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2007-04-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* bootstrap (gnulib_tool_option_extras): Put this back; it was
+	inadvertently omitted from gnulib.
+	(gnulib_tool_option): Use it.
+	* .cvsignore: Add *._bootmp*.
+	* lib/.cvsignore: Add stdlib.h, stdlib_.h, time.h, time_.h, unistd.h.
+	Remove alloca.c, alloca.h, alloca_.h, exit.h, getdelim.c, getdelim.h,
+	getline.c, getline.h, malloc.c, mbchar.c, mbchar.h, mbuiter.h, memchr.c,
+	regcomp.c, regex.c, regex.h, regex_internal.c, regex_internal.h,
+	regexec.c, rpmatch.c, stdint.h, stdint_.h, strcase.h, strcasecmp.c,
+	strncasecmp.c, strnlen1.c, strnlen1.h, timespec.h, wcwidth.h.
+	* m4/.cvsignore: Add stdlib_h.m4, time_h.m4.
+	Remove alloca.m4, codeset.m4, getdelim.m4, getline.m4,
+	longlong.m4, mbchar.m4, mbiter.m4, mbrtowc.m4, memchr.m4, regex.m4,
+	rpmatch.m4, ssize_t.m4, stdint.m4 strcase.m4, timespec.m4, ulonglong.m4,
+	wchar_t.m4, wcwidth.m4, wint_t.m4.
+
 2007-03-29  Paul Eggert  <eggert@cs.ucla.edu>  (tiny change)
 
 	* znew.in (tmp): Use $TMPDIR as temp directory, if given.
diff --git a/bootstrap b/bootstrap
index 3294085..c028967 100755
--- a/bootstrap
+++ b/bootstrap
@@ -103,6 +103,8 @@ gnulib_extra_files="
 	$build_aux/config.sub
 	doc/INSTALL
 "
+# Additional gnulib-tool options to use.  Use "\newline" to break lines.
+gnulib_tool_option_extras=
 
 # Other locale categories that need message catalogs.
 EXTRA_LOCALE_CATEGORIES=
@@ -460,6 +462,7 @@ gnulib_tool_options="\
  --source-base $bt/lib/\
  --tests-base $bt/tests\
  --local-dir gl\
+$gnulib_tool_option_extras\
 "
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
 $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
diff --git a/lib/.cvsignore b/lib/.cvsignore
index fb0931a..310aa73 100644
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -1,16 +1,12 @@
 .deps
 Makefile
 Makefile.in
-alloca.c
-alloca.h
-alloca_.h
 config.h
 config.hin
 creat-safer.c
 dup-safer.c
 error.c
 error.h
-exit.h
 exitfail.c
 exitfail.h
 fcntl--.h
@@ -18,50 +14,30 @@ fcntl-safer.h
 fcntl.h
 fcntl_.h
 fd-safer.c
-getdelim.c
-getdelim.h
-getline.c
-getline.h
 getopt.c
 getopt1.c
 getopt_.h
 getopt_int.h
 gettext.h
 gnulib.mk
-malloc.c
-mbchar.c
-mbchar.h
-mbuiter.h
-memchr.c
 open-safer.c
 pipe-safer.c
-regcomp.c
-regex.c
-regex.h
-regex_internal.c
-regex_internal.h
-regexec.c
-rpmatch.c
 stamp-h1
 stat-time.h
 stat_.h
 stdbool_.h
-stdint.h
-stdint_.h
-strcase.h
-strcasecmp.c
-strncasecmp.c
-strnlen1.c
-strnlen1.h
+stdlib.h
+stdlib_.h
 sys
 sys_time_.h
-timespec.h
+time.h
+time_.h
 unistd--.h
 unistd-safer.h
+unistd.h
 unistd_.h
 utimens.c
 utimens.h
-wcwidth.h
 xalloc-die.c
 xalloc.h
 xmalloc.c
diff --git a/m4/.cvsignore b/m4/.cvsignore
index 207a9da..708382e 100644
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -1,42 +1,25 @@
 absolute-header.m4
-alloca.m4
-codeset.m4
 error.m4
 exitfail.m4
 extensions.m4
 fcntl-safer.m4
 fcntl_h.m4
-getdelim.m4
-getline.m4
 getopt.m4
 gnulib-cache.m4
 gnulib-common.m4
 gnulib-comp.m4
 gnulib-tool.m4
 inline.m4
-longlong.m4
-mbchar.m4
-mbiter.m4
-mbrtowc.m4
-memchr.m4
-regex.m4
-rpmatch.m4
-ssize_t.m4
 stat-time.m4
 stdbool.m4
-stdint.m4
-strcase.m4
+stdlib_h.m4
 sys_stat_h.m4
 sys_time_h.m4
-timespec.m4
-ulonglong.m4
+time_h.m4
 unistd-safer.m4
 unistd_h.m4
 utimbuf.m4
 utimens.m4
 utimes.m4
-wchar_t.m4
-wcwidth.m4
-wint_t.m4
 xalloc.m4
 yesno.m4
-- 
2.47.2