Changes to use automake-generated Makefile.ins everywhere

ChangeLog

@@ -1,3 +1,17 @@
+Mon Dec  2 17:33:04 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* configure.in: Generate doc/guile-programmer/Makefile and
+	doc/guile-user/Makefile.
+
+Sat Nov 30 23:45:54 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* aclocal.m4: Now automatically generated by aclocal.
+	* threads.m4: New file.
+	* guile.m4: New file.
+	* Makefile.am, doc/Makefile.am: New files.
+	* configure.in: Updated for Automake.  Avoid excessively verbose
+	"greet" messages.
+
 Wed Oct 16 07:32:14 1996  Mark Galassi  <rosalia@sarastro.lanl.gov>
 
 	* lgh: directory renamed to gh, along with all prefixes of the

GUILE-VERSION

@@ -1,4 +1,7 @@
-GUILE_MAJOR_VERSION=1
+GUILE_MAJOR_VERSION=0
-GUILE_MINOR_VERSION=0b3
+GUILE_MINOR_VERSION=9c
 GUILE_VERSION=$GUILE_MAJOR_VERSION.$GUILE_MINOR_VERSION
 
+# For automake.
+VERSION=$GUILE_VERSION
+PACKAGE=guile

HACKING

@@ -36,9 +36,10 @@ precisely engineered fashion; to correct an error, you need not know
 the history of the erroneous passage.  (This is copied from the GNU
 coding standards.)
 
-- If you add or remove files, don't forget to update the 'dist-dir'
+- If you add or remove files, don't forget to update the appropriate
-target in the relevant Makefile.in files, so the snapshot and
+part of the relevant Makefile.am files, and regenerate the
-distribution processes will work.
+Makefile.in.  If you forget this, the snapshot and distribution
+processes will not work.
 
 - Make sure you have papers from people before integrating their
 changes or contributions.  This is very frustrating, but very

Makefile.am

@@ -0,0 +1,14 @@
+## Process this file with automake to produce Makefile.in.
+
+SUBDIRS = @existingdirs@ doc
+
+guile_dirs = @existingdirs@ doc
+guile-dist:
+	$(MAKE) SUBDIRS="$(guile_dirs)" dist
+
+## FIXME: in the future there will be direct automake support for
+## doing this.  When that happens, switch over.
+aclocaldir = $(datadir)/aclocal
+aclocal_DATA = guile.m4 threads.m4
+
+EXTRA_DIST = $(aclocal_DATA) HACKING GUILE-VERSION

Makefile.in

@@ -1,304 +1,259 @@
-#	Copyright (C) 1994,1995 Free Software Foundation, Inc.
+# Makefile.in generated automatically by automake 1.1i from Makefile.am
-#
+
-# This program is free software; you can redistribute it and/or modify
+# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
-# it under the terms of the GNU General Public License as published by
+# This Makefile.in is free software; the Free Software Foundation
-# the Free Software Foundation; either version 2, or (at your option)
+# gives unlimited permission to copy, distribute and modify it.
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this software; see the file COPYING.  If not, write to
-# the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-VERSION = @GUILE_VERSION@
 
 SHELL = /bin/sh
 
-srcdir=@srcdir@
+srcdir = @srcdir@
-subdirs=@build_subdirs@
+top_srcdir = @top_srcdir@
-dist_dirs=@existingdirs@ doc
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
 
-DISTFILES =	AUTHORS \
+bindir = @bindir@
-		COPYING \
+sbindir = @sbindir@
-		ChangeLog \
+libexecdir = @libexecdir@
-		GUILE-VERSION \
+datadir = @datadir@
-		INSTALL \
+sysconfdir = @sysconfdir@
-		NEWS \
+sharedstatedir = @sharedstatedir@
-		README \
+localstatedir = @localstatedir@
-		TODO \
+libdir = @libdir@
-		aclocal.m4 \
+infodir = @infodir@
-		Makefile.in \
+mandir = @mandir@
-		configure \
+includedir = @includedir@
-		configure.in \
+oldincludedir = /usr/include
-		config.sub \
-		config.guess \
-		install-sh \
-		mkinstalldirs
 
-# `all'
+pkgdatadir = $(datadir)/@PACKAGE@
-#     Compile the entire program.  This should be the default target.
+pkglibdir = $(libdir)/@PACKAGE@
-#     This target need not rebuild any documentation files; info files
+pkgincludedir = $(includedir)/@PACKAGE@
-#     should normally be included in the distribution, and DVI files
+
-#     should be made only when explicitly asked for.
+top_builddir = .
-all:
+
-	@for dir in ${subdirs}; do \
+INSTALL = @INSTALL@
-		cd $$dir; \
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-		${MAKE} all; \
+INSTALL_DATA = @INSTALL_DATA@
-		cd .. ;\
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+existingdirs = @existingdirs@
+
+SUBDIRS = @existingdirs@ doc
+
+guile_dirs = @existingdirs@ doc
+
+aclocaldir = $(datadir)/aclocal
+aclocal_DATA = guile.m4 threads.m4
+
+EXTRA_DIST = $(aclocal_DATA) HACKING GUILE-VERSION
+ACLOCAL = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DATA =  $(aclocal_DATA)
+
+DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+Makefile.in NEWS README TODO aclocal.m4 config.guess config.sub \
+configure configure.in install-sh mdate-sh mkinstalldirs
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
+	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
+
+TAR = tar
+default: all
+
+.SUFFIXES:
+$(srcdir)/aclocal.m4: configure.in
+	cd $(srcdir) && aclocal
+
+$(srcdir)/Makefile.in: Makefile.am configure.in
+	cd $(srcdir) && automake --strictness=gnu Makefile
+
+# For an explanation of the following Makefile rules, see node
+# `Automatic Remaking' in GNU Autoconf documentation.
+Makefile: $(srcdir)/Makefile.in config.status $(BUILT_SOURCES)
+	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+config.status: configure
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && autoconf
+
+install-aclocalDATA: $(aclocal_DATA)
+	$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(aclocaldir)
+	list="$(aclocal_DATA)"; for p in $$list; do \
+	  if test -f $(srcdir)/$$p; then \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(aclocaldir)/$$p; \
+	  else if test -f $$p; then \
+	    $(INSTALL_DATA) $$p $(aclocaldir)/$$p; \
+	  fi; fi; \
 	done
 
-#`install'
+uninstall-aclocalDATA:
-#     Compile the program and copy the executables, libraries, and so on
+	list="$(aclocal_DATA)"; for p in $$list; do \
-#     to the file names where they should reside for actual use.  If
+	  rm -f $(aclocaldir)/$$p; \
-#     there is a simple test to verify that a program is properly
-#     installed then run that test.
-#
-#     Use `-' before any command for installing a man page, so that
-#     `make' will ignore any errors.  This is in case there are systems
-#     that don't have the Unix man page documentation system installed.
-#
-#     In the future, when we have a standard way of installing info
-#     files, `install' targets will be the proper place to do so.
-#
-subdir-inst-target=install-nobuild
-
-install: all
-	${MAKE} subdir-inst-target=install install-nobuild
-
-install-nobuild:
-	for dir in ${subdirs}; do \
-		cd $$dir; \
-		${MAKE} ${subdir-inst-target}; \
-		cd ..  ;\
 	done
 
-#`uninstall'
+# This directory's subdirectories are mostly independent; you can cd
-#     Delete all the installed files that the `install' target would
+# into them and run `make' without going through this Makefile.
-#     create (but not the noninstalled files such as `make all' would
+# To change the values of `make' variables: instead of editing Makefiles,
-#     create).
+# (1) if the variable is set in `config.status', edit `config.status'
-uninstall:
+#     (which will cause the Makefiles to be regenerated when you run `make');
-	for dir in ${subdirs}; do \
+# (2) otherwise, pass the desired values on the `make' command line.
-		cd $$dir; \
+
-		${MAKE} uninstall; \
+@SET_MAKE@
-		cd ..  ;\
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
+check-recursive installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+	for subdir in $(SUBDIRS); do		\
+	  target=`echo $@ | sed s/-recursive//`; \
+	  (cd $$subdir && $(MAKE) $$target)	\
+	   || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+	done && test -z "$$fail"
+tags-recursive:
+	list="$(SUBDIRS)"; for subdir in $$list; do \
+	  (cd $$subdir && $(MAKE) tags); \
 	done
+tags: TAGS
+TAGS:
 
 
-#`clean'
+distdir = $(PACKAGE)-$(VERSION)
-#     Delete all files from the current directory that are normally
+# This target untars the dist file and tries a VPATH configuration.  Then
-#     created by building the program.  Don't delete the files that
+# it guarantees that the distribution is self-contained by making another
-#     record the configuration.  Also preserve files that could be made
+# tarfile.
-#     by building, but normally aren't because the distribution comes
+distcheck: dist
-#     with them.
+	rm -rf $(distdir)
-#
+	$(TAR) zxf $(distdir).tar.gz
-#     Delete `.dvi' files here if they are not part of the distribution.
+	mkdir $(distdir)/=build
-#
+	mkdir $(distdir)/=inst
-clean:
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	for dir in ${subdirs}; do \
+	cd $(distdir)/=build \
-		cd $$dir; \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-		${MAKE} clean; \
+	  && $(MAKE) \
-		cd ..  ;\
+	  && $(MAKE) dvi \
+	  && $(MAKE) check \
+	  && $(MAKE) install \
+	  && $(MAKE) installcheck \
+	  && $(MAKE) dist
+	rm -rf $(distdir)
+	@echo "========================"; \
+	echo "$(distdir).tar.gz is ready for distribution"; \
+	echo "========================"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	$(TAR) chozf $(distdir).tar.gz $(distdir)
+	rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	$(TAR) chozf $(distdir).tar.gz $(distdir)
+	rm -rf $(distdir)
+distdir: $(DISTFILES)
+	rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 755 $(distdir)
+	here=`pwd`; distdir=`cd $(distdir) && pwd` \
+	  && cd $(srcdir) \
+	  && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --strictness=gnu
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
+	for subdir in $(SUBDIRS); do		\
+	  test -d $(distdir)/$$subdir		\
+	  || mkdir $(distdir)/$$subdir		\
+	  || exit 1;				\
+	  chmod 755 $(distdir)/$$subdir;	\
+	  (cd $$subdir && $(MAKE) distdir=../$(distdir)/$$subdir distdir) \
+	    || exit 1; \
+	done
+info: info-recursive
+dvi: dvi-recursive
+check: all-am
+	$(MAKE) check-recursive
+installcheck: installcheck-recursive
+all-am: $(DATA) Makefile
 
-#`distclean'
+install-data-am: install-aclocalDATA
-#     Delete all files from the current directory that are created by
+
-#     configuring or building the program.  If you have unpacked the
+uninstall-am: uninstall-aclocalDATA
-#     source and built the program without creating any other files,
+
-#     `make distclean' should leave only the files that were in the
+install-exec: install-exec-recursive
-#     distribution.
+	$(NORMAL_INSTALL)
-distclean:
+
-	rm -f config.cache
+install-data: install-data-recursive install-data-am
-	rm -f config.log
+	$(NORMAL_INSTALL)
+
+install: install-recursive install-data-am
+	@:
+
+uninstall: uninstall-recursive uninstall-am
+
+all: all-recursive all-am
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+installdirs: installdirs-recursive
+	$(mkinstalldirs)  $(aclocaldir)
+
+
+mostlyclean-generic:
+	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	rm -f Makefile $(DISTCLEANFILES)
+	rm -f config.cache config.log stamp-h
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean-am:  mostlyclean-generic
+
+clean-am:  clean-generic mostlyclean-am 
+
+distclean-am:  distclean-generic clean-am 
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am 
+
+mostlyclean:  mostlyclean-am mostlyclean-recursive
+
+clean:  clean-am clean-recursive
+
+distclean:  distclean-am distclean-recursive
 	rm -f config.status
-	rm -f config.build-subdirs
-	rm -f Makefile
-	rm -f doc/Makefile
-	for dir in ${subdirs}; do \
-		cd $$dir; \
-		${MAKE} distclean; \
-		cd ..  ;\
-	done
 
+maintainer-clean:  maintainer-clean-am maintainer-clean-recursive
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f config.status
 
-#`mostlyclean'
+.PHONY: default uninstall-aclocalDATA install-aclocalDATA \
-#     Like `clean', but may refrain from deleting a few files that people
+install-data-recursive uninstall-data-recursive install-exec-recursive \
-#     normally don't want to recompile.  For example, the `mostlyclean'
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-#     target for GCC does not delete `libgcc.a', because recompiling it
+all-recursive check-recursive installcheck-recursive info-recursive \
-#     is rarely necessary and takes a lot of time.
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-mostlyclean:
+maintainer-clean-recursive tags tags-recursive distdir info dvi \
-	for dir in ${subdirs}; do \
+installcheck all-am install-data-am uninstall-am install-exec \
-		cd $$dir; \
+install-data install uninstall all installdirs mostlyclean-generic \
-		${MAKE} mostlyclean; \
+distclean-generic clean-generic maintainer-clean-generic clean \
-		cd ..  ;\
+mostlyclean distclean maintainer-clean
-	done
 
