mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
.
This commit is contained in:
1 parent
500c410d96
commit
b21194d622
3 files changed
+35
-114
No files matched your search
Vendored
-76
@@ -957,7 +957,6 @@ AC_DEFUN([jm_MACROS],
|
||||
|
||||
AC_REQUIRE([UTILS_FUNC_DIRFD])
|
||||
AC_REQUIRE([AC_FUNC_ACL])
|
||||
AC_REQUIRE([AC_FUNC_FTW])
|
||||
AC_REQUIRE([jm_FUNC_LCHOWN])
|
||||
AC_REQUIRE([fetish_FUNC_RMDIR_NOTEMPTY])
|
||||
AC_REQUIRE([jm_FUNC_CHOWN])
|
||||
@@ -6450,81 +6449,6 @@ AC_DEFUN([AC_FUNC_ACL],
|
||||
AC_CHECK_FUNCS(acl)
|
||||
])
|
||||
|
||||
#serial 2
|
||||
# Use the replacement ftw.c if the one in the C library is inadequate or buggy.
|
||||
# For now, we always use the code in lib/ because libc doesn't have the FTW_DCH
|
||||
# or FTW_DCHP that we need. Arrange to use lib/ftw.h. And since that
|
||||
# implementation uses tsearch.c/tdestroy, add tsearch.o to the list of
|
||||
# objects and arrange to use lib/search.h if necessary.
|
||||
# From Jim Meyering
|
||||
|
||||
AC_DEFUN([AC_FUNC_FTW],
|
||||
[
|
||||
# prerequisites
|
||||
AC_REQUIRE([AC_HEADER_STAT])
|
||||
AC_REQUIRE([jm_FUNC_LSTAT])
|
||||
AC_REQUIRE([AC_HEADER_DIRENT])
|
||||
AC_CHECK_HEADERS(sys/param.h)
|
||||
AC_CHECK_DECLS([stpcpy])
|
||||
|
||||
# In the event that we have to use the replacement ftw.c,
|
||||
# see if we'll also need the replacement tsearch.c.
|
||||
AC_CHECK_FUNC([tdestroy], , [need_tdestroy=1])
|
||||
|
||||
AC_CACHE_CHECK([for ftw/FTW_CHDIR that informs callback of failed chdir],
|
||||
ac_cv_func_ftw_working,
|
||||
[
|
||||
# The following test would fail prior to glibc-2.3.2, because `depth'
|
||||
# would be 2 rather than 4. Of course, now that we require FTW_DCH
|
||||
# and FTW_DCHP, this test fails even with GNU libc's fixed ftw.
|
||||
mkdir -p conftest.dir/a/b/c
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE([[
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <ftw.h>
|
||||
|
||||
static char *_f[] = { "conftest.dir", "conftest.dir/a",
|
||||
"conftest.dir/a/b", "conftest.dir/a/b/c" };
|
||||
static char **p = _f;
|
||||
static int depth;
|
||||
|
||||
static int
|
||||
cb (const char *file, const struct stat *sb, int file_type, struct FTW *info)
|
||||
{
|
||||
if (strcmp (file, *p++) != 0)
|
||||
exit (1);
|
||||
++depth;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
/* Require these symbols, too. */
|
||||
int d1 = FTW_DCH;
|
||||
int d2 = FTW_DCHP;
|
||||
|
||||
int err = nftw ("conftest.dir", cb, 30, FTW_PHYS | FTW_MOUNT | FTW_CHDIR);
|
||||
exit ((err == 0 && depth == 4) ? 0 : 1);
|
||||
}
|
||||
]])],
|
||||
[ac_cv_func_ftw_working=yes],
|
||||
[ac_cv_func_ftw_working=no],
|
||||
[ac_cv_func_ftw_working=no])])
|
||||
rm -rf conftest.dir
|
||||
if test $ac_cv_func_ftw_working = no; then
|
||||
AC_LIBOBJ([ftw])
|
||||
AC_CONFIG_LINKS([$ac_config_libobj_dir/ftw.h:$ac_config_libobj_dir/ftw_.h])
|
||||
# Add tsearch.o IFF we have to use the replacement ftw.c.
|
||||
if test -n "$need_tdestroy"; then
|
||||
AC_LIBOBJ([tsearch])
|
||||
# Link search.h to search_.h if we use the replacement tsearch.c.
|
||||
AC_CONFIG_LINKS(
|
||||
[$ac_config_libobj_dir/search.h:$ac_config_libobj_dir/search_.h])
|
||||
fi
|
||||
fi
|
||||
])# AC_FUNC_FTW
|
||||
|
||||
#serial 3
|
||||
|
||||
dnl From Jim Meyering.
|
||||
|
||||
+33
-36
@@ -336,36 +336,35 @@ am__depfiles_maybe = depfiles
|
||||
@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)/getndelim2.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.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.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)/ftruncate.Po $(DEPDIR)/getcwd.Po \
|
||||
@AMDEP_TRUE@ $(DEPDIR)/getgroups.Po $(DEPDIR)/gethostname.Po \
|
||||
@AMDEP_TRUE@ $(DEPDIR)/getline.Po $(DEPDIR)/getloadavg.Po \
|
||||
@AMDEP_TRUE@ $(DEPDIR)/getndelim2.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.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.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)/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 \
|
||||
@@ -416,7 +415,7 @@ DIST_COMMON = README $(srcdir)/Makefile.in ChangeLog Makefile.am TODO \
|
||||
__fpending.c alloca.c asnprintf.c asprintf.c atexit.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 \
|
||||
fsusage.c ftruncate.c getcwd.c getdate.c getgroups.c \
|
||||
gethostname.c getline.c getloadavg.c getndelim2.c getpass.c \
|
||||
gettimeofday.c getusershell.c group-member.c lchown.c lstat.c \
|
||||
malloc.c memchr.c memcmp.c memcpy.c memmove.c memrchr.c \
|
||||
@@ -426,8 +425,8 @@ DIST_COMMON = README $(srcdir)/Makefile.in ChangeLog Makefile.am TODO \
|
||||
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
|
||||
strtoull.c strtoumax.c strverscmp.c tempname.c utime.c \
|
||||
vasnprintf.c vasprintf.c
|
||||
SOURCES = $(libfetish_a_SOURCES)
|
||||
|
||||
all: $(BUILT_SOURCES)
|
||||
@@ -473,7 +472,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fnmatch.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/fsusage.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftruncate.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ftw.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getcwd.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getgroups.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/gethostname.Po@am__quote@
|
||||
@@ -530,7 +528,6 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strtoumax.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strverscmp.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tempname.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tsearch.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/utime.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasnprintf.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/vasprintf.Po@am__quote@
|
||||
@@ -773,9 +770,9 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
|
||||
-rm -f getdate.c
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
|
||||
|
||||
+2
-2
@@ -873,7 +873,7 @@ uninstall-binPROGRAMS:
|
||||
done
|
||||
|
||||
clean-binPROGRAMS:
|
||||
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
|
||||
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
|
||||
|
||||
installcheck-binPROGRAMS: $(bin_PROGRAMS)
|
||||
bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
|
||||
@@ -1442,8 +1442,8 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
|
||||
|
||||
Reference in new issue
Block a user