From 5d1c3777794a871a30cc3b2d788b66e33ee4fa80 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 2 Mar 2003 10:04:48 +0000 Subject: . --- aclocal.m4 | 28 ++++++++++++++++++++++++++-- config.hin | 25 +++++++++++++++++++++++++ lib/Makefile.in | 37 +++++++++++++++++++++---------------- tests/mv/Makefile.in | 2 ++ 4 files changed, 74 insertions(+), 18 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 37a06816b..4fce8c304 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1865,10 +1865,34 @@ AC_DEFUN([jm_PREREQ_MEMCHR], AC_CHECK_HEADERS(limits.h stdlib.h bp-sym.h) ]) +# Check for the external symbol, _system_configuration, +# a struct with member `physmem'. +AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION], + [AC_CACHE_CHECK(for external symbol _system_configuration, + gl_cv_var__system_configuration, + [AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[#include + ]], + [double x = _system_configuration.physmem;])], + [gl_cv_var__system_configuration=yes], + [gl_cv_var__system_configuration=no])]) + + if test $gl_cv_var__system_configuration = yes; then + AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1, + [Define to 1 if you have the external variable, + _system_configuration with a member named physmem.]) + fi + ] +) + AC_DEFUN([jm_PREREQ_PHYSMEM], [ - AC_CHECK_HEADERS(sys/pstat.h unistd.h sys/sysmp.h) - AC_CHECK_FUNCS(pstat_getstatic pstat_getdynamic) + AC_CHECK_HEADERS([unistd.h sys/pstat.h sys/sysmp.h sys/sysinfo.h \ + machine/hal_sysinfo.h sys/table.h sys/param.h sys/sysctl.h \ + sys/systemcfg.h]) + AC_CHECK_FUNCS(pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table) + + AC_REQUIRE([gl_SYS__SYSTEM_CONFIGURATION]) ]) AC_DEFUN([jm_PREREQ_POSIXVER], diff --git a/config.hin b/config.hin index bc11631b9..ece391e12 100644 --- a/config.hin +++ b/config.hin @@ -436,6 +436,9 @@ /* Define to 1 if you have the `getspnam' function. */ #undef HAVE_GETSPNAM +/* Define to 1 if you have the `getsysinfo' function. */ +#undef HAVE_GETSYSINFO + /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT @@ -532,6 +535,9 @@ 1998-11-01) do this. */ #undef HAVE_LSTAT_EMPTY_STRING_BUG +/* Define to 1 if you have the header file. */ +#undef HAVE_MACHINE_HAL_SYSINFO_H + /* Define to 1 if you have the header file. */ #undef HAVE_MACH_MACH_H @@ -930,6 +936,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYSLOG_H +/* Define to 1 if you have the `sysmp' function. */ +#undef HAVE_SYSMP + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_ACL_H @@ -989,15 +998,24 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SYSCTL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSINFO_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SYSMACROS_H /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SYSMP_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SYSTEMCFG_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_SYSTEMINFO_H +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TABLE_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIMEB_H @@ -1016,6 +1034,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_WAIT_H +/* Define to 1 if you have the `table' function. */ +#undef HAVE_TABLE + /* Define to 1 if you have the header file. */ #undef HAVE_TERMIOS_H @@ -1104,6 +1125,10 @@ stack overflow detection heuristic. */ #undef HAVE_XSI_STACK_OVERFLOW_HEURISTIC +/* Define to 1 if you have the external variable, _system_configuration with a + member named physmem. */ +#undef HAVE__SYSTEM_CONFIGURATION + /* Define to 1 if you have the `__fpending' function. */ #undef HAVE___FPENDING diff --git a/lib/Makefile.in b/lib/Makefile.in index 79a6e2272..14e2933f2 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -190,6 +190,7 @@ libfetish_a_SOURCES = \ fnmatch_.h \ fopen-safer.c \ fsusage.h \ + fts.c fts_.h \ ftw_.h \ full-read.c full-read.h \ full-write.c full-write.h \ @@ -294,7 +295,7 @@ am_libfetish_a_OBJECTS = acl$U.$(OBJEXT) getdate$U.$(OBJEXT) \ cycle-check$U.$(OBJEXT) diacrit$U.$(OBJEXT) dirname$U.$(OBJEXT) \ dup-safer$U.$(OBJEXT) exclude$U.$(OBJEXT) exitfail$U.$(OBJEXT) \ filemode$U.$(OBJEXT) file-type$U.$(OBJEXT) \ - fopen-safer$U.$(OBJEXT) full-read$U.$(OBJEXT) \ + fopen-safer$U.$(OBJEXT) fts$U.$(OBJEXT) full-read$U.$(OBJEXT) \ full-write$U.$(OBJEXT) getstr$U.$(OBJEXT) gettime$U.$(OBJEXT) \ getugroups$U.$(OBJEXT) hard-locale$U.$(OBJEXT) \ human$U.$(OBJEXT) idcache$U.$(OBJEXT) isdir$U.$(OBJEXT) \ @@ -366,7 +367,7 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/exitfail$U.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/file-type$U.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/filemode$U.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/fopen-safer$U.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/fopen-safer$U.Po ./$(DEPDIR)/fts$U.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/full-read$U.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/full-write$U.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/getdate$U.Po ./$(DEPDIR)/getopt$U.Po \ @@ -548,6 +549,7 @@ mostlyclean-kr: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-type$U.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filemode$U.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fopen-safer$U.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fts$U.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-read$U.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-write$U.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate$U.Po@am__quote@ @@ -691,6 +693,8 @@ fsusage_.c: fsusage.c $(ANSI2KNR) $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fsusage.c; then echo $(srcdir)/fsusage.c; else echo fsusage.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@ ftruncate_.c: ftruncate.c $(ANSI2KNR) $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ftruncate.c; then echo $(srcdir)/ftruncate.c; else echo ftruncate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@ +fts_.c: fts.c $(ANSI2KNR) + $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fts.c; then echo $(srcdir)/fts.c; else echo fts.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@ ftw_.c: ftw.c $(ANSI2KNR) $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ftw.c; then echo $(srcdir)/ftw.c; else echo ftw.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@ full-read_.c: full-read.c $(ANSI2KNR) @@ -927,20 +931,21 @@ dup2_.$(OBJEXT) error_.$(OBJEXT) euidaccess_.$(OBJEXT) \ exclude_.$(OBJEXT) exitfail_.$(OBJEXT) file-type_.$(OBJEXT) \ fileblocks_.$(OBJEXT) filemode_.$(OBJEXT) fnmatch_.$(OBJEXT) \ fopen-safer_.$(OBJEXT) fsusage_.$(OBJEXT) ftruncate_.$(OBJEXT) \ -ftw_.$(OBJEXT) full-read_.$(OBJEXT) full-write_.$(OBJEXT) \ -getdate_.$(OBJEXT) getgroups_.$(OBJEXT) gethostname_.$(OBJEXT) \ -getline_.$(OBJEXT) getloadavg_.$(OBJEXT) getopt_.$(OBJEXT) \ -getopt1_.$(OBJEXT) getpass_.$(OBJEXT) getstr_.$(OBJEXT) \ -gettime_.$(OBJEXT) gettimeofday_.$(OBJEXT) getugroups_.$(OBJEXT) \ -getusershell_.$(OBJEXT) group-member_.$(OBJEXT) hard-locale_.$(OBJEXT) \ -hash_.$(OBJEXT) hash-pjw_.$(OBJEXT) human_.$(OBJEXT) idcache_.$(OBJEXT) \ -imaxtostr_.$(OBJEXT) isdir_.$(OBJEXT) lchown_.$(OBJEXT) \ -linebuffer_.$(OBJEXT) localcharset_.$(OBJEXT) long-options_.$(OBJEXT) \ -lstat_.$(OBJEXT) makepath_.$(OBJEXT) malloc_.$(OBJEXT) \ -mbswidth_.$(OBJEXT) md5_.$(OBJEXT) memcasecmp_.$(OBJEXT) \ -memchr_.$(OBJEXT) memcmp_.$(OBJEXT) memcoll_.$(OBJEXT) \ -memcpy_.$(OBJEXT) memmove_.$(OBJEXT) memrchr_.$(OBJEXT) \ -memset_.$(OBJEXT) mkdir_.$(OBJEXT) mkstemp_.$(OBJEXT) mktime_.$(OBJEXT) \ +fts_.$(OBJEXT) ftw_.$(OBJEXT) full-read_.$(OBJEXT) \ +full-write_.$(OBJEXT) getdate_.$(OBJEXT) getgroups_.$(OBJEXT) \ +gethostname_.$(OBJEXT) getline_.$(OBJEXT) getloadavg_.$(OBJEXT) \ +getopt_.$(OBJEXT) getopt1_.$(OBJEXT) getpass_.$(OBJEXT) \ +getstr_.$(OBJEXT) gettime_.$(OBJEXT) gettimeofday_.$(OBJEXT) \ +getugroups_.$(OBJEXT) getusershell_.$(OBJEXT) group-member_.$(OBJEXT) \ +hard-locale_.$(OBJEXT) hash_.$(OBJEXT) hash-pjw_.$(OBJEXT) \ +human_.$(OBJEXT) idcache_.$(OBJEXT) imaxtostr_.$(OBJEXT) \ +isdir_.$(OBJEXT) lchown_.$(OBJEXT) linebuffer_.$(OBJEXT) \ +localcharset_.$(OBJEXT) long-options_.$(OBJEXT) lstat_.$(OBJEXT) \ +makepath_.$(OBJEXT) malloc_.$(OBJEXT) mbswidth_.$(OBJEXT) \ +md5_.$(OBJEXT) memcasecmp_.$(OBJEXT) memchr_.$(OBJEXT) \ +memcmp_.$(OBJEXT) memcoll_.$(OBJEXT) memcpy_.$(OBJEXT) \ +memmove_.$(OBJEXT) memrchr_.$(OBJEXT) memset_.$(OBJEXT) \ +mkdir_.$(OBJEXT) mkstemp_.$(OBJEXT) mktime_.$(OBJEXT) \ mmap-stack_.$(OBJEXT) modechange_.$(OBJEXT) mountlist_.$(OBJEXT) \ nanosleep_.$(OBJEXT) obstack_.$(OBJEXT) offtostr_.$(OBJEXT) \ path-concat_.$(OBJEXT) physmem_.$(OBJEXT) posixtm_.$(OBJEXT) \ diff --git a/tests/mv/Makefile.in b/tests/mv/Makefile.in index 391cf9b47..5870f01e3 100644 --- a/tests/mv/Makefile.in +++ b/tests/mv/Makefile.in @@ -150,6 +150,8 @@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.3 gnits TESTS = \ + hard-3 \ + hard-2 \ perm-1 \ i-link-no \ part-fail \ -- cgit v1.2.3-54-g00ecf