+guile-dist:
+	$(MAKE) SUBDIRS="$(guile_dirs)" dist
 
-#`realclean'
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-#     Delete everything from the current directory that can be
+# Otherwise a system limit (for SysV at least) may be exceeded.
-#     reconstructed with this Makefile.  This typically includes
+.NOEXPORT:
-#     everything deleted by distclean, plus more: C source files
-#     produced by Bison, tags tables, info files, and so on.
-#
-#     One exception, however: `make realclean' should not delete
-#     `configure' even if `configure' can be remade using a rule in the
-#     Makefile.  More generally, `make realclean' should not delete
-#     anything that needs to exist in order to run `configure' and then
-#     begin to build the program.
-realclean:
-	for dir in ${subdirs}; do \
-		cd $$dir; \
-		${MAKE} realclean; \
-		cd ..  ;\
-	done
-
-
-#`TAGS'
-#     Update a tags table for this program.
-#     We could allow each subdirectory to create its own TAGS file,
-#     and then use etags' --include option to incorporate them all by
-#     reference into a top-level TAGS file, but the --include option
-#     seems to be deprecated, and this works fine.
-# 
-#     The extra 'tags' name is useful --- 'make TAGS' won't run the
-#     commands if the file `TAGS' already exists, but `make tags'
-#     doesn't have that problem.
-TAGS tags:
-	etags \
-	  --regex='/SCM_PROC[^"]*"[^"]*"/' \
-	  `find ${srcdir} -name '*.[ch]' -o -name '*.scm'`
-
-#`info'
-#     Generate any info files needed.  The best way to write the rules
-#     is as follows:
-#
-#          info:  foo.info
-#          
-#          foo.info: $(srcdir)/foo.texi $(srcdir)/chap1.texi $(srcdir)/chap2.texi
-#                  $(MAKEINFO) $(srcdir)/foo.texi
-#
-#     You must define the variable `MAKEINFO' in the Makefile.  It
-#     should run the Makeinfo program, which is part of the Texinfo2
-#     distribution.
-info:
-	cd doc; ${MAKE} info
-
-#`dvi'
-#     Generate DVI files for all TeXinfo documentation.  For example:
-#
-#          dvi: foo.dvi
-#          
-#          foo.dvi: $(srcdir)/foo.texi $(srcdir)/chap1.texi $(srcdir)/chap2.texi
-#                  $(TEXI2DVI) $(srcdir)/foo.texi
-#
-#     You must define the variable `TEXI2DVI' in the Makefile.  It should
-#     run the program `texi2dvi', which is part of the Texinfo2
-#     distribution.  Alternatively, write just the dependencies, and
-#     allow GNU Make to provide the command.
-dvi:
-	for dir in ${subdirs}; do \
-		cd $$dir; \
-		${MAKE} dvi; \
-		cd ..  ;\
-	done
-
-#`dist'
-#     Create a distribution tar file for this program.  The tar file
-#     should be set up so that the file names in the tar file start with
-#     a subdirectory name which is the name of the package it is a
-#     distribution for.  This name can include the version number.
-#
-#     For example, the distribution tar file of GCC version 1.40 unpacks
-#     into a subdirectory named `gcc-1.40'.
-#
-#     The easiest way to do this is to create a subdirectory
-#     appropriately named, use `ln' or `cp' to install the proper files
-#     in it, and then `tar' that subdirectory.
-#
-#     The `dist' target should explicitly depend on all non-source files
-#     that are in the distribution, to make sure they are up to date in
-#     the distribution.  *Ref Making Releases: (standards)Releases.
-.PHONY: dist
-GZIP=gzip --best
-GZIP_EXT=.gz
-TAR_VERBOSE=v
-DIST_NAME=guile-${VERSION}
-dist: info
-	@echo "Creating distribution for ${DIST_NAME}."
-	rm -rf ${DIST_NAME} ${DIST_NAME}.tar${GZIP_EXT}
-	${MAKE} dist-dir DISTDIR="${DIST_NAME}"
-	for dir in ${dist_dirs}; do \
-	  ( DISTDIR="../${DIST_NAME}/$${dir}"; \
-	    cd $${dir} && \
-	    ${MAKE} dist-dir DISTDIR="$${DISTDIR}" \
-	  ); \
-	done
-	tar chf${TAR_VERBOSE} - ${DIST_NAME} | ${GZIP} > "${DIST_NAME}.tar${GZIP_EXT}"
-	rm -rf ${DIST_NAME}
-
-# The `dist' target in the top-level Makefile uses this `dist-dir'
-# target to select the appropriate files for distribution from the
-# directory containing this Makefile.
-.PHONY: dist-dir
-dist-dir:
-	mkdir ${DISTDIR}
-	for i in ${DISTFILES}; do \
-	  ln $(srcdir)/$${i} ${DISTDIR}; \
-        done
-
-#`check'
-#     Perform self-tests (if any).  The user must build the program
-#     before running the tests, but need not install the program; you
-#     should write the self-tests so that they work when the program is
-#     built but not installed.
-check:
-	for dir in ${subdirs}; do \
-		cd $$dir; \
-		${MAKE} check; \
-		cd ..  ;\
-	done
-
-
-#`installcheck'
-#     Perform installation tests (if any).  The user must build and
-#     install the program before running the tests.  You should not
-#     assume that `$(bindir)' is in the search path.
-installcheck:
-	for dir in ${subdirs}; do \
-		cd $$dir; \
-		${MAKE} installcheck; \
-		cd ..  ;\
-	done
-
-
-#`installdirs'
-#     It's useful to add a target named `installdirs' to create the
-#     directories where files are installed, and their parent
-#     directories.  There is a script called `mkinstalldirs' which is
-#     convenient for this; find it in the Texinfo package.You can use a
-#     rule like this:
-#
-#          # Make sure all installation directories, e.g. $(bindir) actually exist by
-#          # making them if necessary.
-#          installdirs: mkinstalldirs
-#                  $(srcdir)/mkinstalldirs $(bindir) $(datadir) $(libdir) \
-#                                          $(infodir) $(mandir)
-installdirs:
-	for dir in ${subdirs}; do \
-		cd $$dir; \
-		${MAKE} installdirs; \
-		cd ..  ;\
-	done
-
-
-
-# Cygnus extention:
-# 
-#    `Makefile'
-#          Calls `./config.status' to rebuild the `Makefile' in this
-#          directory.
-Makefile:
-	${SHELL-/bin/sh} config.status

aclocal.m4

@@ -1,102 +1,52 @@
-dnl
+dnl aclocal.m4 generated automatically by aclocal 1.1i
-dnl CY_AC_WITH_THREADS determines which thread library the user intends
-dnl to put underneath guile.  Pass it the path to find the guile top-level
-dnl source directory.  Eg CY_AC_WITH_THREADS(../..) for tcl/unix.
-dnl
 
-AC_DEFUN([CY_AC_WITH_THREADS],[
+# Do all the work for Automake.  This macro actually does too much --
-AC_CACHE_CHECK("threads package type",cy_cv_threads_package,[
+# some checks are only needed if your package does certain things.
-AC_CACHE_VAL(cy_cv_threads_cflags,[
+# But this isn't really a big deal.
-AC_CACHE_VAL(cy_cv_threads_libs,[
+
-use_threads=no;
+# serial 1
-AC_ARG_WITH(threads,[  --with-threads          thread interface],
+
-            use_threads=$withval, use_threads=no)
+dnl Usage:
-test -n "$use_threads" || use_threads=qt
+dnl AM_INIT_AUTOMAKE(package,version)
-threads_package=unknown
+
-if test "$use_threads" != no; then
+AC_DEFUN(AM_INIT_AUTOMAKE,
-dnl
+[AC_REQUIRE([AM_PROG_INSTALL])
-dnl Test for the qt threads package - used for cooperative threads
+PACKAGE=[$1]
-dnl This may not necessarily be built yet - so just check for the
+AC_SUBST(PACKAGE)
-dnl header files.
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-dnl
+VERSION=[$2]
-  if test "$use_threads" = yes || test "$use_threads" = qt; then
+AC_SUBST(VERSION)
-     # Look for qt in source directory.  This is a hack: we look in
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-     # "./qt" because this check might be run at the top level.
+AM_SANITY_CHECK
-     if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then
+AC_ARG_PROGRAM
-	threads_package=COOP
+AC_PROG_MAKE_SET])
-	cy_cv_threads_cflags="-I$srcdir/../qt -I../qt"
+
-	cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+
-     fi
+# serial 1
-  else
+
-     if test -f $use_threads/qt.c; then
+AC_DEFUN(AM_PROG_INSTALL,
-	# FIXME seems as though we should try to use an installed qt here.
+[AC_REQUIRE([AC_PROG_INSTALL])
-	threads_package=COOP
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-	cy_cv_threads_cflags="-I$use_threads -I../qt"
+AC_SUBST(INSTALL_SCRIPT)dnl
-	cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+])
-     fi
+
-  fi
+#
-  if test "$use_threads" = pthreads; then
+# Check to make sure that the build environment is sane.
-     # Look for pthreads in srcdir.  See above to understand why
+#
-     # we always set threads_package.
+
-     if test -f $srcdir/../../pthreads/pthreads/queue.c \
+AC_DEFUN(AM_SANITY_CHECK,
-	  || test -f $srcdir/../pthreads/pthreads/queue.c; then
+[AC_MSG_CHECKING([whether build environment is sane])
-	threads_package=MIT
+echo timestamp > conftestfile
-	cy_cv_threads_cflags="-I$srcdir/../../pthreads/include"
+# Do this in a subshell so we don't clobber the current shell's
-	cy_cv_threads_libs="-L../../pthreads/lib -lpthread"
+# arguments.  FIXME: maybe try `-L' hack like GETLOADAVG test?
-     fi
+if (set X `ls -t $srcdir/configure conftestfile`; test "[$]2" = conftestfile)
-  fi
+then
-  saved_CPP="$CPPFLAGS"
+   # Ok.
-  saved_LD="$LDFLAGS"
+   :
-  saved_LIBS="$LIBS"
+else
-  if test "$threads_package" = unknown; then
+   AC_MSG_ERROR([newly created file is older than distributed files!
-dnl
+Check your system clock])
-dnl Test for the FSU threads package
-dnl
-    CPPFLAGS="-I$use_threads/include"
-    LDFLAGS="-L$use_threads/lib"
-    LIBS="-lgthreads -lmalloc"
-    AC_TRY_LINK([#include <pthread.h>],[
-pthread_equal(NULL,NULL);
-], threads_package=FSU)
-  fi
-  if test "$threads_package" = unknown; then
-dnl
-dnl Test for the MIT threads package
-dnl
-    LIBS="-lpthread"
-    AC_TRY_LINK([#include <pthread.h>],[
-pthread_equal(NULL,NULL);
-], threads_package=MIT)
-  fi
-  if test "$threads_package" = unknown; then
-dnl
-dnl Test for the PCthreads package
-dnl
-    LIBS="-lpthreads"
-    AC_TRY_LINK([#include <pthread.h>],[
-pthread_equal(NULL,NULL);
-], threads_package=PCthreads)
-  fi
-dnl
-dnl Set the appropriate flags!
-dnl 
-  cy_cv_threads_cflags="$CPPFLAGS $cy_cv_threads_cflags"
-  cy_cv_threads_libs="$LDFLAGS $LIBS $cy_cv_threads_libs"
-  cy_cv_threads_package=$threads_package
-  CPPFLAGS="$saved_CPP"
-  LDFLAGS="$saved_LD"
-  LIBS="$saved_LIBS"
-  if test "$threads_package" = unknown; then
-    AC_MSG_ERROR("cannot find thread library installation")
-  fi
 fi
-])
+rm -f conftest*
-])
+AC_MSG_RESULT(yes)])
-],
+
-dnl
-dnl Set flags according to what is cached.
-dnl
-CPPFLAGS="$cy_cv_threads_cflags"
-LIBS="$cy_cv_threads_libs"
-)
-])

configure

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.10 
+# Generated automatically using autoconf version 2.12 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -49,6 +49,8 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
 
 ac_prev=
 for ac_option
@@ -330,7 +332,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.10"
+    echo "configure generated by autoconf version 2.12"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -432,11 +434,14 @@ do
 done
 
 # NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
