merge with 3.4.8

3 files changed, 51 insertions, 12 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index affeea23d..83ea2751d 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -74,18 +74,20 @@ libfu.a: $(OBJECTS)
 	$(AR) cr $@ $(OBJECTS)
 	-$(RANLIB) $@
 
-# Since this directory contains two parsers, using bison without -y
-# is the only way to reliably do a parallel make.
+# Since this directory contains two parsers, we have to be careful to avoid
+# running two $(YACC)s during parallel makes.  See below.
 getdate.c: getdate.y
 	@echo expect 9 shift/reduce conflicts
-	-bison -o getdate.c $(srcdir)/getdate.y || $(YACC) $(srcdir)/getdate.y
-	test ! -f y.tab.c || mv y.tab.c getdate.c
+	$(YACC) $(srcdir)/getdate.y
+	mv y.tab.c getdate.c
 
 # Make the rename atomic, in case sed is interrupted and later rerun.
-posixtm.c: posixtm.y
-	-bison -o posixtm.tab.c $(srcdir)/posixtm.y \
-	    || $(YACC) $(srcdir)/posixtm.y
-	test ! -f y.tab.c || mv y.tab.c posixtm.tab.c
+# The artificial dependency on getdate.c keeps the two parsers from being
+# built in parallel.  Enforcing this little bit of sequentiality lets
+# everyone (even those without bison) still run mostly parallel builds.
+posixtm.c: posixtm.y getdate.c
+	$(YACC) $(srcdir)/posixtm.y
+	mv y.tab.c posixtm.tab.c
 	sed -e 's/yy/zz/g' posixtm.tab.c > tposixtm.c
 	mv tposixtm.c posixtm.c
 	rm -f posixtm.tab.c
diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 20e2b5050..8a25a905d 100644
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -15,10 +15,26 @@ License along with this library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <errno.h>
 #include <fnmatch.h>
 #include <ctype.h>
 
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
+
+
 #if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS)
 extern int errno;
 #endif
@@ -180,3 +196,5 @@ fnmatch (pattern, string, flags)
 
   return FNM_NOMATCH;
 }
+
+#endif	/* _LIBC or not __GNU_LIBRARY__.  */
diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 504ddf8c9..50eb10e28 100644
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,3 +1,26 @@
+Sun Apr 18 02:35:36 1993  Jim Meyering (meyering@comco.com)
+
+	* configure.in: Check for gettimeofday.
+	Check for `struct tm'.
+	Change MVDIR definition so it works with new AC_DEFINE.
+
+	* system.h: Remove last vestiges of USG;  instead, use specific
+	test for TM_IN_SYS_TIME to determine whether to include time.h
+	or sys/time.h.
+
+	* src/Makefile.in (install): Rewrite the test for whether to install
+	mvdir so that it doesn't cause gratuitous failures with broken shells.
+	Split long rule so the pieces fit in 80-column lines. 
+
+Thu Apr 15 23:44:01 1993  Jim Meyering (meyering@comco.com)
+
+	* lib/Makefile.in (posixtm.c): Add dependency on getdate.c to enforce
+	sequential invocations of YACC.
+	* (posixtm.c, getdate.c): Remove use of `bison -o' and associated
+	conditional rename commands -- not needed since the parser generators
+	won't be run in parallel;  now bison (when used) is always invoked
+	with -y.
+
 Tue Apr 13 09:18:18 1993  Jim Meyering (meyering@comco.com)
 
 	* configure.in: Find a parser generator.
@@ -41,15 +64,11 @@ Wed Apr  7 23:54:48 1993  Jim Meyering (meyering@comco.com)
 
 Mon Apr  5 20:14:17 1993  Jim Meyering  (meyering@comco.com)
 
-	* Version 3.4.5.
-
 	* chgrp.c, chmod.c, chown.c, install.c, ls.c, mkfifo.c, mknod.c,
 	touch.c: Add `case 0: break;' for long-only options help and version.
 
 Sun Apr  4 09:38:00 1993  Jim Meyering  (meyering@comco.com)
 
-	* Version 3.4.4.
-
 	* src/*.c (usage): Mention --help and --version.
 	(main): Handle flag_help and flag_version before checking for
 	invocation errors.