From 7a4363a7bab40388e490ebbcff0425f731a3aaa9 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 9 Aug 2003 10:56:40 +0000 Subject: . --- aclocal.m4 | 30 ++-------- config.hin | 3 - lib/Makefile.in | 151 ++++++++++++++++++++++++++----------------------- tests/misc/Makefile.in | 1 - 4 files changed, 87 insertions(+), 98 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 47f8718a6..7e25cbfeb 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -933,7 +933,7 @@ AC_DEFUN([jm_MACROS], AC_REQUIRE([AC_ISC_POSIX])dnl jm_CHECK_ALL_TYPES - jm_INCLUDED_REGEX([lib/regex.c]) + gl_REGEX AC_REQUIRE([UTILS_HOST_OS]) AC_REQUIRE([UTILS_FUNC_MKDIR_TRAILING_SLASH]) @@ -952,7 +952,7 @@ AC_DEFUN([jm_MACROS], AC_REQUIRE([jm_FUNC_LCHOWN]) AC_REQUIRE([fetish_FUNC_RMDIR_NOTEMPTY]) AC_REQUIRE([jm_FUNC_CHOWN]) - AC_REQUIRE([jm_FUNC_MKTIME]) + AC_REQUIRE([gl_FUNC_MKTIME]) AC_REQUIRE([jm_FUNC_LSTAT]) AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) AC_REQUIRE([jm_FUNC_STAT]) @@ -963,7 +963,6 @@ AC_DEFUN([jm_MACROS], AC_REQUIRE([jm_FUNC_MEMCMP]) AC_REQUIRE([gl_MEMCOLL]) AC_REQUIRE([jm_FUNC_GLIBC_UNLOCKED_IO]) - AC_REQUIRE([AC_FUNC_FNMATCH_GNU]) AC_REQUIRE([jm_FUNC_GROUP_MEMBER]) AC_REQUIRE([jm_FUNC_PUTENV]) AC_REQUIRE([jm_AFS]) @@ -972,7 +971,6 @@ AC_DEFUN([jm_MACROS], AC_REQUIRE([jm_AC_FUNC_LINK_FOLLOWS_SYMLINK]) AC_REQUIRE([gl_FUNC_FNMATCH_GNU]) AC_REQUIRE([jm_FUNC_GNU_STRFTIME]) - AC_REQUIRE([jm_FUNC_MKTIME]) AC_REQUIRE([jm_FUNC_FPENDING]) # This is for od and stat, and any other program that @@ -982,10 +980,11 @@ AC_DEFUN([jm_MACROS], AC_REQUIRE([jm_FUNC_GETGROUPS]) AC_REQUIRE([AC_FUNC_FSEEKO]) - AC_REQUIRE([AC_FUNC_VPRINTF]) AC_REQUIRE([AC_FUNC_ALLOCA]) AC_REQUIRE([gl_FUNC_ALLOCA]) + AC_REQUIRE([gl_ERROR]) + AC_CONFIG_LIBOBJ_DIR([lib]) AC_FUNC_GETLOADAVG @@ -1269,7 +1268,7 @@ AC_DEFUN([AC_ISC_POSIX], ] ) -#serial 17 +#serial 18 dnl Initially derived from code in GNU grep. dnl Mostly written by Jim Meyering. @@ -1323,7 +1322,7 @@ AC_DEFUN([jm_INCLUDED_REGEX], /* The following example is derived from a problem report against gawk from Jorge Stolfi . */ memset (®ex, 0, sizeof (regex)); - s = re_compile_pattern ("[[an\371]]*n", 7, ®ex); + s = re_compile_pattern ("[[an\201]]*n", 7, ®ex); if (s) exit (1); @@ -3005,23 +3004,6 @@ AC_DEFUN([jm_FUNC_CHOWN], fi ]) -#serial 8 - -dnl From Jim Meyering. -dnl A wrapper around AC_FUNC_MKTIME. - -AC_DEFUN([jm_FUNC_MKTIME], -[AC_REQUIRE([AC_FUNC_MKTIME])dnl - - dnl mktime.c uses localtime_r if it exists. Check for it. - AC_CHECK_FUNCS(localtime_r) - - if test $ac_cv_func_working_mktime = no; then - AC_DEFINE(mktime, rpl_mktime, - [Define to rpl_mktime if the replacement function should be used.]) - fi -]) - # mktime.m4 serial 2 dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU diff --git a/config.hin b/config.hin index c0374006e..921e52087 100644 --- a/config.hin +++ b/config.hin @@ -518,9 +518,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - /* Define if you have the 'long double' type. */ #undef HAVE_LONG_DOUBLE diff --git a/lib/Makefile.in b/lib/Makefile.in index 6401cf58d..7ab44a850 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -187,7 +187,6 @@ libfetish_a_SOURCES = \ exitfail.c exitfail.h \ filemode.c filemode.h \ file-type.c file-type.h \ - fnmatch_.h \ fopen-safer.c \ fsusage.h \ ftw_.h \ @@ -269,13 +268,15 @@ libfetish_a_SOURCES = \ libfetish_a_LIBADD = $(LIBOBJS) $(ALLOCA) libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD) -BUILT_SOURCES = getdate.c $(STDBOOL_H) $(ALLOCA_H) +lib_OBJECTS = $(libfetish_a_OBJECTS) + +BUILT_SOURCES = getdate.c $(STDBOOL_H) $(ALLOCA_H) $(FNMATCH_H) MAINTAINERCLEANFILES = $(BUILT_SOURCES) -MOSTLYCLEANFILES = stdbool.h stdbool.ht alloca.h alloca.ht +MOSTLYCLEANFILES = stdbool.h stdbool.ht alloca.h alloca.h-t fnmatch.h fnmatch.h-t EXTRA_DIST = config.charset ref-add.sin ref-del.sin \ - fnmatch_loop.c inttostr.c inttostr.h\ -stdbool_.h alloca_.h + inttostr.c inttostr.h\ +stdbool_.h alloca_.h fnmatch_.h fnmatch_loop.c charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp @@ -283,7 +284,7 @@ charset_tmp = $(DESTDIR)$(libdir)/charset.tmp SUFFIXES = .sed .sin CLEANFILES = charset.alias ref-add.sed ref-del.sed -DISTCLEANFILES = ftw.h search.h fnmatch.h +DISTCLEANFILES = ftw.h search.h subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs @@ -327,53 +328,53 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ $(DEPDIR)/asnprintf.Po $(DEPDIR)/asprintf.Po \ @AMDEP_TRUE@ $(DEPDIR)/atexit.Po $(DEPDIR)/canonicalize.Po \ @AMDEP_TRUE@ $(DEPDIR)/chown.Po $(DEPDIR)/dirfd.Po \ -@AMDEP_TRUE@ $(DEPDIR)/dup2.Po $(DEPDIR)/euidaccess.Po \ -@AMDEP_TRUE@ $(DEPDIR)/fchdir-stub.Po $(DEPDIR)/fchown-stub.Po \ -@AMDEP_TRUE@ $(DEPDIR)/fileblocks.Po $(DEPDIR)/fnmatch.Po \ -@AMDEP_TRUE@ $(DEPDIR)/fsusage.Po $(DEPDIR)/ftruncate.Po \ -@AMDEP_TRUE@ $(DEPDIR)/ftw.Po $(DEPDIR)/getcwd.Po \ -@AMDEP_TRUE@ $(DEPDIR)/getgroups.Po $(DEPDIR)/gethostname.Po \ -@AMDEP_TRUE@ $(DEPDIR)/getline.Po $(DEPDIR)/getloadavg.Po \ -@AMDEP_TRUE@ $(DEPDIR)/getpass.Po $(DEPDIR)/gettimeofday.Po \ -@AMDEP_TRUE@ $(DEPDIR)/getusershell.Po $(DEPDIR)/group-member.Po \ -@AMDEP_TRUE@ $(DEPDIR)/lchown.Po $(DEPDIR)/lstat-stub.Po \ -@AMDEP_TRUE@ $(DEPDIR)/lstat.Po $(DEPDIR)/malloc.Po \ -@AMDEP_TRUE@ $(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po \ -@AMDEP_TRUE@ $(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po \ -@AMDEP_TRUE@ $(DEPDIR)/memrchr.Po $(DEPDIR)/memset.Po \ -@AMDEP_TRUE@ $(DEPDIR)/mkdir.Po $(DEPDIR)/mkstemp.Po \ -@AMDEP_TRUE@ $(DEPDIR)/mktime.Po $(DEPDIR)/mountlist.Po \ -@AMDEP_TRUE@ $(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \ -@AMDEP_TRUE@ $(DEPDIR)/printf-args.Po $(DEPDIR)/printf-parse.Po \ -@AMDEP_TRUE@ $(DEPDIR)/putenv.Po $(DEPDIR)/raise.Po \ -@AMDEP_TRUE@ $(DEPDIR)/readlink-stub.Po $(DEPDIR)/readutmp.Po \ -@AMDEP_TRUE@ $(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \ -@AMDEP_TRUE@ $(DEPDIR)/rename.Po $(DEPDIR)/rmdir.Po \ -@AMDEP_TRUE@ $(DEPDIR)/rpmatch.Po $(DEPDIR)/sig2str.Po \ -@AMDEP_TRUE@ $(DEPDIR)/stat.Po $(DEPDIR)/stpcpy.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strdup.Po $(DEPDIR)/strncasecmp.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strtod.Po $(DEPDIR)/strtoimax.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strtol.Po $(DEPDIR)/strtoll.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \ -@AMDEP_TRUE@ $(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po \ -@AMDEP_TRUE@ $(DEPDIR)/tempname.Po $(DEPDIR)/tsearch.Po \ -@AMDEP_TRUE@ $(DEPDIR)/utime.Po $(DEPDIR)/vasnprintf.Po \ -@AMDEP_TRUE@ $(DEPDIR)/vasprintf.Po ./$(DEPDIR)/acl.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/addext.Po ./$(DEPDIR)/argmatch.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/backupfile.Po ./$(DEPDIR)/basename.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/canon-host.Po ./$(DEPDIR)/closeout.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/cycle-check.Po ./$(DEPDIR)/diacrit.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/dirname.Po ./$(DEPDIR)/dup-safer.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/exclude.Po ./$(DEPDIR)/exitfail.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/file-type.Po ./$(DEPDIR)/filemode.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/fopen-safer.Po ./$(DEPDIR)/full-read.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/full-write.Po ./$(DEPDIR)/getdate.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/getndelim2.Po ./$(DEPDIR)/getopt.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/gettime.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/getugroups.Po \ +@AMDEP_TRUE@ $(DEPDIR)/dup2.Po $(DEPDIR)/error.Po \ +@AMDEP_TRUE@ $(DEPDIR)/euidaccess.Po $(DEPDIR)/fchdir-stub.Po \ +@AMDEP_TRUE@ $(DEPDIR)/fchown-stub.Po $(DEPDIR)/fileblocks.Po \ +@AMDEP_TRUE@ $(DEPDIR)/fnmatch.Po $(DEPDIR)/fsusage.Po \ +@AMDEP_TRUE@ $(DEPDIR)/ftruncate.Po $(DEPDIR)/ftw.Po \ +@AMDEP_TRUE@ $(DEPDIR)/getcwd.Po $(DEPDIR)/getgroups.Po \ +@AMDEP_TRUE@ $(DEPDIR)/gethostname.Po $(DEPDIR)/getline.Po \ +@AMDEP_TRUE@ $(DEPDIR)/getloadavg.Po $(DEPDIR)/getpass.Po \ +@AMDEP_TRUE@ $(DEPDIR)/gettimeofday.Po $(DEPDIR)/getusershell.Po \ +@AMDEP_TRUE@ $(DEPDIR)/group-member.Po $(DEPDIR)/lchown.Po \ +@AMDEP_TRUE@ $(DEPDIR)/lstat-stub.Po $(DEPDIR)/lstat.Po \ +@AMDEP_TRUE@ $(DEPDIR)/malloc.Po $(DEPDIR)/memchr.Po \ +@AMDEP_TRUE@ $(DEPDIR)/memcmp.Po $(DEPDIR)/memcpy.Po \ +@AMDEP_TRUE@ $(DEPDIR)/memmove.Po $(DEPDIR)/memrchr.Po \ +@AMDEP_TRUE@ $(DEPDIR)/memset.Po $(DEPDIR)/mkdir.Po \ +@AMDEP_TRUE@ $(DEPDIR)/mkstemp.Po $(DEPDIR)/mktime.Po \ +@AMDEP_TRUE@ $(DEPDIR)/mountlist.Po $(DEPDIR)/nanosleep.Po \ +@AMDEP_TRUE@ $(DEPDIR)/obstack.Po $(DEPDIR)/printf-args.Po \ +@AMDEP_TRUE@ $(DEPDIR)/printf-parse.Po $(DEPDIR)/putenv.Po \ +@AMDEP_TRUE@ $(DEPDIR)/raise.Po $(DEPDIR)/readlink-stub.Po \ +@AMDEP_TRUE@ $(DEPDIR)/readutmp.Po $(DEPDIR)/realloc.Po \ +@AMDEP_TRUE@ $(DEPDIR)/regex.Po $(DEPDIR)/rename.Po \ +@AMDEP_TRUE@ $(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po \ +@AMDEP_TRUE@ $(DEPDIR)/sig2str.Po $(DEPDIR)/stat.Po \ +@AMDEP_TRUE@ $(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po \ +@AMDEP_TRUE@ $(DEPDIR)/strcspn.Po $(DEPDIR)/strdup.Po \ +@AMDEP_TRUE@ $(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po \ +@AMDEP_TRUE@ $(DEPDIR)/strnlen.Po $(DEPDIR)/strpbrk.Po \ +@AMDEP_TRUE@ $(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po \ +@AMDEP_TRUE@ $(DEPDIR)/strtoimax.Po $(DEPDIR)/strtol.Po \ +@AMDEP_TRUE@ $(DEPDIR)/strtoll.Po $(DEPDIR)/strtoul.Po \ +@AMDEP_TRUE@ $(DEPDIR)/strtoull.Po $(DEPDIR)/strtoumax.Po \ +@AMDEP_TRUE@ $(DEPDIR)/strverscmp.Po $(DEPDIR)/tempname.Po \ +@AMDEP_TRUE@ $(DEPDIR)/tsearch.Po $(DEPDIR)/utime.Po \ +@AMDEP_TRUE@ $(DEPDIR)/vasnprintf.Po $(DEPDIR)/vasprintf.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/acl.Po ./$(DEPDIR)/addext.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/argmatch.Po ./$(DEPDIR)/backupfile.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/basename.Po ./$(DEPDIR)/canon-host.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/closeout.Po ./$(DEPDIR)/cycle-check.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/diacrit.Po ./$(DEPDIR)/dirname.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/dup-safer.Po ./$(DEPDIR)/exclude.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/exitfail.Po ./$(DEPDIR)/file-type.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/filemode.Po ./$(DEPDIR)/fopen-safer.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/full-read.Po ./$(DEPDIR)/full-write.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/getdate.Po ./$(DEPDIR)/getndelim2.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gettime.Po ./$(DEPDIR)/getugroups.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/hard-locale.Po ./$(DEPDIR)/hash-pjw.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/hash.Po ./$(DEPDIR)/human.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/idcache.Po ./$(DEPDIR)/imaxtostr.Po \ @@ -408,20 +409,20 @@ YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) DIST_SOURCES = $(libfetish_a_SOURCES) DIST_COMMON = README ChangeLog Makefile.am Makefile.in TODO \ __fpending.c alloca.c asnprintf.c asprintf.c atexit.c \ - canonicalize.c chown.c dirfd.c dup2.c euidaccess.c \ - fchdir-stub.c fchown-stub.c fileblocks.c fnmatch.c fsusage.c \ - ftruncate.c ftw.c getcwd.c getdate.c getgroups.c gethostname.c \ - getline.c getloadavg.c getpass.c gettimeofday.c getusershell.c \ - group-member.c lchown.c lstat-stub.c lstat.c malloc.c memchr.c \ - memcmp.c memcpy.c memmove.c memrchr.c memset.c mkdir.c \ - mkstemp.c mktime.c mountlist.c nanosleep.c obstack.c obstack.h \ - printf-args.c printf-parse.c putenv.c raise.c readlink-stub.c \ - readutmp.c realloc.c regex.c rename.c rmdir.c rpmatch.c \ - sig2str.c stat.c stpcpy.c strcasecmp.c strcspn.c strdup.c \ - strncasecmp.c strndup.c strnlen.c strpbrk.c strstr.c strtod.c \ - strtoimax.c strtol.c strtoll.c strtoul.c strtoull.c strtoumax.c \ - strverscmp.c tempname.c tsearch.c utime.c vasnprintf.c \ - vasprintf.c + canonicalize.c chown.c dirfd.c dup2.c error.c error.h \ + euidaccess.c fchdir-stub.c fchown-stub.c fileblocks.c fnmatch.c \ + fsusage.c ftruncate.c ftw.c getcwd.c getdate.c getgroups.c \ + gethostname.c getline.c getloadavg.c getpass.c gettimeofday.c \ + getusershell.c group-member.c lchown.c lstat-stub.c lstat.c \ + malloc.c memchr.c memcmp.c memcpy.c memmove.c memrchr.c \ + memset.c mkdir.c mkstemp.c mktime.c mountlist.c nanosleep.c \ + obstack.c obstack.h printf-args.c printf-parse.c putenv.c \ + raise.c readlink-stub.c readutmp.c realloc.c regex.c rename.c \ + rmdir.c rpmatch.c sig2str.c stat.c stpcpy.c strcasecmp.c \ + strcspn.c strdup.c strncasecmp.c strndup.c strnlen.c strpbrk.c \ + strstr.c strtod.c strtoimax.c strtol.c strtoll.c strtoul.c \ + strtoull.c strtoumax.c strverscmp.c tempname.c tsearch.c \ + utime.c vasnprintf.c vasprintf.c SOURCES = $(libfetish_a_SOURCES) all: $(BUILT_SOURCES) @@ -459,6 +460,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/chown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dirfd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dup2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/error.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/euidaccess.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fchdir-stub.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fchown-stub.Po@am__quote@ @@ -870,11 +872,20 @@ charset.alias: config.charset stdbool.h: stdbool_.h sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' $(srcdir)/stdbool_.h > $@t mv $@t $@ -# Create an when the system + +# 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 $@t - mv $@t $@ + cp $(srcdir)/alloca_.h $@-t + mv $@-t $@ + +# 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 $@-t + mv $@-t $@ .sin.sed: sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ mv t-$@ $@ diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in index 394c3e16d..51522ae20 100644 --- a/tests/misc/Makefile.in +++ b/tests/misc/Makefile.in @@ -163,7 +163,6 @@ TESTS_ENVIRONMENT = \ TESTS = \ - cut-tty-eof \ nohup \ readlink \ head-elide-tail \ -- cgit v1.2.3-54-g00ecf