+# Only set these to C if already set.  These must not be set unconditionally
-# These must not be set unconditionally because not all systems understand
+# because not all systems understand e.g. LANG=C (notably SCO).
-# e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+# Non-C LC_CTYPE values break the ctype check.
 if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h
@@ -498,6 +503,7 @@ ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -512,15 +518,7 @@ else
 fi
 
 
-
-rm -f config.build-subdirs
-
 . $srcdir/GUILE-VERSION
-
-all_subdirs=`cat $srcdir/*/PLUGIN/REQ $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
-req_subdirs=`cat $srcdir/*/PLUGIN/REQ /dev/null | tsort | xargs echo`
-opt_subdirs=`cat $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
-
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -540,290 +538,164 @@ ac_config_guess=$ac_aux_dir/config.guess
 ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:553: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      for ac_prog in ginstall installbsd scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    # OSF/1 installbsd also uses dspmsg, but is usable.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+
+PACKAGE=$PACKAGE
+
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+VERSION=$VERSION
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
+echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+echo "configure:619: checking whether build environment is sane" >&5
+echo timestamp > conftestfile
+# Do this in a subshell so we don't clobber the current shell's
+# arguments.  FIXME: maybe try `-L' hack like GETLOADAVG test?
+if (set X `ls -t $srcdir/configure conftestfile`; test "$2" = conftestfile)
+then
+   # Ok.
+   :
+else
+   { echo "configure: error: newly created file is older than distributed files!
+Check your system clock" 1>&2; exit 1; }
+fi
+rm -f conftest*
+echo "$ac_t""yes" 1>&6
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:653: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftestmake <<\EOF
+all:
+	@echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SET_MAKE=
+else
+  echo "$ac_t""no" 1>&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+all_subdirs=`cat $srcdir/*/PLUGIN/REQ $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
+req_subdirs=`cat $srcdir/*/PLUGIN/REQ /dev/null | tsort | xargs echo`
+opt_subdirs=`cat $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
+
 subdirs="$all_subdirs"
 
 for d in $all_subdirs; do
   if test -d $srcdir/$d ; then
     existingdirs="$existingdirs $d"
-    if test "x$verbose" = xyes; then
+    test -n "$silent" || echo Configuring plug-in component $d
-       if test -f $srcdir/$d/PLUGIN/greet ; then
-	  cat $srcdir/$d/PLUGIN/greet
-       else
-	 echo ===
-	 echo === Configuring plug-in component $d
-	 echo ===
-       fi
-    fi
   fi
 done
 
 for d in $req_subdirs; do
-  if test ! -d $srcdir/$d ; then
+  test -d $srcdir/$d || {
-    echo "*******"
+     echo ERROR: Missing required package: $d 1>&2
-    echo "*******"
-    echo "**\+/**"
-    echo "**=*=**" ERROR: Missing required package: $d
-    echo "**/+\**"
-    echo "*******"
-    echo "*******"
      exit 1
-  fi
+  }
 done
 
-if test "x$verbose" = xyes; then
-  for d in $opt_subdirs; do
-    if test ! -d $srcdir/$d ; then
-      echo "*****"
-      echo "*===*"
-      echo "*=*=*" WARNING: Missing suggested package: $d
-      echo "*===*"
-      echo "*****"
-    fi
-  done
-fi
-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  ac_prog_rejected=no
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  if test "${CFLAGS+set}" != set; then
-    echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_gcc_g=yes
-else
-  ac_cv_prog_gcc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
-    if test $ac_cv_prog_gcc_g = yes; then
-      CFLAGS="-g -O"
-    else
-      CFLAGS="-O"
-    fi
-  fi
-else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-### build_subdirs is the list of directories we actually want to
-### build.  It's not equivalent to existingdirs: if we can't find the
-### Tcl libraries, then we don't want to build in gtcltk-lib.
-###
-### So why can't we just forget about gtcltk-lib altogether, and
-### delete it from existingdirs, in that case?  Well, in order for
-### 'make dist' to work, we still need to configure gtcltk-lib, and
-### the top-level Makefile needs to know it exists,
-build_subdirs="${existingdirs}"
-
-### Decide which directories to build; remove the ones we don't want
-### from build_subdirs.
-
-### On some systems, the Tcl library contains references to
-### functions in the dynamic linker library, -ldl, so we may need
-### to include that.
-echo $ac_n "checking for -ldl""... $ac_c" 1>&6
-ac_lib_var=`echo dl'_'dlopen | tr './+\055' '__p_'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 735 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
-
-int main() { return 0; }
-int t() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo dl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ldl $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-### Use gtcltk-lib only if we seem to have Tcl installed on the
-### system.  We really should check for Tk as well, but that involves
-### finding all the X libraries that we need to do a complete link.
-echo $ac_n "checking for -ltcl7.5""... $ac_c" 1>&6
-ac_lib_var=`echo tcl7.5'_'Tcl_CreateInterp | tr './+\055' '__p_'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ltcl7.5 -lm $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 783 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char Tcl_CreateInterp();
-
-int main() { return 0; }
-int t() {
-Tcl_CreateInterp()
-; return 0; }
-EOF
-if { (eval echo configure:795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  have_tcl=true
-else
-  echo "$ac_t""no" 1>&6
-have_tcl=false
-fi
-
-if $have_tcl; then :; else
-  build_subdirs="`echo $build_subdirs | sed s:gtcltk-lib::`"
-  req_subdirs="`echo $req_subdirs | sed s:gtcltk-lib::`"
-fi  
-
-### Write the list of survivors, the directories we do want to build,
-### to a file in the top level, so the subdirectories' configuration
-### scripts can find it.  We don't want to pass the list in the
-### environment, because the subdirectory configuration scripts can be
-### run on their own.
-echo "${build_subdirs}" > config.build-subdirs
-
-
-
 
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -842,11 +714,25 @@ cat > confcache <<\EOF
 # --recheck option to rerun configure.
 #
 EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+  case `(ac_space=' '; set) 2>&1` in
-  >> confcache
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
 if cmp -s $cache_file confcache; then
   :
 else
@@ -913,7 +799,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.10"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -922,8 +808,9 @@ do
 done
 
 ac_given_srcdir=$srcdir
+ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile doc/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile doc/Makefile doc/guile-programmer/Makefile doc/guile-user/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -953,28 +840,67 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+s%@PACKAGE@%$PACKAGE%g
+s%@VERSION@%$VERSION%g
+s%@SET_MAKE@%$SET_MAKE%g
 s%@subdirs@%$subdirs%g
-s%@CC@%$CC%g
 s%@existingdirs@%$existingdirs%g
-s%@build_subdirs@%$build_subdirs%g
-s%@GUILE_VERSION@%$GUILE_VERSION%g
 
 CEOF
 EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile doc/guile-programmer/Makefile doc/guile-user/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile]", defaulting infile="outfile.in".
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
   *) ac_file_in="${ac_file}.in" ;;
   esac
 
-  # Adjust relative srcdir, etc. for subdirectories.
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
 
   # Remove last slash and all that follows it.  Not all systems have dirname.
   ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
@@ -998,6 +924,11 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
     top_srcdir="$ac_dots$ac_given_srcdir" ;;
   esac
 
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  esac
+
   echo creating "$ac_file"
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
@@ -1006,15 +937,22 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 # $configure_input" ;;
   *) ac_comsub= ;;
   esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
   sed -e "$ac_comsub
 s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
+s%@INSTALL@%$INSTALL%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
 fi; done
-rm -f conftest.subs
+rm -f conftest.s*
 
+EOF
+cat >> $CONFIG_STATUS <<EOF
 
+EOF
+cat >> $CONFIG_STATUS <<\EOF
 
 exit 0
 EOF
@@ -1070,13 +1008,16 @@ if test "$no_recursion" != yes; then
     ac_popdir=`pwd`
     cd $ac_config_dir
 
+      # A "../" for each directory in /$ac_config_dir.
+      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+
     case "$srcdir" in
     .) # No --srcdir option.  We are building in place.
       ac_sub_srcdir=$srcdir ;;
     /*) # Absolute path.
       ac_sub_srcdir=$srcdir/$ac_config_dir ;;
     *) # Relative path.
-      ac_sub_srcdir=../$srcdir/$ac_config_dir ;;
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
     esac
 
     # Check for guested configure; otherwise get Cygnus style configure.
@@ -1093,13 +1034,15 @@ if test "$no_recursion" != yes; then
     if test -n "$ac_sub_configure"; then
 
       # Make the cache file name correct relative to the subdirectory.
-      # A "../" for each directory in /$ac_config_dir.
-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
       case "$cache_file" in
       /*) ac_sub_cache_file=$cache_file ;;
       *) # Relative path.
         ac_sub_cache_file="$ac_dots$cache_file" ;;
       esac
+  case "$ac_given_INSTALL" in
+        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+        esac
 
       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
       # The eval makes quoting arguments work.

configure.in

@@ -1,9 +1,9 @@
+dnl Process this file with autoconf to produce configure.
 AC_INIT(Makefile.in)
-
-rm -f config.build-subdirs
-
 . $srcdir/GUILE-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
+dnl FIXME: tsort, xargs not GNU standard.
 all_subdirs=`cat $srcdir/*/PLUGIN/REQ $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
 req_subdirs=`cat $srcdir/*/PLUGIN/REQ /dev/null | tsort | xargs echo`
 opt_subdirs=`cat $srcdir/*/PLUGIN/OPT /dev/null | tsort | xargs echo`
@@ -12,81 +12,16 @@ AC_CONFIG_SUBDIRS($all_subdirs)
 for d in $all_subdirs; do
   if test -d $srcdir/$d ; then
     existingdirs="$existingdirs $d"
-    if test "x$verbose" = xyes; then
+    test -n "$silent" || echo Configuring plug-in component $d
-       if test -f $srcdir/$d/PLUGIN/greet ; then
-	  cat $srcdir/$d/PLUGIN/greet
-       else
-	 echo ===
-	 echo === Configuring plug-in component $d
-	 echo ===
-       fi
-    fi
   fi
 done
 
 for d in $req_subdirs; do
-  if test ! -d $srcdir/$d ; then
+  test -d $srcdir/$d || {
-    echo "*******"
+     echo ERROR: Missing required package: $d 1>&2
-    echo "*******"
-    echo "**\+/**"
-    echo "**=*=**" ERROR: Missing required package: $d
-    echo "**/+\**"
-    echo "*******"
-    echo "*******"
      exit 1
-  fi
+  }
 done
 
-if test "x$verbose" = xyes; then
-  for d in $opt_subdirs; do
-    if test ! -d $srcdir/$d ; then
-      echo "*****"
-      echo "*===*"
-      echo "*=*=*" WARNING: Missing suggested package: $d
-      echo "*===*"
-      echo "*****"
-    fi
-  done
-fi
-
-
-AC_PROG_CC
-
-### build_subdirs is the list of directories we actually want to
-### build.  It's not equivalent to existingdirs: if we can't find the
-### Tcl libraries, then we don't want to build in gtcltk-lib.
-###
-### So why can't we just forget about gtcltk-lib altogether, and
-### delete it from existingdirs, in that case?  Well, in order for
-### 'make dist' to work, we still need to configure gtcltk-lib, and
-### the top-level Makefile needs to know it exists,
-build_subdirs="${existingdirs}"
-
-### Decide which directories to build; remove the ones we don't want
-### from build_subdirs.
-
-### On some systems, the Tcl library contains references to
-### functions in the dynamic linker library, -ldl, so we may need
-### to include that.
-AC_CHECK_LIB(dl, dlopen)
-
-### Use gtcltk-lib only if we seem to have Tcl installed on the
-### system.  We really should check for Tk as well, but that involves
-### finding all the X libraries that we need to do a complete link.
-AC_CHECK_LIB(tcl7.5, Tcl_CreateInterp, have_tcl=true, have_tcl=false, -lm)
-if $have_tcl; then :; else
-  build_subdirs="`echo $build_subdirs | sed s:gtcltk-lib::`"
-  req_subdirs="`echo $req_subdirs | sed s:gtcltk-lib::`"
-fi  
-
-### Write the list of survivors, the directories we do want to build,
-### to a file in the top level, so the subdirectories' configuration
-### scripts can find it.  We don't want to pass the list in the
-### environment, because the subdirectory configuration scripts can be
-### run on their own.
-echo "${build_subdirs}" > config.build-subdirs
-
 AC_SUBST(existingdirs)
-AC_SUBST(build_subdirs)
+AC_OUTPUT(Makefile doc/Makefile doc/guile-programmer/Makefile doc/guile-user/Makefile)
-AC_SUBST(GUILE_VERSION)
-AC_OUTPUT(Makefile doc/Makefile)

guile.m4

