Update and Regen.v1.30BISON-1_30

3 files changed, 50 insertions, 35 deletions

diff --git a/Makefile.in b/Makefile.in
index 428103b0..b9a4813f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -137,9 +137,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	uninstall-info-recursive all-recursive install-data-recursive \
 	install-exec-recursive installdirs-recursive install-recursive \
 	uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README ./stamp-h1.in ABOUT-NLS AUTHORS COPYING ChangeLog \
-	INSTALL Makefile.am Makefile.in NEWS THANKS aclocal.m4 \
-	config.hin configure configure.in
+DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \
+	Makefile.am Makefile.in NEWS THANKS aclocal.m4 config.hin \
+	configure configure.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -168,17 +168,10 @@ config.h: stamp-h1
 stamp-h1: $(srcdir)/config.hin $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.hin:  $(srcdir)/./stamp-h1.in
-	@if test ! -f $@; then \
-	  rm -f $(srcdir)/./stamp-h1.in; \
-	  $(MAKE) $(srcdir)/./stamp-h1.in; \
-	else :; fi
 
-$(srcdir)/./stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	@rm -f $(srcdir)/./stamp-h1.in $(srcdir)/./stamp-h1.inT
-	@echo timestamp > $(srcdir)/./stamp-h1.inT 2> /dev/null
+$(srcdir)/config.hin:  $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOHEADER)
-	@mv $(srcdir)/./stamp-h1.inT $(srcdir)/./stamp-h1.in
+	touch $(srcdir)/config.hin
 
 distclean-hdr:
 	-rm -f config.h
diff --git a/aclocal.m4 b/aclocal.m4
index 9cd1c394..1755eede 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -663,32 +663,15 @@ fi])
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 4
+AC_PREREQ([2.52])
+
+# serial 6
 
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  We must strip everything past the first ":",
 # and everything past the last "/".
 
-AC_PREREQ([2.52])
-
-AC_DEFUN([AM_CONFIG_HEADER],
-[dnl init our file count if it isn't already
-m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
-dnl prepare to store our destination file list for use in config.status
-AC_FOREACH([_AM_File], [$1],
-           [m4_pushdef([_AM_Dest], patsubst(_AM_File, [:.*]))
-            m4_define([_AM_Config_Header_Index],
-                      m4_incr(_AM_Config_Header_Index))
-            dnl and add it to the list of files AC keeps track of, along
-	    dnl with our hook
-            AC_CONFIG_HEADERS(_AM_File,
-                              [# update the timestamp
-echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
-][$2]m4_ifval([$3], [, [$3]]))
-            m4_popdef([_AM_Dest])])
-]) # AM_CONFIG_HEADER
-
 # _AM_DIRNAME(PATH)
 # -----------------
 # Like AS_DIRNAME, only do it during macro expansion
@@ -700,7 +683,44 @@ AC_DEFUN([_AM_DIRNAME],
 			  patsubst([$1], [^\(/\).*], [\1])),
 		    patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
 	      patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
-]) # _AM_DIRNAME
+])# _AM_DIRNAME
+
+
+# The stamp files are numbered to have different names.
+# We could number them on a directory basis, but that's additional
+# complications, let's have a unique counter.
+m4_define([_AM_STAMP_Count], [0])
+
+
+# _AM_STAMP(HEADER)
+# -----------------
+# The name of the stamp file for HEADER.
+AC_DEFUN([_AM_STAMP],
+[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
+AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
+                               [:.*])))/stamp-h[]_AM_STAMP_Count])
+
+
+# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
+# ------------------------------------------------------------
+# We used to try to get a real timestamp in stamp-h.  But the fear is that
+# that will cause unnecessary cvs conflicts.
+AC_DEFUN([_AM_CONFIG_HEADER],
+[# Add the stamp file to the list of files AC keeps track of,
+# along with our hook.
+AC_CONFIG_HEADERS([$1],
+                  [# update the timestamp
+echo 'timestamp for $1' >"_AM_STAMP([$1])"
+$2],
+                  [$3])
+])# _AM_CONFIG_HEADER
+
+
+# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
+# --------------------------------------------------------------
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
+])# AM_CONFIG_HEADER
 
 #serial 1
 # This test replaces the one in autoconf.
diff --git a/configure b/configure
index 2d9b7c6c..71fe12fc 100755
--- a/configure
+++ b/configure
@@ -1435,7 +1435,9 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-            	                ac_config_headers="$ac_config_headers config.h:config.hin"
+# Add the stamp file to the list of files AC keeps track of,
+# along with our hook.
+ac_config_headers="$ac_config_headers config.h:config.hin"
 
 # Initialize the test suite.
 ac_config_commands="$ac_config_commands tests/package.m4"
@@ -9463,7 +9465,7 @@ done; }
   # Run the commands associated with the file.
   case $ac_file in
     config.h ) # update the timestamp
-echo timestamp >"./stamp-h1"
+echo 'timestamp for config.h:config.hin' >"./stamp-h1"
  ;;
   esac
 done