From e86b6c2c6a54c916f5482cd73554d1ba02107c0a Mon Sep 17 00:00:00 2001
From: Mikael Djurfeldt <djurfeldt@nada.kth.se>
Date: Mon, 6 Sep 1999 19:57:08 +0000
Subject: [PATCH] Regenerated

---
 Makefile.in          | 48 +++++++++++++++++++++++++++++++++++---------
 libguile/Makefile.in |  2 +-
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0b091cb66..2441adfe2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,9 +105,10 @@ CONFIG_CLEAN_FILES =
 DATA =  $(aclocal_DATA)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 config.guess \
-config.sub configure configure.in install-sh ltconfig ltmain.sh \
-mdate-sh missing mkinstalldirs
+Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 aclocal.m4 \
+config.guess config.sub configure configure.in install-sh \
+libguile/scmconfig.h.in libguile/stamp-h.in ltconfig ltmain.sh mdate-sh \
+missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -131,6 +132,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
+libguile/scmconfig.h: libguile/stamp-h
+	@if test ! -f $@; then \
+		rm -f libguile/stamp-h; \
+		$(MAKE) libguile/stamp-h; \
+	else :; fi
+libguile/stamp-h: $(srcdir)/libguile/scmconfig.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=libguile/scmconfig.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > libguile/stamp-h 2> /dev/null
+$(srcdir)/libguile/scmconfig.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/libguile/stamp-h.in
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/libguile/stamp-h.in; \
+		$(MAKE) $(srcdir)/libguile/stamp-h.in; \
+	else :; fi
+$(srcdir)/libguile/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/libguile/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+	-rm -f libguile/scmconfig.h
+
+maintainer-clean-hdr:
+
 install-aclocalDATA: $(aclocal_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(aclocaldir)
@@ -339,29 +368,30 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-tags clean-generic mostlyclean-am
+clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
 
 clean: clean-recursive
 
-distclean-am:  distclean-tags distclean-generic clean-am
+distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
 	-rm -f libtool
 
 distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
-.PHONY: uninstall-aclocalDATA install-aclocalDATA install-data-recursive \
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+uninstall-aclocalDATA install-aclocalDATA install-data-recursive \
 uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index 70a804b94..574ad748b 100644
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -95,7 +95,7 @@ AUTOMAKE_OPTIONS = foreign
 
 INCLUDES = -I.. -I$(srcdir)/.. ${THREAD_CPPFLAGS}
 
-ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(PROC\|PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/'
+ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/'
 
 lib_LTLIBRARIES = libguile.la
 bin_PROGRAMS = guile