@@ -0,0 +1,13 @@
+## An m4 macro to initialize a guile module.
+## Enhance as required.
+
+dnl Usage: AM_INIT_GUILE_MODULE(module-name)
+dnl This macro will automatically get the guile version from the
+dnl top-level srcdir, and will initialize automake.  It also
+dnl defines the `module' variable.
+AC_DEFUN([AM_INIT_GUILE_MODULE],[
+. $srcdir/../GUILE-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_CONFIG_AUX_DIR(..)
+module=[$1]
+AC_SUBST(module)])

ice-9/ChangeLog

@@ -1,3 +1,9 @@
+Sat Nov 30 23:57:28 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* PLUGIN/greet, PLUGIN/split.sed, PLUGIN/this.configure: Removed.
+	* Makefile.am, aclocal.m4: New files.
+	* configure.in: Updated for Automake.
+
 Wed Nov 27 14:16:14 1996  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* boot-9.scm (macroexpand-1, macroexpand), slib.scm

ice-9/Makefile.am

@@ -0,0 +1,10 @@
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = foreign
+
+subpkgdatadir = $(pkgdatadir)/$(VERSION)/@module@
+subpkgdata_DATA = boot-9.scm debug.scm expect.scm hcons.scm lineio.scm \
+mapping.scm poe.scm slib.scm tags.scm threads.scm r4rs.scm
+
+## test.scm is not currently installed.
+EXTRA_DIST = PLUGIN/REQ $(subpkgdata_DATA) test.scm

ice-9/Makefile.in

@@ -1,103 +1,204 @@
-# 	Copyright (C) 1995 Free Software Foundation, Inc.
+# Makefile.in generated automatically by automake 1.1i from Makefile.am
-# 
+
-# This program is free software; you can redistribute it and/or modify
+# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
-# it under the terms of the GNU General Public License as published by
+# This Makefile.in is free software; the Free Software Foundation
-# the Free Software Foundation; either version 2, or (at your option)
+# gives unlimited permission to copy, distribute and modify it.
-# any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this software; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-# 
 
-
 
 SHELL = /bin/sh
 
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 prefix = @prefix@
+exec_prefix = @exec_prefix@
 
-VERSION=@GUILE_VERSION@
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 
-datadir=@datadir@
+pkgdatadir = $(datadir)/@PACKAGE@
-pkgdatadir=$(datadir)/guile
+pkglibdir = $(libdir)/@PACKAGE@
-pkgverdatadir=$(pkgdatadir)/$(VERSION)
+pkgincludedir = $(includedir)/@PACKAGE@
-subpkgdatadir=$(pkgverdatadir)/@library_name@
-sitedatadir=$(pkgdatadir)/site
 
-INSTALL = $(srcdir)/../install-sh -c
+top_builddir = .
-INSTALL_DATA = $(INSTALL) -m 644
 
-scm_files = \
+INSTALL = @INSTALL@
-	boot-9.scm \
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-	r4rs.scm \
+INSTALL_DATA = @INSTALL_DATA@
-	debug.scm \
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-	expect.scm \
+transform = @program_transform_name@
-	hcons.scm \
-	lineio.scm \
-	mapping.scm \
-	poe.scm \
-	slib.scm  \
-	tags.scm \
-	threads.scm \
-	test.scm
 
-aux_files = \
+AUTOMAKE_OPTIONS = foreign
-	.cvsignore \
+
-	COPYING \
+subpkgdatadir = $(pkgdatadir)/$(VERSION)/@module@
-	ChangeLog \
+subpkgdata_DATA = boot-9.scm debug.scm expect.scm hcons.scm lineio.scm \
-	Makefile.in \
+mapping.scm poe.scm slib.scm tags.scm threads.scm r4rs.scm
-	configure \
+
-	configure.in
+EXTRA_DIST = PLUGIN/REQ $(subpkgdata_DATA) test.scm
+ACLOCAL = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DATA =  $(subpkgdata_DATA)
+
+DIST_COMMON =  COPYING ChangeLog Makefile.am Makefile.in aclocal.m4 \
+configure configure.in
 
 
-all: 
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
 
-install: all
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
-	for dir in $(datadir) $(pkgdatadir) $(pkgverdatadir) \
+	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-	  $(subpkgdatadir) $(sitedatadir); do \
+
-	  test -d $$dir || mkdir $$dir; \
+TAR = tar
-	done
+default: all
-	for file in $(scm_files); do \
+
-	  $(INSTALL_DATA) $(srcdir)/$$file $(subpkgdatadir); \
+.SUFFIXES:
+$(srcdir)/aclocal.m4: configure.in
+	cd $(srcdir) && aclocal
+
+$(srcdir)/Makefile.in: Makefile.am configure.in
+	cd $(srcdir) && automake --strictness=foreign Makefile
+
+# For an explanation of the following Makefile rules, see node
+# `Automatic Remaking' in GNU Autoconf documentation.
+Makefile: $(srcdir)/Makefile.in config.status $(BUILT_SOURCES)
+	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+config.status: configure
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && autoconf
+
+install-subpkgdataDATA: $(subpkgdata_DATA)
+	$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(subpkgdatadir)
+	list="$(subpkgdata_DATA)"; for p in $$list; do \
+	  if test -f $(srcdir)/$$p; then \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(subpkgdatadir)/$$p; \
+	  else if test -f $$p; then \
+	    $(INSTALL_DATA) $$p $(subpkgdatadir)/$$p; \
+	  fi; fi; \
 	done
 
-uninstall: 
+uninstall-subpkgdataDATA:
-	for file in $(scm_files) ; do \
+	list="$(subpkgdata_DATA)"; for p in $$list; do \
-	  rm -f $(subpkgdatadir)/$$file;  \
+	  rm -f $(subpkgdatadir)/$$p; \
-	done;
-	-rmdir $(subpkgdatadir)
-	-rmdir $(pkgverdatadir)
-	-rmdir $(sitedatadir)
-	-rmdir $(pkgdatadir)
-	-rmdir $(datadir)
-
-
-# The `dist' target in the top-level Makefile uses this `dist-dir'
-# target to select the appropriate files for distribution from the
-# directory containing this Makefile.
-.PHONY: dist-dir
-dist-dir:
-	mkdir ${DISTDIR}
-	for f in ${scm_files} ${aux_files}; do \
-	  ln ${srcdir}/$$f ${DISTDIR}; \
 	done
-	mkdir ${DISTDIR}/PLUGIN
+tags: TAGS
-	for f in REQ greet split.sed this.configure; do \
+TAGS:
-	  ln ${srcdir}/PLUGIN/$$f ${DISTDIR}/PLUGIN; \
+
+
+distdir = $(PACKAGE)-$(VERSION)
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	rm -rf $(distdir)
+	$(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) \
+	  && $(MAKE) dvi \
+	  && $(MAKE) check \
+	  && $(MAKE) install \
+	  && $(MAKE) installcheck \
+	  && $(MAKE) dist
+	rm -rf $(distdir)
+	@echo "========================"; \
+	echo "$(distdir).tar.gz is ready for distribution"; \
+	echo "========================"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	$(TAR) chozf $(distdir).tar.gz $(distdir)
+	rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	$(TAR) chozf $(distdir).tar.gz $(distdir)
+	rm -rf $(distdir)
+distdir: $(DISTFILES)
+	rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 755 $(distdir)
+	here=`pwd`; distdir=`cd $(distdir) && pwd` \
+	  && cd $(srcdir) \
+	  && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --strictness=foreign
+	$(mkinstalldirs) $(distdir)/PLUGIN
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
+info:
+dvi:
+check: all
+	$(MAKE)
+installcheck:
+install-exec: 
+	$(NORMAL_INSTALL)
+
+install-data: install-subpkgdataDATA
+	$(NORMAL_INSTALL)
+
+install: install-exec install-data all
+	@:
+
+uninstall: uninstall-subpkgdataDATA
+
+all: $(DATA) Makefile
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+installdirs:
+	$(mkinstalldirs)  $(subpkgdatadir)
 
 
-clean:
+mostlyclean-generic:
+	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
-distclean:
+clean-generic:
-	-rm -f config.log config.status Makefile
+	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
-realclean:
+distclean-generic:
+	rm -f Makefile $(DISTCLEANFILES)
+	rm -f config.cache config.log stamp-h
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-generic
+
+clean:  clean-generic mostlyclean 
+
+distclean:  distclean-generic clean 
+	rm -f config.status
+
+maintainer-clean:  maintainer-clean-generic distclean 
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f config.status
+
+.PHONY: default uninstall-subpkgdataDATA install-subpkgdataDATA tags \
+distdir info dvi installcheck install-exec install-data install \
+uninstall all installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

ice-9/aclocal.m4

@@ -0,0 +1,64 @@
+dnl aclocal.m4 generated automatically by aclocal 1.1i
+
+
+dnl Usage: AM_INIT_GUILE_MODULE(module-name)
+dnl This macro will automatically get the guile version from the
+dnl top-level srcdir, and will initialize automake.  It also
+dnl defines the `module' variable.
+AC_DEFUN([AM_INIT_GUILE_MODULE],[
+. $srcdir/../GUILE-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_CONFIG_AUX_DIR(..)
+module=[$1]
+AC_SUBST(module)])
+
+# Do all the work for Automake.  This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version)
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AM_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+VERSION=[$2]
+AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AM_SANITY_CHECK
+AC_ARG_PROGRAM
+AC_PROG_MAKE_SET])
+
+
+# serial 1
+
+AC_DEFUN(AM_PROG_INSTALL,
+[AC_REQUIRE([AC_PROG_INSTALL])
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+AC_SUBST(INSTALL_SCRIPT)dnl
+])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+echo timestamp > conftestfile
+# Do this in a subshell so we don't clobber the current shell's
+# arguments.  FIXME: maybe try `-L' hack like GETLOADAVG test?
+if (set X `ls -t $srcdir/configure conftestfile`; test "[$]2" = conftestfile)
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+

ice-9/configure

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.10 
+# Generated automatically using autoconf version 2.12 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -49,6 +49,8 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
 
 ac_prev=
 for ac_option
@@ -330,7 +332,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.10"
+    echo "configure generated by autoconf version 2.12"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -432,11 +434,14 @@ do
 done
 
 # NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
+# Only set these to C if already set.  These must not be set unconditionally
-# These must not be set unconditionally because not all systems understand
+# because not all systems understand e.g. LANG=C (notably SCO).
-# e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+# Non-C LC_CTYPE values break the ctype check.
 if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h
@@ -498,6 +503,7 @@ ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -512,12 +518,184 @@ else
 fi
 
 
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:552: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      for ac_prog in ginstall installbsd scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    # OSF/1 installbsd also uses dspmsg, but is usable.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
 
 . $srcdir/../GUILE-VERSION
 
-. $srcdir/PLUGIN/this.configure
+PACKAGE=$PACKAGE
 
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
 
+VERSION=$VERSION
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
+echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+echo "configure:620: checking whether build environment is sane" >&5
+echo timestamp > conftestfile
+# Do this in a subshell so we don't clobber the current shell's
+# arguments.  FIXME: maybe try `-L' hack like GETLOADAVG test?
+if (set X `ls -t $srcdir/configure conftestfile`; test "$2" = conftestfile)
+then
+   # Ok.
+   :
+else
+   { echo "configure: error: newly created file is older than distributed files!
+Check your system clock" 1>&2; exit 1; }
+fi
+rm -f conftest*
+echo "$ac_t""yes" 1>&6
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:654: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftestmake <<\EOF
+all:
+	@echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SET_MAKE=
+else
+  echo "$ac_t""no" 1>&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+ac_aux_dir=
+for ac_dir in .. $srcdir/..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in .. $srcdir/.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+module=ice-9
 
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -536,11 +714,25 @@ cat > confcache <<\EOF
 # --recheck option to rerun configure.
 #
 EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+  case `(ac_space=' '; set) 2>&1` in
-  >> confcache
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
 if cmp -s $cache_file confcache; then
   :
 else
@@ -607,7 +799,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.10"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -616,6 +808,7 @@ do
 done
 
 ac_given_srcdir=$srcdir
+ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -647,26 +840,66 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@library_name@%$library_name%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@info_files@%$info_files%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@GUILE_VERSION@%$GUILE_VERSION%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+s%@PACKAGE@%$PACKAGE%g
+s%@VERSION@%$VERSION%g
+s%@SET_MAKE@%$SET_MAKE%g
+s%@module@%$module%g
 
 CEOF
 EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile]", defaulting infile="outfile.in".
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
   *) ac_file_in="${ac_file}.in" ;;
   esac
 
-  # Adjust relative srcdir, etc. for subdirectories.
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
 
   # Remove last slash and all that follows it.  Not all systems have dirname.
   ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
@@ -690,6 +923,11 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
     top_srcdir="$ac_dots$ac_given_srcdir" ;;
   esac
 
