From 01f19e973bfc7636b2ca9c54482d3ccf490ed7dd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 2 Sep 2003 04:09:03 +0000 Subject: [PATCH] Merge changes from gnulib. --- ChangeLog | 14 ++++++++++++++ bootstrap | 4 ++-- configure.ac | 2 +- lib/.cvsignore | 10 ++++++---- lib/Makefile.am | 36 +++++++++++++++++++++++++----------- m4/.cvsignore | 21 +++++++++++---------- 6 files changed, 59 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1efa0b3..90fa5ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2003-09-01 Paul Eggert + + Update from gnulib, and correct fnmatch to fnmatch-gnu. + * bootstrap (gnulib_modules): Change fnmatch to fnmatch-gnu. + Sort. + * configure.ac (gl_USE_SYSTEM_EXTENSIONS): Use this instead + of AC_GNU_SOURCE. + * lib/.cvsignore: Add alloca.h, stdbool.h. Sort. Append newline. + * lib/Makefile.am (lib_OBJECTS): New macro, for convenience when + copying rules from gnulib module descriptions. + (BUILT_SOURCES, EXTRA_DIST, all-local, alloca.h): + Update from gnulib modules alloca, fnmatch, getline, stdbool. + * m4/.cvsignore: Add utimes-null.m4. Sort. + 2003-09-01 Sergey Poznyakoff Added initial support for creating POSIX headers. diff --git a/bootstrap b/bootstrap index 51f8752..45a4b79 100755 --- a/bootstrap +++ b/bootstrap @@ -66,7 +66,7 @@ dirname error exclude fileblocks -fnmatch +fnmatch-gnu ftruncate full-write getdate @@ -79,10 +79,10 @@ lchown memset modechange obstack -safe-read quote quotearg rmdir +safe-read save-cwd savedir stdbool diff --git a/configure.ac b/configure.ac index 28bef09..5d94ce2 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ AC_CONFIG_HEADERS([config.h:config.hin]) AC_PREREQ([2.57]) AM_INIT_AUTOMAKE([1.7.5 gnits dist-bzip2 dist-shar]) -AC_GNU_SOURCE +gl_USE_SYSTEM_EXTENSIONS AC_PROG_CC AC_AIX AC_MINIX diff --git a/lib/.cvsignore b/lib/.cvsignore index eaf9103..02f678a 100644 --- a/lib/.cvsignore +++ b/lib/.cvsignore @@ -1,7 +1,9 @@ -Makefile.in +.deps Makefile +Makefile.in addext.c alloca.c +alloca.h alloca_.h argmatch.c argmatch.h @@ -24,6 +26,7 @@ fnmatch_loop.c ftruncate.c full-write.c full-write.h +getdate.c getdate.h getdate.y getline.c @@ -45,8 +48,8 @@ memset.c mktime.c modechange.c modechange.h -obstack.h obstack.c +obstack.h pathmax.h quote.c quote.h @@ -62,6 +65,7 @@ save-cwd.c save-cwd.h savedir.c savedir.h +stdbool.h stdbool_.h strcase.h strcasecmp.c @@ -84,5 +88,3 @@ xstrtol.c xstrtol.h xstrtoul.c xstrtoumax.c -getdate.c -.deps \ No newline at end of file diff --git a/lib/Makefile.am b/lib/Makefile.am index 004d828..7ba5f76 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -29,16 +29,21 @@ BUILT_SOURCES = EXTRA_DIST = MAINTAINERCLEANFILES = MOSTLYCLEANFILES = +lib_OBJECTS = $(libtar_a_OBJECTS) # gnulib modules # alloca +BUILT_SOURCES += $(ALLOCA_H) EXTRA_DIST += alloca_.h -all-local $(lib_OBJECTS): @ALLOCA_H@ + +# We need the following in order to create an 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 alloca.h-t - mv alloca.h-t alloca.h + cp $(srcdir)/alloca_.h $@-t + mv $@-t $@ MOSTLYCLEANFILES += alloca.h alloca.h-t # argmatch @@ -53,12 +58,19 @@ libtar_a_SOURCES += dirname.h dirname.c basename.c stripslash.c # exclude libtar_a_SOURCES += exclude.h exclude.c +# exitfail +libtar_a_SOURCES += exitfail.h exitfail.c + # fnmatch +BUILT_SOURCES += $(FNMATCH_H) EXTRA_DIST += fnmatch_.h fnmatch_loop.c -all-local $(lib_OBJECTS): @FNMATCH_H@ + +# We need the following in order to create an 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 fnmatch.h-t - mv fnmatch.h-t fnmatch.h + cp $(srcdir)/fnmatch_.h $@-t + mv $@-t $@ MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t # full-write @@ -77,6 +89,7 @@ $(srcdir)/getdate.c: getdate.y # getline libtar_a_SOURCES += getline.h +EXTRA_DIST += getndelim2.h getndelim2.c # getopt libtar_a_SOURCES += getopt.h getopt.c getopt1.c @@ -90,9 +103,6 @@ libtar_a_SOURCES += hash.h hash.c # human libtar_a_SOURCES += human.h human.c -# exitfail -libtar_a_SOURCES += exitfail.h exitfail.c - # lchown libtar_a_SOURCES += lchown.h @@ -121,11 +131,15 @@ libtar_a_SOURCES += save-cwd.h save-cwd.c libtar_a_SOURCES += savedir.h savedir.c # stdbool +BUILT_SOURCES += $(STDBOOL_H) EXTRA_DIST += stdbool_.h + +# We need the following in order to create an when the system +# doesn't have one that works. all-local $(lib_OBJECTS): $(STDBOOL_H) stdbool.h: stdbool_.h - sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > stdbool.h-t - mv stdbool.h-t stdbool.h + sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t + mv $@-t $@ MOSTLYCLEANFILES += stdbool.h stdbool.h-t # unlocked-io diff --git a/m4/.cvsignore b/m4/.cvsignore index d2ed576..3f885fc 100644 --- a/m4/.cvsignore +++ b/m4/.cvsignore @@ -1,7 +1,10 @@ +Makefile +Makefile.in alloca.m4 backupfile.m4 bison.m4 chown.m4 +codeset.m4 d-ino.m4 dirname.m4 dos.m4 @@ -18,11 +21,18 @@ getline.m4 getndelim2.m4 getopt.m4 gettext.m4 +glibc21.m4 hash.m4 human.m4 iconv.m4 +intdiv0.m4 intmax_t.m4 +inttypes-pri.m4 +inttypes.m4 +inttypes_h.m4 +isc-posix.m4 lchown.m4 +lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 @@ -64,18 +74,9 @@ ulonglong.m4 unlocked-io.m4 utimbuf.m4 utime.m4 +utimes-null.m4 utimes.m4 xalloc.m4 xgetcwd.m4 xstrtol.m4 xstrtoumax.m4 -codeset.m4 -glibc21.m4 -intdiv0.m4 -inttypes-pri.m4 -inttypes.m4 -inttypes_h.m4 -isc-posix.m4 -lcmessage.m4 -Makefile.in -Makefile -- 2.44.0