+  case "$ac_given_INSTALL" in
+  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+  esac
+
   echo creating "$ac_file"
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
@@ -698,15 +936,22 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 # $configure_input" ;;
   *) ac_comsub= ;;
   esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
   sed -e "$ac_comsub
 s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
+s%@INSTALL@%$INSTALL%g
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
 fi; done
-rm -f conftest.subs
+rm -f conftest.s*
 
+EOF
+cat >> $CONFIG_STATUS <<EOF
 
+EOF
+cat >> $CONFIG_STATUS <<\EOF
 
 exit 0
 EOF

ice-9/configure.in

@@ -3,11 +3,5 @@
 #
 
 AC_INIT(boot-9.scm)
-
+AM_INIT_GUILE_MODULE(ice-9)
-. $srcdir/../GUILE-VERSION
-
-. $srcdir/PLUGIN/this.configure
-AC_SUBST(library_name)
-AC_SUBST(info_files)
-AC_SUBST(GUILE_VERSION)
 AC_OUTPUT(Makefile)

libguile/ChangeLog

@@ -1,3 +1,12 @@
+Sun Dec  1 00:00:49 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* guile-snarf.sh: Removed.
+	* PLUGIN/guile.libs: Added dependency for -lm.
+	* acinclude.m4: Renamed from aclocal.m4.
+	* PLUGIN/greet: Removed.
+	* Makefile.am, aclocal.m4: New files.
+	* configure.in: Updated for Automake.
+
 Thu Nov 28 00:23:55 1996  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* eval.c (scm_definedp): Use top_level_lookup_closure_var

libguile/Makefile.am

@@ -0,0 +1,56 @@
+## Process this file with Automake to create Makefile.in
+
+AUTOMAKE_OPTIONS = foreign
+
+## Check for headers in $(srcdir)/.., so that #include
+## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
+## building.
+INCLUDES = -I.. -I$(srcdir)/..
+
+lib_LIBRARIES = libguile.a
+libguile_a_SOURCES = alist.c append.c appinit.c arbiters.c async.c \
+backtrace.c boolean.c chars.c continuations.c debug.c dynwind.c eq.c \
+error.c eval.c extchrs.c fdsocket.c feature.c filesys.c fports.c gc.c \
+gdbint.c genio.c gsubr.c hash.c hashtab.c inet_aton.c init.c ioext.c \
+kw.c list.c load.c mallocs.c markers.c mbstrings.c numbers.c objprop.c \
+options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c \
+read.c root.c scmsigs.c sequences.c simpos.c smob.c socket.c srcprop.c \
+stackchk.c stacks.c stime.c strerror.c strings.c strop.c strorder.c \
+strports.c struct.c symbols.c tag.c throw.c unif.c variable.c \
+vectors.c version.c vports.c weaks.c _scm.h
+
+include_HEADERS = libguile.h
+
+# These are headers visible as <libguile/mumble.h>.
+modincludedir = $(includedir)/@module@
+modinclude_HEADERS = __scm.h alist.h append.h arbiters.h async.h \
+backtrace.h boolean.h chars.h continuations.h debug.h dynwind.h eq.h \
+error.h eval.h extchrs.h fdsocket.h feature.h filesys.h fports.h gc.h \
+gdb_interface.h gdbint.h genio.h gsubr.h hash.h hashtab.h init.h ioext.h \
+kw.h list.h load.h mallocs.h markers.h mbstrings.h numbers.h objprop.h \
+options.h pairs.h ports.h posix.h print.h procprop.h procs.h ramap.h read.h \
+root.h scmhob.h scmsigs.h sequences.h simpos.h smob.h socket.h srcprop.h \
+stackchk.h stacks.h stime.h strings.h strop.h strorder.h strports.h struct.h \
+symbols.h tag.h tags.h throw.h unif.h variable.h vectors.h version.h \
+vports.h weaks.h snarf.h
+
+## This file is generated at configure time.
+modinclude_DATA = scmconfig.h
+
+EXTRA_DIST = gscm.c gscm.h ChangeLog-scm PLUGIN/REQ PLUGIN/guile.config \
+PLUGIN/guile.libs
+
+## FIXME: shouldn't directly generate file; instead generate temp file
+## and "mv".  Consider using timestamp file as well, to avoid
+## unnecessary rebuilds.
+libpath.h: Makefile
+	echo '/* generated by Makefile */' > libpath.h
+	echo '#define LIBRARY_PATH "$(pkgdatadir)/$(VERSION)"' >> libpath.h
+
+SUFFIXES = .x
+.c.x:
+	$(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) \
+	   -DSCM_MAGIC_SNARFER $< | grep "^%%%" | sed -e "s/^%%%//" > $@
+
+## Add -MG to make the .x magic work with auto-dep code.
+MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)

libguile/acconfig.h

@@ -73,3 +73,6 @@
 
 /* Define if using any sort of threads.  */
 #undef USE_THREADS
+
+/* Name of this package.  */
+#undef PACKAGE

libguile/aclocal.m4

@@ -1,3 +1,5 @@
+dnl aclocal.m4 generated automatically by aclocal 1.1i
+
 dnl  On the NeXT, #including <utime.h> doesn't give you a definition for
 dnl  struct utime, unless you #define _POSIX_SOURCE.
 
@@ -57,3 +59,182 @@ AC_DEFUN([GUILE_HEADER_LIBC_WITH_UNISTD],
     fi
   ]
 )
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+AC_DEFUN(AM_CONFIG_HEADER,
+[AC_PREREQ([2.12])
+AC_CONFIG_HEADER([$1])
+dnl When config.status generates a header, we must update the stamp-h file.
+dnl This file resides in the same directory as the config header
+dnl that is generated.  We must strip everything past the first ":",
+dnl and everything past the last "/".
+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+test -z "<<$>>CONFIG_HEADER" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl
+changequote([,]))])
+
+
+dnl Usage: AM_INIT_GUILE_MODULE(module-name)
+dnl This macro will automatically get the guile version from the
+dnl top-level srcdir, and will initialize automake.  It also
+dnl defines the `module' variable.
+AC_DEFUN([AM_INIT_GUILE_MODULE],[
+. $srcdir/../GUILE-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_CONFIG_AUX_DIR(..)
+module=[$1]
+AC_SUBST(module)])
+
+# Do all the work for Automake.  This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version)
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AM_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+VERSION=[$2]
+AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AM_SANITY_CHECK
+AC_ARG_PROGRAM
+AC_PROG_MAKE_SET])
+
+
+# serial 1
+
+AC_DEFUN(AM_PROG_INSTALL,
+[AC_REQUIRE([AC_PROG_INSTALL])
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+AC_SUBST(INSTALL_SCRIPT)dnl
+])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+echo timestamp > conftestfile
+# Do this in a subshell so we don't clobber the current shell's
+# arguments.  FIXME: maybe try `-L' hack like GETLOADAVG test?
+if (set X `ls -t $srcdir/configure conftestfile`; test "[$]2" = conftestfile)
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+dnl
+dnl CY_AC_WITH_THREADS determines which thread library the user intends
+dnl to put underneath guile.  Pass it the path to find the guile top-level
+dnl source directory.  Eg CY_AC_WITH_THREADS(../..) for tcl/unix.
+dnl
+
+AC_DEFUN([CY_AC_WITH_THREADS],[
+AC_CACHE_CHECK("threads package type",cy_cv_threads_package,[
+AC_CACHE_VAL(cy_cv_threads_cflags,[
+AC_CACHE_VAL(cy_cv_threads_libs,[
+use_threads=no;
+AC_ARG_WITH(threads,[  --with-threads          thread interface],
+            use_threads=$withval, use_threads=no)
+test -n "$use_threads" || use_threads=qt
+threads_package=unknown
+if test "$use_threads" != no; then
+dnl
+dnl Test for the qt threads package - used for cooperative threads
+dnl This may not necessarily be built yet - so just check for the
+dnl header files.
+dnl
+  if test "$use_threads" = yes || test "$use_threads" = qt; then
+     # Look for qt in source directory.  This is a hack: we look in
+     # "./qt" because this check might be run at the top level.
+     if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then
+	threads_package=COOP
+	cy_cv_threads_cflags="-I$srcdir/../qt -I../qt"
+	cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+     fi
+  else
+     if test -f $use_threads/qt.c; then
+	# FIXME seems as though we should try to use an installed qt here.
+	threads_package=COOP
+	cy_cv_threads_cflags="-I$use_threads -I../qt"
+	cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+     fi
+  fi
+  if test "$use_threads" = pthreads; then
+     # Look for pthreads in srcdir.  See above to understand why
+     # we always set threads_package.
+     if test -f $srcdir/../../pthreads/pthreads/queue.c \
+	  || test -f $srcdir/../pthreads/pthreads/queue.c; then
+	threads_package=MIT
+	cy_cv_threads_cflags="-I$srcdir/../../pthreads/include"
+	cy_cv_threads_libs="-L../../pthreads/lib -lpthread"
+     fi
+  fi
+  saved_CPP="$CPPFLAGS"
+  saved_LD="$LDFLAGS"
+  saved_LIBS="$LIBS"
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the FSU threads package
+dnl
+    CPPFLAGS="-I$use_threads/include"
+    LDFLAGS="-L$use_threads/lib"
+    LIBS="-lgthreads -lmalloc"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=FSU)
+  fi
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the MIT threads package
+dnl
+    LIBS="-lpthread"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=MIT)
+  fi
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the PCthreads package
+dnl
+    LIBS="-lpthreads"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=PCthreads)
+  fi
+dnl
+dnl Set the appropriate flags!
+dnl 
+  cy_cv_threads_cflags="$CPPFLAGS $cy_cv_threads_cflags"
+  cy_cv_threads_libs="$LDFLAGS $LIBS $cy_cv_threads_libs"
+  cy_cv_threads_package=$threads_package
+  CPPFLAGS="$saved_CPP"
+  LDFLAGS="$saved_LD"
+  LIBS="$saved_LIBS"
+  if test "$threads_package" = unknown; then
+    AC_MSG_ERROR("cannot find thread library installation")
+  fi
+fi
+])
+])
+],
+dnl
+dnl Set flags according to what is cached.
+dnl
+CPPFLAGS="$cy_cv_threads_cflags"
+LIBS="$cy_cv_threads_libs"
+)
+])
+

libguile/configure.in

@@ -1,7 +1,6 @@
 AC_INIT(eval.c)
-AC_CONFIG_HEADER(scmconfig.h)
+AM_CONFIG_HEADER(scmconfig.h)
-
+AM_INIT_GUILE_MODULE(libguile)
-. $srcdir/../GUILE-VERSION
 
 #--------------------------------------------------------------------
 #
@@ -19,9 +18,6 @@ fi
 
 #--------------------------------------------------------------------
 
-test -z "$CFLAGS" && CFLAGS=-g
-test -z "$LDFLAGS" && LDFLAGS=-g
-
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_RANLIB
@@ -30,9 +26,7 @@ AC_AIX
 AC_ISC_POSIX
 AC_MINIX
 
-builtin(sinclude, ../aclocal.m4)
 CY_AC_WITH_THREADS
-CFLAGS="$CPPFLAGS $CFLAGS"
 
 AC_C_CONST
 
@@ -203,14 +197,7 @@ AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, "$GUILE_MAJOR_VERSION")
 AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, "$GUILE_MINOR_VERSION")
 AC_DEFINE_UNQUOTED(GUILE_VERSION, "$GUILE_VERSION")
 
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(LIBOBJS)
 AC_SUBST(FD_SETTER)
-AC_SUBST(XINCLUDES)
-AC_SUBST(GUILE_MAJOR_VERSION)
-AC_SUBST(GUILE_MINOR_VERSION)
-AC_SUBST(GUILE_VERSION)
 AC_OUTPUT(Makefile fd.h)
 
 dnl Local Variables:

libguile/scmconfig.h.in

@@ -127,6 +127,9 @@
 /* Define if using any sort of threads.  */
 #undef USE_THREADS
 
+/* Name of this package.  */
+#undef PACKAGE
+
 /* Define if you have the ctermid function.  */
 #undef HAVE_CTERMID
 
@@ -139,6 +142,9 @@
 /* Define if you have the geteuid function.  */
 #undef HAVE_GETEUID
 
+/* Define if you have the inet_aton function.  */
+#undef HAVE_INET_ATON
+
 /* Define if you have the lstat function.  */
 #undef HAVE_LSTAT
 
@@ -181,6 +187,9 @@
 /* Define if you have the setsid function.  */
 #undef HAVE_SETSID
 
+/* Define if you have the strerror function.  */
+#undef HAVE_STRERROR
+
 /* Define if you have the strftime function.  */
 #undef HAVE_STRFTIME
 

qt/ChangeLog

@@ -1,3 +1,10 @@
+Sat Nov 30 23:59:06 1996  Tom Tromey  <tromey@cygnus.com>
+
+	* PLUGIN/greet: Removed.
+	* Makefile.am, md/Makefile.am, time/Makefile.am, aclocal.m4: New
+	files.
+	* configure.in: Updated for Automake.
+
 Sun Nov 10 17:40:47 1996  Jim Blandy  <jimb@floss.cyclic.com>
 
 	* configure.in, Makefile.in: The 'install' and 'uninstall'

qt/Makefile.am

@@ -0,0 +1,23 @@
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = foreign
+
+## subdirs are for making distributions only.
+SUBDIRS = md time
+
+lib_LIBRARIES = @target_libs@
+EXTRA_LIBRARIES = libqt.a
+
+libqt_a_SOURCES = qt.c copyright.h
+libqt_a_LIBADD = qtmds.o qtmdc.o
+
+qtmds.o: @qtmds_s@ 
+## FIXME use of -c with -o not portable.
+	$(COMPILE) -o qtmds.o @qtmds_s@
+
+qtmdc.o: @qtmdc_c@ @qtmd_h@
+## FIXME use of -c with -o not portable.
+	$(COMPILE) -o qtmdc.o @qtmdc_c@
+
+EXTRA_DIST = CHANGES README.MISC README.PORT b.h meas.c stp.c stp.h \
+PLUGIN/OPT Makefile.base config

qt/Makefile.in

@@ -1,131 +1,384 @@
-# Makefile for libqt
+# Makefile.in generated automatically by automake 1.1i from Makefile.am
-#
+
-# Copyright (C) 1996, Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
-# 
+# This Makefile.in is free software; the Free Software Foundation
-# This file is part of GNU GUILE.
+# gives unlimited permission to copy, distribute and modify it.
-# 
+
-# GNU GUILE is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-# 
-# GNU GUILE is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with GNU GUILE; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 SHELL = /bin/sh
+
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-
 prefix = @prefix@
-exec_prefix = $(prefix)
+exec_prefix = @exec_prefix@
-libdir = $(exec_prefix)/lib
+
-includedir = $(prefix)/include/threads
+bindir = @bindir@
-infodir = $(prefix)/info
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = .
 
-CC = @CC@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-
+INSTALL_DATA = @INSTALL_DATA@
-DEFS = @DEFS@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-LIBS = @LIBS@
+transform = @program_transform_name@
-
+host_triplet = @host@
-AR_FLAGS = rc
+host_alias = @host_alias@
+target_libs = @target_libs@
 RANLIB = @RANLIB@
+qtmdb_s = @qtmdb_s@
+qtmds_s = @qtmds_s@
+qtmdc_c = @qtmdc_c@
+qtmd_h = @qtmd_h@
+CC = @CC@
 
-CFLAGS = -g
+AUTOMAKE_OPTIONS = foreign
-XCFLAGS = $(CFLAGS) -I. 
-LDFLAGS = -g
 
-#### End of system configuration section. ####
+SUBDIRS = md time
 
-distfiles = .cvsignore CHANGES ChangeLog INSTALL Makefile.base \
+lib_LIBRARIES = @target_libs@
-	Makefile.in README README.MISC README.PORT b.h config configure \
+EXTRA_LIBRARIES = libqt.a
-	configure.in copyright.h meas.c qt.c qt.h.in stp.c stp.h
-plugin_distfiles = OPT greet
-md_distfiles = \
-	default.Makefile null.README null.c \
-	axp.1.Makefile axp.2.Makefile axp.Makefile axp.README axp.c \
-		axp.h axp.s axp_b.s \
-	hppa-cnx.Makefile hppa.Makefile hppa.h hppa.s hppa_b.s \
-	i386.README i386.h i386.s i386_b.s \
-	ksr1.Makefile ksr1.h ksr1.s ksr1_b.s \
-	m88k.Makefile m88k.c m88k.h m88k.s m88k_b.s \
-	mips-irix5.s mips.h mips.s mips_b.s \
-	solaris.README sparc.h sparc.s sparc_b.s _sparc.s _sparc_b.s \
-	vax.h vax.s vax_b.s
-time_distfiles = README.time assim cswap go init prim raw
 
-all_objs= qt.o qtmds.o qtmdc.o
+libqt_a_SOURCES = qt.c copyright.h
+libqt_a_LIBADD = qtmds.o qtmdc.o
 
-all: @target_all@
+EXTRA_DIST = CHANGES README.MISC README.PORT b.h meas.c stp.c stp.h \
+PLUGIN/OPT Makefile.base config
+ACLOCAL = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_CLEAN_FILES =  qt.h
+LIBRARIES =  $(lib_LIBRARIES)
 
-libqt.a: $(all_objs)
+
-	$(AR) $(AR_FLAGS) libqt.a $(all_objs)
+DEFS = @DEFS@ -I. -I$(srcdir) 
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+libqt_a_DEPENDENCIES =  qtmds.o qtmdc.o
+libqt_a_OBJECTS =  qt.o
+AR = ar
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(CC) $(LDFLAGS) -o $@
+DIST_COMMON =  README ChangeLog INSTALL Makefile.am Makefile.in README \
+aclocal.m4 configure configure.in qt.h.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
+	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
+
+TAR = tar
+DEP_FILES =  .deps/qt.P
+SOURCES = $(libqt_a_SOURCES)
+OBJECTS = $(libqt_a_OBJECTS)
+
+default: all
+
+.SUFFIXES:
+.SUFFIXES: .c .o
+$(srcdir)/aclocal.m4: configure.in
+	cd $(srcdir) && aclocal
+
+$(srcdir)/Makefile.in: Makefile.am configure.in
+	cd $(srcdir) && automake --strictness=foreign Makefile
+
+# For an explanation of the following Makefile rules, see node
+# `Automatic Remaking' in GNU Autoconf documentation.
+Makefile: $(srcdir)/Makefile.in config.status $(BUILT_SOURCES)
+	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+config.status: configure
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: configure.in $(ACLOCAL) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && autoconf
+qt.h: $(top_builddir)/config.status qt.h.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
+
+mostlyclean-libLIBRARIES:
+
+clean-libLIBRARIES:
+	test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+
+distclean-libLIBRARIES:
+
+maintainer-clean-libLIBRARIES:
+
+install-libLIBRARIES: $(lib_LIBRARIES)
+	$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(libdir)
+	list="$(lib_LIBRARIES)"; for p in $$list; do \
+	  if test -f $$p; then \
+	    $(INSTALL_DATA) $$p $(libdir)/$$p; \
+	  else :; fi; \
+	done
+	$(POST_INSTALL)
+	list="$(lib_LIBRARIES)"; for p in $$list; do \
+	  if test -f $$p; then \
+	    $(RANLIB) $(libdir)/$$p; \
+	  else :; fi; \
+	done
+
+uninstall-libLIBRARIES:
+	list="$(lib_LIBRARIES)"; for p in $$list; do \
+	  rm -f $(libdir)/$$p; \
+	done
+
+.c.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	rm -f *.o core
+
+clean-compile:
+
+distclean-compile:
+	rm -f *.tab.c
+
+maintainer-clean-compile:
+
+libqt.a: $(libqt_a_OBJECTS) $(libqt_a_DEPENDENCIES)
+	rm -f libqt.a
+	$(AR) cru libqt.a $(libqt_a_OBJECTS) $(libqt_a_LIBADD)
 	$(RANLIB) libqt.a
 
-# The `dist' target in the top-level Makefile uses this `dist-dir'
+# This directory's subdirectories are mostly independent; you can cd
-# target to select the appropriate files for distribution from the
+# into them and run `make' without going through this Makefile.
-# directory containing this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
-.PHONY: dist-dir
+# (1) if the variable is set in `config.status', edit `config.status'
-dist-dir:
+#     (which will cause the Makefiles to be regenerated when you run `make');
-	mkdir ${DISTDIR}
+# (2) otherwise, pass the desired values on the `make' command line.
-	for f in ${distfiles}; do \
+
-	  ln ${srcdir}/$$f ${DISTDIR}; \
+@SET_MAKE@
-	done
+
-	mkdir ${DISTDIR}/PLUGIN
+all-recursive install-data-recursive install-exec-recursive \
-	for f in ${plugin_distfiles}; do \
+installdirs-recursive install-recursive uninstall-recursive  \
-	  ln ${srcdir}/PLUGIN/$$f ${DISTDIR}/PLUGIN; \
+check-recursive installcheck-recursive info-recursive dvi-recursive \
-	done
+mostlyclean-recursive clean-recursive distclean-recursive \
-	mkdir ${DISTDIR}/md
+maintainer-clean-recursive:
-	for f in ${md_distfiles}; do \
+	for subdir in $(SUBDIRS); do		\
-	  ln ${srcdir}/md/$$f ${DISTDIR}/md; \
+	  target=`echo $@ | sed s/-recursive//`; \
-	done
+	  (cd $$subdir && $(MAKE) $$target)	\
-	mkdir ${DISTDIR}/time
+	   || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
-	for f in ${time_distfiles}; do \
+	done && test -z "$$fail"
-	  ln ${srcdir}/time/$$f ${DISTDIR}/time; \
+tags-recursive:
+	list="$(SUBDIRS)"; for subdir in $$list; do \
+	  (cd $$subdir && $(MAKE) tags); \
 	done
 
+tags: TAGS
 
-install: @target_install@
+ID: $(HEADERS) $(SOURCES)
-install_qt: all
+	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
-	test -d $(prefix) || mkdir $(prefix)
-	test -d $(libdir) || mkdir $(libdir)
-	$(INSTALL) libqt.a $(libdir)/libqt.a
-	$(RANLIB) $(libdir)/libqt.a
-	$(INSTALL) $(srcdir)/qt.h $(includedir); 
 
-uninstall: @target_uninstall@
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
-uninstall_qt:
+	tags=; \
-	-rm -f $(libdir)/libqt.a
+	here=`pwd`; \
-	-rm -f $(includedir)/qt.h
+	list="$(SUBDIRS)"; for subdir in $$list; do \
+	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+	done; \
+	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
+	  || cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS
 
-info:
+mostlyclean-tags:
 
-clean:
+clean-tags:
-	-rm -f guile
-	-rm -f $(all_objs)
 
-distclean: clean
+distclean-tags:
-	-rm -f config.cache
+	rm -f TAGS ID
-	-rm -f config.log
-	-rm -f config.status
 
-realclean: distclean
+maintainer-clean-tags:
 
-###
+distdir = $(PACKAGE)-$(VERSION)
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	rm -rf $(distdir)
+	$(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) \
+	  && $(MAKE) dvi \
+	  && $(MAKE) check \
+	  && $(MAKE) install \
+	  && $(MAKE) installcheck \
+	  && $(MAKE) dist
+	rm -rf $(distdir)
+	@echo "========================"; \
+	echo "$(distdir).tar.gz is ready for distribution"; \
+	echo "========================"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	$(TAR) chozf $(distdir).tar.gz $(distdir)
+	rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	$(TAR) chozf $(distdir).tar.gz $(distdir)
+	rm -rf $(distdir)
+distdir: $(DISTFILES)
+	rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 755 $(distdir)
+	here=`pwd`; distdir=`cd $(distdir) && pwd` \
+	  && cd $(srcdir) \
+	  && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --strictness=foreign
+	$(mkinstalldirs) $(distdir)/PLUGIN
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+	for subdir in $(SUBDIRS); do		\
+	  test -d $(distdir)/$$subdir		\
+	  || mkdir $(distdir)/$$subdir		\
+	  || exit 1;				\
+	  chmod 755 $(distdir)/$$subdir;	\
+	  (cd $$subdir && $(MAKE) distdir=../$(distdir)/$$subdir distdir) \
+	    || exit 1; \
+	done
+
+MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+
+-include .deps/.P
+.deps/.P:
+	test -d .deps || mkdir .deps
+	echo > $@
+
+-include $(DEP_FILES)
+$(DEP_FILES): .deps/.P
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+
+maintainer-clean-depend:
+	rm -rf .deps
+
+.deps/%.P: $(srcdir)/%.c
+	@echo "Computing dependencies for $<..."
+	@$(MKDEP) $< > $@-tmp
+	@if test -n "$o"; then			\
+	  sed 's/\.o:/$$o:/' $@-tmp > $@;	\
+	  rm $@-tmp;				\
+	else					\
+	  mv $@-tmp $@;				\
+	fi
+info: info-recursive
+dvi: dvi-recursive
+check: all-am
+	$(MAKE) check-recursive
+installcheck: installcheck-recursive
+all-am: $(LIBRARIES) Makefile
+
+install-exec-am: install-libLIBRARIES
+
+uninstall-am: uninstall-libLIBRARIES
+
+install-exec: install-exec-recursive install-exec-am
+	$(NORMAL_INSTALL)
+
+install-data: install-data-recursive
+	$(NORMAL_INSTALL)
+
+install: install-recursive install-exec-am
+	@:
+
+uninstall: uninstall-recursive uninstall-am
+
+all: all-recursive all-am
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+installdirs: installdirs-recursive
+	$(mkinstalldirs)  $(libdir)
+
+
+mostlyclean-generic:
+	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	rm -f Makefile $(DISTCLEANFILES)
+	rm -f config.cache config.log stamp-h
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean-am:  mostlyclean-libLIBRARIES mostlyclean-compile \
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
+
+clean-am:  clean-libLIBRARIES clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am 
+
+distclean-am:  distclean-libLIBRARIES distclean-compile distclean-tags \
+		distclean-depend distclean-generic clean-am 
+
+maintainer-clean-am:  maintainer-clean-libLIBRARIES \
+		maintainer-clean-compile maintainer-clean-tags \
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am 
+
+mostlyclean:  mostlyclean-am mostlyclean-recursive
+
+clean:  clean-am clean-recursive
+
+distclean:  distclean-am distclean-recursive
+	rm -f config.status
+
+maintainer-clean:  maintainer-clean-am maintainer-clean-recursive
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f config.status
+
+.PHONY: default mostlyclean-libLIBRARIES distclean-libLIBRARIES \
+clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \
+install-libLIBRARIES mostlyclean-compile distclean-compile \
+clean-compile maintainer-clean-compile install-data-recursive \
+uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info dvi installcheck all-am install-exec-am \
+uninstall-am install-exec install-data install uninstall all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-qt.o: $(srcdir)/qt.c @qtmd_h@ qt.h $(srcdir)/copyright.h
-	$(CC) -o qt.o -c $(CPPFLAGS) $(DEFS) $(XCFLAGS) -I$(srcdir) $(srcdir)/qt.c
 
 qtmds.o: @qtmds_s@ 
-	$(CC) -o qtmds.o -c $(CPPFLAGS) $(DEFS) $(XCFLAGS) -I$(srcdir) @qtmds_s@
+	$(COMPILE) -o qtmds.o @qtmds_s@
 
 qtmdc.o: @qtmdc_c@ @qtmd_h@
-	$(CC) -o qtmdc.o -c $(CPPFLAGS) $(DEFS) $(XCFLAGS) -I$(srcdir) @qtmdc_c@
+	$(COMPILE) -o qtmdc.o @qtmdc_c@
 
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

qt/aclocal.m4

@@ -0,0 +1,167 @@
+dnl aclocal.m4 generated automatically by aclocal 1.1i
+
+
+dnl Usage: AM_INIT_GUILE_MODULE(module-name)
+dnl This macro will automatically get the guile version from the
+dnl top-level srcdir, and will initialize automake.  It also
+dnl defines the `module' variable.
+AC_DEFUN([AM_INIT_GUILE_MODULE],[
+. $srcdir/../GUILE-VERSION
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AC_CONFIG_AUX_DIR(..)
+module=[$1]
+AC_SUBST(module)])
+
+# Do all the work for Automake.  This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version)
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AM_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+VERSION=[$2]
+AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AM_SANITY_CHECK
+AC_ARG_PROGRAM
+AC_PROG_MAKE_SET])
+
+
+# serial 1
+
+AC_DEFUN(AM_PROG_INSTALL,
+[AC_REQUIRE([AC_PROG_INSTALL])
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+AC_SUBST(INSTALL_SCRIPT)dnl
+])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN(AM_SANITY_CHECK,
+[AC_MSG_CHECKING([whether build environment is sane])
+echo timestamp > conftestfile
+# Do this in a subshell so we don't clobber the current shell's
+# arguments.  FIXME: maybe try `-L' hack like GETLOADAVG test?
+if (set X `ls -t $srcdir/configure conftestfile`; test "[$]2" = conftestfile)
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+dnl
+dnl CY_AC_WITH_THREADS determines which thread library the user intends
+dnl to put underneath guile.  Pass it the path to find the guile top-level
+dnl source directory.  Eg CY_AC_WITH_THREADS(../..) for tcl/unix.
+dnl
+
+AC_DEFUN([CY_AC_WITH_THREADS],[
+AC_CACHE_CHECK("threads package type",cy_cv_threads_package,[
+AC_CACHE_VAL(cy_cv_threads_cflags,[
+AC_CACHE_VAL(cy_cv_threads_libs,[
+use_threads=no;
+AC_ARG_WITH(threads,[  --with-threads          thread interface],
+            use_threads=$withval, use_threads=no)
+test -n "$use_threads" || use_threads=qt
+threads_package=unknown
+if test "$use_threads" != no; then
+dnl
+dnl Test for the qt threads package - used for cooperative threads
+dnl This may not necessarily be built yet - so just check for the
+dnl header files.
+dnl
+  if test "$use_threads" = yes || test "$use_threads" = qt; then
+     # Look for qt in source directory.  This is a hack: we look in
+     # "./qt" because this check might be run at the top level.
+     if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then
+	threads_package=COOP
+	cy_cv_threads_cflags="-I$srcdir/../qt -I../qt"
+	cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+     fi
+  else
+     if test -f $use_threads/qt.c; then
+	# FIXME seems as though we should try to use an installed qt here.
+	threads_package=COOP
+	cy_cv_threads_cflags="-I$use_threads -I../qt"
+	cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+     fi
+  fi
+  if test "$use_threads" = pthreads; then
+     # Look for pthreads in srcdir.  See above to understand why
+     # we always set threads_package.
+     if test -f $srcdir/../../pthreads/pthreads/queue.c \
+	  || test -f $srcdir/../pthreads/pthreads/queue.c; then
+	threads_package=MIT
+	cy_cv_threads_cflags="-I$srcdir/../../pthreads/include"
+	cy_cv_threads_libs="-L../../pthreads/lib -lpthread"
+     fi
+  fi
+  saved_CPP="$CPPFLAGS"
+  saved_LD="$LDFLAGS"
+  saved_LIBS="$LIBS"
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the FSU threads package
+dnl
+    CPPFLAGS="-I$use_threads/include"
+    LDFLAGS="-L$use_threads/lib"
+    LIBS="-lgthreads -lmalloc"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=FSU)
+  fi
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the MIT threads package
+dnl
+    LIBS="-lpthread"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=MIT)
+  fi
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the PCthreads package
+dnl
+    LIBS="-lpthreads"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=PCthreads)
+  fi
+dnl
+dnl Set the appropriate flags!
+dnl 
+  cy_cv_threads_cflags="$CPPFLAGS $cy_cv_threads_cflags"
+  cy_cv_threads_libs="$LDFLAGS $LIBS $cy_cv_threads_libs"
+  cy_cv_threads_package=$threads_package
+  CPPFLAGS="$saved_CPP"
+  LDFLAGS="$saved_LD"
+  LIBS="$saved_LIBS"
+  if test "$threads_package" = unknown; then
+    AC_MSG_ERROR("cannot find thread library installation")
+  fi
+fi
+])
+])
+],
+dnl
+dnl Set flags according to what is cached.
+dnl
+CPPFLAGS="$cy_cv_threads_cflags"
+LIBS="$cy_cv_threads_libs"
+)
+])
+

qt/configure

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.10 
+# Generated automatically using autoconf version 2.12 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -51,6 +51,8 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
 
 ac_prev=
 for ac_option
@@ -332,7 +334,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.10"
+    echo "configure generated by autoconf version 2.12"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -434,11 +436,14 @@ do
 done
 
 # NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
+# Only set these to C if already set.  These must not be set unconditionally
-# These must not be set unconditionally because not all systems understand
+# because not all systems understand e.g. LANG=C (notably SCO).
-# e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+# Non-C LC_CTYPE values break the ctype check.
 if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h
@@ -500,6 +505,7 @@ ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -514,10 +520,190 @@ else
 fi
 
 
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+echo "configure:554: checking for a BSD compatible install" >&5
+if test -z "$INSTALL"; then
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      for ac_prog in ginstall installbsd scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+	  if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    # OSF/1 installbsd also uses dspmsg, but is usable.
+	    :
+	  else
+	    ac_cv_path_install="$ac_dir/$ac_prog -c"
+	    break 2
+	  fi
+	fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+
+. $srcdir/../GUILE-VERSION
+
+PACKAGE=$PACKAGE
+
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+VERSION=$VERSION
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
+echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
+echo "configure:622: checking whether build environment is sane" >&5
+echo timestamp > conftestfile
+# Do this in a subshell so we don't clobber the current shell's
+# arguments.  FIXME: maybe try `-L' hack like GETLOADAVG test?
+if (set X `ls -t $srcdir/configure conftestfile`; test "$2" = conftestfile)
+then
+   # Ok.
+   :
+else
+   { echo "configure: error: newly created file is older than distributed files!
+Check your system clock" 1>&2; exit 1; }
+fi
+rm -f conftest*
+echo "$ac_t""yes" 1>&6
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:656: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftestmake <<\EOF
+all:
+	@echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SET_MAKE=
+else
+  echo "$ac_t""no" 1>&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+ac_aux_dir=
+for ac_dir in .. $srcdir/..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in .. $srcdir/.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+module=qt
+
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:707: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -546,6 +732,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:736: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -592,7 +779,47 @@ fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:784: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext <<EOF
+#line 794 "configure"
+#include "confdefs.h"
+main(){return(0);}
+EOF
+if { (eval echo configure:798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  ac_cv_prog_cc_works=yes
+  # If we can't run a trivial program, we are probably using a cross compiler.
+  if (./conftest; exit) 2>/dev/null; then
+    ac_cv_prog_cc_cross=no
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+
+echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+if test $ac_cv_prog_cc_works = no; then
+  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+fi
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:818: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
+
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:823: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -601,7 +828,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -609,29 +836,34 @@ fi
 fi
 
 echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-  if test "${CFLAGS+set}" != set; then
+  ac_test_CFLAGS="${CFLAGS+set}"
+  ac_save_CFLAGS="$CFLAGS"
+  CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
+echo "configure:847: checking whether ${CC-cc} accepts -g" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_gcc_g=yes
+  ac_cv_prog_cc_g=yes
 else
-  ac_cv_prog_gcc_g=no
+  ac_cv_prog_cc_g=no
 fi
 rm -f conftest*
 
 fi
 
-echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-    if test $ac_cv_prog_gcc_g = yes; then
+  if test "$ac_test_CFLAGS" = set; then
-      CFLAGS="-g -O"
+    CFLAGS="$ac_save_CFLAGS"
+  elif test $ac_cv_prog_cc_g = yes; then
+    CFLAGS="-g -O2"
   else
-      CFLAGS="-O"
+    CFLAGS="-O2"
-    fi
   fi
 else
   GCC=
@@ -639,6 +871,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:875: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -653,33 +886,37 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 657 "configure"
+#line 890 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 else
   echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 672 "configure"
+#line 907 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 else
   echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   CPP=/lib/cpp
 fi
@@ -694,87 +931,10 @@ else
 fi
 echo "$ac_t""$CPP" 1>&6
 
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_ifs"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:938: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -801,32 +961,9 @@ else
 fi
 
 
-# Tell configure where to find config.guess
-ac_aux_dir=
-for ac_dir in .. $srcdir/..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in .. $srcdir/.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
- #`cd $srcdir; pwd`/..)
-
-
-
-
 
 echo $ac_n "checking "threads package type"""... $ac_c" 1>&6
+echo "configure:967: checking "threads package type"" >&5
 if eval "test \"`echo '$''{'cy_cv_threads_package'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -885,62 +1022,65 @@ if test "$use_threads" != no; then
     LDFLAGS="-L$use_threads/lib"
     LIBS="-lgthreads -lmalloc"
     cat > conftest.$ac_ext <<EOF
-#line 889 "configure"
+#line 1026 "configure"
 #include "confdefs.h"
 #include <pthread.h>
-int main() { return 0; }
+int main() {
-int t() {
 
 pthread_equal(NULL,NULL);
 
 ; return 0; }
 EOF
-if { (eval echo configure:899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   threads_package=FSU
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-
   fi
   if test "$threads_package" = unknown; then
     LIBS="-lpthread"
     cat > conftest.$ac_ext <<EOF
-#line 909 "configure"
+#line 1047 "configure"
 #include "confdefs.h"
 #include <pthread.h>
-int main() { return 0; }
+int main() {
-int t() {
 
 pthread_equal(NULL,NULL);
 
 ; return 0; }
 EOF
-if { (eval echo configure:919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   threads_package=MIT
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-
   fi
   if test "$threads_package" = unknown; then
     LIBS="-lpthreads"
     cat > conftest.$ac_ext <<EOF
-#line 929 "configure"
+#line 1068 "configure"
 #include "confdefs.h"
 #include <pthread.h>
-int main() { return 0; }
+int main() {
-int t() {
 
 pthread_equal(NULL,NULL);
 
 ; return 0; }
 EOF
-if { (eval echo configure:939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   threads_package=PCthreads
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-
   fi
   cy_cv_threads_cflags="$CPPFLAGS $cy_cv_threads_cflags"
   cy_cv_threads_libs="$LDFLAGS $LIBS $cy_cv_threads_libs"
@@ -977,6 +1117,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:1121: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -991,9 +1132,9 @@ NONE)
 esac
 
 host=`$ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 
@@ -1035,13 +1176,9 @@ esac
 
 
 if $threads_enabled; then
-	target_all=libqt.a
+   target_libs=libqt.a
-	target_install=install_qt
-	target_uninstall=uninstall_qt
 else
-	target_all=''	
+   target_libs=
-	target_install=''
-	target_uninstall=''
 fi
 
 
@@ -1050,8 +1187,6 @@ fi
 
 
 
-
-
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1069,11 +1204,25 @@ cat > confcache <<\EOF
 # --recheck option to rerun configure.
 #
 EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+  case `(ac_space=' '; set) 2>&1` in
-  >> confcache
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
 if cmp -s $cache_file confcache; then
   :
 else
@@ -1140,7 +1289,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.10"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -1151,7 +1300,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile qt.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile qt.h md/Makefile time/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1181,19 +1330,22 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@CC@%$CC%g
-s%@CPP@%$CPP%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+s%@PACKAGE@%$PACKAGE%g
+s%@VERSION@%$VERSION%g
+s%@SET_MAKE@%$SET_MAKE%g
+s%@module@%$module%g
+s%@CC@%$CC%g
+s%@CPP@%$CPP%g
 s%@RANLIB@%$RANLIB%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@target_all@%$target_all%g
+s%@target_libs@%$target_libs%g
-s%@target_install@%$target_install%g
-s%@target_uninstall@%$target_uninstall%g
 s%@qtmd_h@%$qtmd_h%g
 s%@qtmdc_c@%$qtmdc_c%g
 s%@qtmds_s@%$qtmds_s%g
@@ -1201,20 +1353,56 @@ s%@qtmdb_s@%$qtmdb_s%g
 
 CEOF
 EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile qt.h"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile qt.h md/Makefile time/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile]", defaulting infile="outfile.in".
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
   *) ac_file_in="${ac_file}.in" ;;
   esac
 
-  # Adjust relative srcdir, etc. for subdirectories.
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
 
   # Remove last slash and all that follows it.  Not all systems have dirname.
   ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
@@ -1242,6 +1430,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
   [/$]*) INSTALL="$ac_given_INSTALL" ;;
   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
   esac
+
   echo creating "$ac_file"
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
@@ -1250,16 +1439,22 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 # $configure_input" ;;
   *) ac_comsub= ;;
   esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
   sed -e "$ac_comsub
 s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
 s%@INSTALL@%$INSTALL%g
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
 fi; done
-rm -f conftest.subs
+rm -f conftest.s*
 
+EOF
+cat >> $CONFIG_STATUS <<EOF
 
+EOF
+cat >> $CONFIG_STATUS <<\EOF
 
 exit 0
 EOF

qt/configure.in

@@ -1,15 +1,11 @@
 AC_INIT(qt.c)
+AM_INIT_GUILE_MODULE(qt)
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_INSTALL
 AC_PROG_RANLIB
 
-# Tell configure where to find config.guess
-AC_CONFIG_AUX_DIR(..) #`cd $srcdir; pwd`/..)
-
-builtin(sinclude, ../aclocal.m4)
 CY_AC_WITH_THREADS
 
 threads_enabled=false
@@ -58,21 +54,15 @@ esac
 
 
 if $threads_enabled; then
-	target_all=libqt.a
+   target_libs=libqt.a
-	target_install=install_qt
-	target_uninstall=uninstall_qt
 else
-	target_all=''	
+   target_libs=
-	target_install=''
-	target_uninstall=''
 fi
 
-AC_SUBST(target_all)
+AC_SUBST(target_libs)
-AC_SUBST(target_install)
-AC_SUBST(target_uninstall)
 AC_SUBST(qtmd_h)
 AC_SUBST(qtmdc_c)
 AC_SUBST(qtmds_s)
 AC_SUBST(qtmdb_s)
 
-AC_OUTPUT(Makefile qt.h)
+AC_OUTPUT(Makefile qt.h md/Makefile time/Makefile)

qt/md/Makefile.am

@@ -0,0 +1,11 @@
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = _sparc.s _sparc_b.s axp.1.Makefile axp.2.Makefile \
+axp.Makefile axp.README axp.c axp.h axp.s axp_b.s default.Makefile \
+hppa-cnx.Makefile hppa.Makefile hppa.h hppa.s hppa_b.s i386.README \
+i386.h i386.s i386_b.s ksr1.Makefile ksr1.h ksr1.s ksr1_b.s \
+m88k.Makefile m88k.c m88k.h m88k.s m88k_b.s mips-irix5.s mips.h mips.s \
+mips_b.s null.README null.c solaris.README sparc.h sparc.s sparc_b.s \
+vax.h vax.s vax_b.s

qt/md/Makefile.in

@@ -0,0 +1,151 @@
+# Makefile.in generated automatically by automake 1.1i from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+host_triplet = @host@
+host_alias = @host_alias@
+target_libs = @target_libs@
+RANLIB = @RANLIB@
+qtmdb_s = @qtmdb_s@
+qtmds_s = @qtmds_s@
+qtmdc_c = @qtmdc_c@
+qtmd_h = @qtmd_h@
+CC = @CC@
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = _sparc.s _sparc_b.s axp.1.Makefile axp.2.Makefile \
+axp.Makefile axp.README axp.c axp.h axp.s axp_b.s default.Makefile \
+hppa-cnx.Makefile hppa.Makefile hppa.h hppa.s hppa_b.s i386.README \
+i386.h i386.s i386_b.s ksr1.Makefile ksr1.h ksr1.s ksr1_b.s \
+m88k.Makefile m88k.c m88k.h m88k.s m88k_b.s mips-irix5.s mips.h mips.s \
+mips_b.s null.README null.c solaris.README sparc.h sparc.s sparc_b.s \
+vax.h vax.s vax_b.s
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
+	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
+
+TAR = tar
+default: all
+
+.SUFFIXES:
+
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in
+	cd $(top_srcdir) && automake --strictness=foreign $(subdir)/Makefile
+
+Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = md
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+info:
+dvi:
+check: all
+	$(MAKE)
+installcheck:
+install-exec: 
+	$(NORMAL_INSTALL)
+
+install-data: 
+	$(NORMAL_INSTALL)
+
+install: install-exec install-data all
+	@:
+
+uninstall: 
+
+all: Makefile
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+installdirs:
+
+
+mostlyclean-generic:
+	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	rm -f Makefile $(DISTCLEANFILES)
+	rm -f config.cache config.log stamp-h
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-generic
+
+clean:  clean-generic mostlyclean 
+
+distclean:  distclean-generic clean 
+	rm -f config.status
+
+maintainer-clean:  maintainer-clean-generic distclean 
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+.PHONY: default tags distdir info dvi installcheck install-exec \
+install-data install uninstall all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

qt/time/Makefile.am

@@ -0,0 +1,5 @@
+## Process this file with automake to produce Makefile.in.
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = README.time assim cswap go init prim raw

qt/time/Makefile.in

@@ -0,0 +1,145 @@
+# Makefile.in generated automatically by automake 1.1i from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+host_triplet = @host@
+host_alias = @host_alias@
+target_libs = @target_libs@
+RANLIB = @RANLIB@
+qtmdb_s = @qtmdb_s@
+qtmds_s = @qtmds_s@
+qtmdc_c = @qtmdc_c@
+qtmd_h = @qtmd_h@
+CC = @CC@
+
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = README.time assim cswap go init prim raw
+mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
+	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
+
+TAR = tar
+default: all
+
+.SUFFIXES:
+
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in
+	cd $(top_srcdir) && automake --strictness=foreign $(subdir)/Makefile
+
+Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = time
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+info:
+dvi:
+check: all
+	$(MAKE)
+installcheck:
+install-exec: 
+	$(NORMAL_INSTALL)
+
+install-data: 
+	$(NORMAL_INSTALL)
+
+install: install-exec install-data all
+	@:
+
+uninstall: 
+
+all: Makefile
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+installdirs:
+
+
+mostlyclean-generic:
+	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	rm -f Makefile $(DISTCLEANFILES)
+	rm -f config.cache config.log stamp-h
+	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-generic
+
+clean:  clean-generic mostlyclean 
+
+distclean:  distclean-generic clean 
+	rm -f config.status
+
+maintainer-clean:  maintainer-clean-generic distclean 
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+.PHONY: default tags distdir info dvi installcheck install-exec \
+install-data install uninstall all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

threads.m4

@@ -0,0 +1,102 @@
+dnl
+dnl CY_AC_WITH_THREADS determines which thread library the user intends
+dnl to put underneath guile.  Pass it the path to find the guile top-level
+dnl source directory.  Eg CY_AC_WITH_THREADS(../..) for tcl/unix.
+dnl
+
+AC_DEFUN([CY_AC_WITH_THREADS],[
+AC_CACHE_CHECK("threads package type",cy_cv_threads_package,[
+AC_CACHE_VAL(cy_cv_threads_cflags,[
+AC_CACHE_VAL(cy_cv_threads_libs,[
+use_threads=no;
+AC_ARG_WITH(threads,[  --with-threads          thread interface],
+            use_threads=$withval, use_threads=no)
+test -n "$use_threads" || use_threads=qt
+threads_package=unknown
+if test "$use_threads" != no; then
+dnl
+dnl Test for the qt threads package - used for cooperative threads
+dnl This may not necessarily be built yet - so just check for the
+dnl header files.
+dnl
+  if test "$use_threads" = yes || test "$use_threads" = qt; then
+     # Look for qt in source directory.  This is a hack: we look in
+     # "./qt" because this check might be run at the top level.
+     if test -f $srcdir/../qt/qt.c || test -f $srcdir/qt/qt.c; then
+	threads_package=COOP
+	cy_cv_threads_cflags="-I$srcdir/../qt -I../qt"
+	cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+     fi
+  else
+     if test -f $use_threads/qt.c; then
+	# FIXME seems as though we should try to use an installed qt here.
+	threads_package=COOP
+	cy_cv_threads_cflags="-I$use_threads -I../qt"
+	cy_cv_threads_libs="../threads/libthreads.a ../qt/libqt.a"
+     fi
+  fi
+  if test "$use_threads" = pthreads; then
+     # Look for pthreads in srcdir.  See above to understand why
+     # we always set threads_package.
+     if test -f $srcdir/../../pthreads/pthreads/queue.c \
+	  || test -f $srcdir/../pthreads/pthreads/queue.c; then
+	threads_package=MIT
+	cy_cv_threads_cflags="-I$srcdir/../../pthreads/include"
+	cy_cv_threads_libs="-L../../pthreads/lib -lpthread"
+     fi
+  fi
+  saved_CPP="$CPPFLAGS"
+  saved_LD="$LDFLAGS"
+  saved_LIBS="$LIBS"
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the FSU threads package
+dnl
+    CPPFLAGS="-I$use_threads/include"
+    LDFLAGS="-L$use_threads/lib"
+    LIBS="-lgthreads -lmalloc"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=FSU)
+  fi
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the MIT threads package
+dnl
+    LIBS="-lpthread"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=MIT)
+  fi
+  if test "$threads_package" = unknown; then
+dnl
+dnl Test for the PCthreads package
+dnl
+    LIBS="-lpthreads"
+    AC_TRY_LINK([#include <pthread.h>],[
+pthread_equal(NULL,NULL);
+], threads_package=PCthreads)
+  fi
+dnl
+dnl Set the appropriate flags!
+dnl 
+  cy_cv_threads_cflags="$CPPFLAGS $cy_cv_threads_cflags"
+  cy_cv_threads_libs="$LDFLAGS $LIBS $cy_cv_threads_libs"
+  cy_cv_threads_package=$threads_package
+  CPPFLAGS="$saved_CPP"
+  LDFLAGS="$saved_LD"
+  LIBS="$saved_LIBS"
+  if test "$threads_package" = unknown; then
+    AC_MSG_ERROR("cannot find thread library installation")
+  fi
+fi
+])
+])
+],
+dnl
+dnl Set flags according to what is cached.
+dnl
+CPPFLAGS="$cy_cv_threads_cflags"
+LIBS="$cy_cv_threads_libs"
+)
+])