diff --git a/ChangeLog b/ChangeLog index 69aa1089c..61f8ca57e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Mon Dec 2 17:33:04 1996 Tom Tromey + + * configure.in: Generate doc/guile-programmer/Makefile and + doc/guile-user/Makefile. + +Sat Nov 30 23:45:54 1996 Tom Tromey + + * 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 * lgh: directory renamed to gh, along with all prefixes of the diff --git a/GUILE-VERSION b/GUILE-VERSION index 9d711aa35..a8a765d26 100644 --- a/GUILE-VERSION +++ b/GUILE-VERSION @@ -1,4 +1,7 @@ -GUILE_MAJOR_VERSION=1 -GUILE_MINOR_VERSION=0b3 +GUILE_MAJOR_VERSION=0 +GUILE_MINOR_VERSION=9c GUILE_VERSION=$GUILE_MAJOR_VERSION.$GUILE_MINOR_VERSION +# For automake. +VERSION=$GUILE_VERSION +PACKAGE=guile diff --git a/HACKING b/HACKING index 3ed8070ef..808fc6694 100644 --- a/HACKING +++ b/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' -target in the relevant Makefile.in files, so the snapshot and -distribution processes will work. +- If you add or remove files, don't forget to update the appropriate +part of the relevant Makefile.am files, and regenerate the +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 diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 000000000..efe9ec547 --- /dev/null +++ b/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 diff --git a/Makefile.in b/Makefile.in index ff7b79f4a..a34f19af1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,304 +1,259 @@ -# Copyright (C) 1994,1995 Free Software Foundation, Inc. -# -# This program 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. -# -# 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. +# 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. -VERSION = @GUILE_VERSION@ SHELL = /bin/sh -srcdir=@srcdir@ -subdirs=@build_subdirs@ -dist_dirs=@existingdirs@ doc +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ -DISTFILES = AUTHORS \ - COPYING \ - ChangeLog \ - GUILE-VERSION \ - INSTALL \ - NEWS \ - README \ - TODO \ - aclocal.m4 \ - Makefile.in \ - configure \ - configure.in \ - config.sub \ - config.guess \ - install-sh \ - mkinstalldirs +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 -# `all' -# Compile the entire program. This should be the default target. -# This target need not rebuild any documentation files; info files -# should normally be included in the distribution, and DVI files -# should be made only when explicitly asked for. -all: - @for dir in ${subdirs}; do \ - cd $$dir; \ - ${MAKE} all; \ - cd .. ;\ +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@ +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' -# Compile the program and copy the executables, libraries, and so on -# to the file names where they should reside for actual use. If -# 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 .. ;\ +uninstall-aclocalDATA: + list="$(aclocal_DATA)"; for p in $$list; do \ + rm -f $(aclocaldir)/$$p; \ done -#`uninstall' -# Delete all the installed files that the `install' target would -# create (but not the noninstalled files such as `make all' would -# create). -uninstall: - for dir in ${subdirs}; do \ - cd $$dir; \ - ${MAKE} uninstall; \ - cd .. ;\ +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + +@SET_MAKE@ + +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' -# Delete all files from the current directory that are normally -# created by building the program. Don't delete the files that -# record the configuration. Also preserve files that could be made -# by building, but normally aren't because the distribution comes -# with them. -# -# Delete `.dvi' files here if they are not part of the distribution. -# -clean: - for dir in ${subdirs}; do \ - cd $$dir; \ - ${MAKE} clean; \ - cd .. ;\ +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=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' -# Delete all files from the current directory that are created by -# configuring or building the program. If you have unpacked the -# source and built the program without creating any other files, -# `make distclean' should leave only the files that were in the -# distribution. -distclean: - rm -f config.cache - rm -f config.log +install-data-am: install-aclocalDATA + +uninstall-am: uninstall-aclocalDATA + +install-exec: install-exec-recursive + $(NORMAL_INSTALL) + +install-data: install-data-recursive install-data-am + $(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' -# Like `clean', but may refrain from deleting a few files that people -# normally don't want to recompile. For example, the `mostlyclean' -# target for GCC does not delete `libgcc.a', because recompiling it -# is rarely necessary and takes a lot of time. -mostlyclean: - for dir in ${subdirs}; do \ - cd $$dir; \ - ${MAKE} mostlyclean; \ - cd .. ;\ - done +.PHONY: default uninstall-aclocalDATA install-aclocalDATA \ +install-data-recursive uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ +maintainer-clean-recursive tags tags-recursive distdir info dvi \ +installcheck all-am install-data-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 +guile-dist: + $(MAKE) SUBDIRS="$(guile_dirs)" dist -#`realclean' -# Delete everything from the current directory that can be -# reconstructed with this Makefile. This typically includes -# 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 +# 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: diff --git a/aclocal.m4 b/aclocal.m4 index 0466e8c7b..36e3fda6f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,102 +1,52 @@ -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 +dnl aclocal.m4 generated automatically by aclocal 1.1i -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_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_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_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 +# 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 -]) -]) -], -dnl -dnl Set flags according to what is cached. -dnl -CPPFLAGS="$cy_cv_threads_cflags" -LIBS="$cy_cv_threads_libs" -) -]) +rm -f conftest* +AC_MSG_RESULT(yes)]) + diff --git a/configure b/configure index 0220f3608..1ea1e2b24 100755 --- a/configure +++ b/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. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# 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 <> confdefs.h <&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 - if test -f $srcdir/$d/PLUGIN/greet ; then - cat $srcdir/$d/PLUGIN/greet - else - echo === - echo === Configuring plug-in component $d - echo === - fi - fi + test -n "$silent" || echo Configuring plug-in component $d fi done for d in $req_subdirs; do - if test ! -d $srcdir/$d ; then - echo "*******" - echo "*******" - echo "**\+/**" - echo "**=*=**" ERROR: Missing required package: $d - echo "**/+\**" - echo "*******" - echo "*******" - exit 1 - fi + test -d $srcdir/$d || { + echo ERROR: Missing required package: $d 1>&2 + exit 1 + } 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 <&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 <&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 <&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 <&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" \ - >> confcache + case `(ac_space=' '; set) 2>&1` in + *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 <> $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 <> $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 <> $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. diff --git a/configure.in b/configure.in index 634f25682..6a0ec7973 100644 --- a/configure.in +++ b/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 - if test -f $srcdir/$d/PLUGIN/greet ; then - cat $srcdir/$d/PLUGIN/greet - else - echo === - echo === Configuring plug-in component $d - echo === - fi - fi + test -n "$silent" || echo Configuring plug-in component $d fi done for d in $req_subdirs; do - if test ! -d $srcdir/$d ; then - echo "*******" - echo "*******" - echo "**\+/**" - echo "**=*=**" ERROR: Missing required package: $d - echo "**/+\**" - echo "*******" - echo "*******" - exit 1 - fi + test -d $srcdir/$d || { + echo ERROR: Missing required package: $d 1>&2 + exit 1 + } 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_SUBST(GUILE_VERSION) -AC_OUTPUT(Makefile doc/Makefile) +AC_OUTPUT(Makefile doc/Makefile doc/guile-programmer/Makefile doc/guile-user/Makefile) diff --git a/guile.m4 b/guile.m4 new file mode 100644 index 000000000..58ee47661 --- /dev/null +++ b/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)]) diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index 5850cc7ae..428a372bc 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -1,3 +1,9 @@ +Sat Nov 30 23:57:28 1996 Tom Tromey + + * 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 * boot-9.scm (macroexpand-1, macroexpand), slib.scm diff --git a/ice-9/Makefile.am b/ice-9/Makefile.am new file mode 100644 index 000000000..1647cffcc --- /dev/null +++ b/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 diff --git a/ice-9/Makefile.in b/ice-9/Makefile.in index 0802d14fd..cb5bd9442 100644 --- a/ice-9/Makefile.in +++ b/ice-9/Makefile.in @@ -1,103 +1,204 @@ -# Copyright (C) 1995 Free Software Foundation, Inc. -# -# This program 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. -# -# 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. -# +# 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@ -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)/guile -pkgverdatadir=$(pkgdatadir)/$(VERSION) -subpkgdatadir=$(pkgverdatadir)/@library_name@ -sitedatadir=$(pkgdatadir)/site +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -INSTALL = $(srcdir)/../install-sh -c -INSTALL_DATA = $(INSTALL) -m 644 +top_builddir = . -scm_files = \ - boot-9.scm \ - r4rs.scm \ - debug.scm \ - expect.scm \ - hcons.scm \ - lineio.scm \ - mapping.scm \ - poe.scm \ - slib.scm \ - tags.scm \ - threads.scm \ - test.scm +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ -aux_files = \ - .cvsignore \ - COPYING \ - ChangeLog \ - Makefile.in \ - configure \ - configure.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 + +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 - for dir in $(datadir) $(pkgdatadir) $(pkgverdatadir) \ - $(subpkgdatadir) $(sitedatadir); do \ - test -d $$dir || mkdir $$dir; \ - done - for file in $(scm_files); do \ - $(INSTALL_DATA) $(srcdir)/$$file $(subpkgdatadir); \ +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=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: - for file in $(scm_files) ; do \ - rm -f $(subpkgdatadir)/$$file; \ - 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}; \ +uninstall-subpkgdataDATA: + list="$(subpkgdata_DATA)"; for p in $$list; do \ + rm -f $(subpkgdatadir)/$$p; \ done - mkdir ${DISTDIR}/PLUGIN - for f in REQ greet split.sed this.configure; do \ - ln ${srcdir}/PLUGIN/$$f ${DISTDIR}/PLUGIN; \ +tags: TAGS +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 +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: - -rm -f config.log config.status Makefile +clean-generic: + 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: diff --git a/ice-9/aclocal.m4 b/ice-9/aclocal.m4 new file mode 100644 index 000000000..e659bad01 --- /dev/null +++ b/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)]) + diff --git a/ice-9/configure b/ice-9/configure index f303c71e6..4676147d1 100755 --- a/ice-9/configure +++ b/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. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# 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 <> confdefs.h <&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" \ - >> confcache + case `(ac_space=' '; set) 2>&1` in + *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%@info_files@%$info_files%g -s%@GUILE_VERSION@%$GUILE_VERSION%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 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 <> $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 <> $CONFIG_STATUS <<\EOF exit 0 EOF diff --git a/ice-9/configure.in b/ice-9/configure.in index 7d7829c2f..b2d4c334b 100644 --- a/ice-9/configure.in +++ b/ice-9/configure.in @@ -3,11 +3,5 @@ # AC_INIT(boot-9.scm) - -. $srcdir/../GUILE-VERSION - -. $srcdir/PLUGIN/this.configure -AC_SUBST(library_name) -AC_SUBST(info_files) -AC_SUBST(GUILE_VERSION) +AM_INIT_GUILE_MODULE(ice-9) AC_OUTPUT(Makefile) diff --git a/libguile/ChangeLog b/libguile/ChangeLog index ecfd424be..8c0e4a79f 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,12 @@ +Sun Dec 1 00:00:49 1996 Tom Tromey + + * 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 * eval.c (scm_definedp): Use top_level_lookup_closure_var diff --git a/libguile/Makefile.am b/libguile/Makefile.am new file mode 100644 index 000000000..444970cec --- /dev/null +++ b/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 +## 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 . +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) diff --git a/libguile/Makefile.in b/libguile/Makefile.in index c0fd952b0..4700dd8db 100644 --- a/libguile/Makefile.in +++ b/libguile/Makefile.in @@ -1,875 +1,450 @@ -# @configure_input@ +# Makefile.in generated automatically by automake 1.1i from Makefile.am -# Copyright (C) 1995 Free Software Foundation, Inc. -# -# This program 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. -# -# 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. -# - +# 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. -# -# Makefile for libguile -# -VPATH = @srcdir@ -srcdir = @srcdir@ SHELL = /bin/sh -VERSION=@GUILE_VERSION@ - -# Common prefix for machine-independent installed files. +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ prefix = @prefix@ - -# Common prefix for machine-dependent installed files. exec_prefix = @exec_prefix@ -# Directory in which to install init files &c -libdir = @libdir@ - -# Directory for installed #include files for all packages -includedir = @includedir@ -innerincludedir = $(includedir)/libguile - -# Directory to install `guile' in. 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 -# Directories for read-only architecture-independent files. -datadir=@datadir@ -pkgdatadir=$(datadir)/guile +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ -INSTALL = $(srcdir)/../install-sh -c -INSTALL_DATA = $(INSTALL) -m 644 -INSTALL_PROGRAM = $(INSTALL) -m 755 +top_builddir = . -# Programs to make tags files. -ETAGS = etags -CTAGS = ctags -tw - -# CC -X11_INCLUDES=@XINCLUDES@ -XFLAGS=@X_CFLAGS@ -CFLAGS=@CFLAGS@ -# Check for headers in $(srcdir)/.., so that #include -# will find MUMBLE.h in this dir when we're -# building. -INCLUDE_CFLAGS=-I. -I.. -I$(srcdir)/.. -I$(srcdir) -ALL_CFLAGS=$(X_CFLAGS) $(INCLUDE_CFLAGS) $(X11_INCLUDES) @DEFS@ -CC=@CC@ $(ALL_CFLAGS) -CPP=@CPP@ - -# CC used as a front end for ld -LDFLAGS = @LDFLAGS@ -CCLD= $(CC) $(LDFLAGS) - -# AR -AR = ar -AR_FLAGS = rc +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +transform = @program_transform_name@ +FD_SETTER = @FD_SETTER@ RANLIB = @RANLIB@ +CC = @CC@ -# Any extra object files your system needs. -extras = @LIBOBJS@ +AUTOMAKE_OPTIONS = foreign -libobjs= alist.o \ - append.o \ - appinit.o \ - arbiters.o \ - async.o \ - boolean.o \ - chars.o \ - continuations.o \ - dynwind.o \ - eq.o \ - error.o \ - eval.o \ - extchrs.o \ - fdsocket.o \ - feature.o \ - filesys.o \ - fports.o \ - gc.o \ - gdbint.o \ - genio.o \ - gsubr.o \ - hash.o \ - hashtab.o \ - init.o \ - ioext.o \ - kw.o \ - list.o \ - load.o \ - mallocs.o \ - markers.o \ - mbstrings.o \ - numbers.o \ - objprop.o \ - options.o \ - pairs.o \ - ports.o \ - posix.o \ - print.o \ - procprop.o \ - procs.o \ - ramap.o \ - read.o \ - root.o \ - scmsigs.o \ - sequences.o \ - simpos.o \ - smob.o \ - socket.o \ - stackchk.o \ - stime.o \ - strings.o \ - strop.o \ - strorder.o \ - strports.o \ - struct.o \ - symbols.o \ - tag.o \ - throw.o \ - unif.o \ - variable.o \ - vectors.o \ - version.o \ - vports.o \ - weaks.o \ - $(extras) +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 -# These are headers used only by the internal guile sources. -uninstalled_h_files= _scm.h - -# These are headers visible as . -installed_h_files = libguile.h +include_HEADERS = libguile.h # These are headers visible as . -inner_h_files= __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 \ - snarf.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 +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 -h_files=$(uninstalled_h_files) $(installed_h_files) $(inner_h_files) +modinclude_DATA = scmconfig.h -c_files= 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 +EXTRA_DIST = gscm.c gscm.h ChangeLog-scm PLUGIN/REQ PLUGIN/guile.config \ +PLUGIN/guile.libs -gen_c_files= alist.x \ - append.x \ - arbiters.x \ - async.x \ - backtrace.x \ - boolean.x \ - chars.x \ - continuations.x \ - debug.x \ - dynwind.x \ - eq.x \ - error.x \ - eval.x \ - extchrs.x \ - fdsocket.x \ - feature.x \ - filesys.x \ - fports.x \ - gc.x \ - genio.x \ - gsubr.x \ - hash.x \ - hashtab.x \ - init.x \ - ioext.x \ - kw.x \ - list.x \ - load.x \ - mallocs.x \ - markers.x \ - mbstrings.x \ - numbers.x \ - objprop.x \ - options.x \ - pairs.x \ - ports.x \ - posix.x \ - print.x \ - procprop.x \ - procs.x \ - ramap.x \ - read.x \ - root.x \ - scmsigs.x \ - sequences.x \ - simpos.x \ - smob.x \ - socket.x \ - srcprop.x \ - stackchk.x \ - stacks.x \ - stime.x \ - strings.x \ - strop.x \ - strorder.x \ - strports.x \ - struct.x \ - symbols.x \ - tag.x \ - throw.x \ - unif.x \ - variable.x \ - vectors.x \ - version.x \ - vports.x \ - weaks.x +SUFFIXES = .x + +MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +ACLOCAL = $(top_srcdir)/aclocal.m4 +CONFIG_HEADER_IN = scmconfig.h.in +mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs +CONFIG_HEADER = scmconfig.h +CONFIG_CLEAN_FILES = fd.h +LIBRARIES = $(lib_LIBRARIES) +DEFS = @DEFS@ -I. -I$(srcdir) -I. +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +libguile_a_LIBADD = +libguile_a_OBJECTS = alist.o append.o appinit.o arbiters.o async.o \ +backtrace.o boolean.o chars.o continuations.o debug.o dynwind.o eq.o \ +error.o eval.o extchrs.o fdsocket.o feature.o filesys.o fports.o gc.o \ +gdbint.o genio.o gsubr.o hash.o hashtab.o inet_aton.o init.o ioext.o \ +kw.o list.o load.o mallocs.o markers.o mbstrings.o numbers.o objprop.o \ +options.o pairs.o ports.o posix.o print.o procprop.o procs.o ramap.o \ +read.o root.o scmsigs.o sequences.o simpos.o smob.o socket.o srcprop.o \ +stackchk.o stacks.o stime.o strerror.o strings.o strop.o strorder.o \ +strports.o struct.o symbols.o tag.o throw.o unif.o variable.o vectors.o \ +version.o vports.o weaks.o +AR = ar +CFLAGS = @CFLAGS@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +LINK = $(CC) $(LDFLAGS) -o $@ +DATA = $(modinclude_DATA) -ancillary = gscm.c \ - gscm.h \ - COPYING \ - ChangeLog \ - ChangeLog-scm \ - Makefile.in \ - acconfig.h \ - aclocal.m4 \ - configure \ - configure.in \ - scmconfig.h.in \ - fd.h.in \ - guile-snarf.sh +HEADERS = $(include_HEADERS) $(modinclude_HEADERS) + +DIST_COMMON = COPYING ChangeLog Makefile.am Makefile.in acconfig.h \ +acinclude.m4 aclocal.m4 configure configure.in fd.h.in scmconfig.h.in \ +stamp-h.in -c_sources = $(c_files) $(h_files) -manifest = $(ancillary) $(c_sources) +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ + $(TEXINFOS) $(MANS) $(EXTRA_DIST) + +TAR = tar +DEP_FILES = .deps/alist.P .deps/append.P .deps/appinit.P \ +.deps/arbiters.P .deps/async.P .deps/backtrace.P .deps/boolean.P \ +.deps/chars.P .deps/continuations.P .deps/debug.P .deps/dynwind.P \ +.deps/eq.P .deps/error.P .deps/eval.P .deps/extchrs.P .deps/fdsocket.P \ +.deps/feature.P .deps/filesys.P .deps/fports.P .deps/gc.P \ +.deps/gdbint.P .deps/genio.P .deps/gsubr.P .deps/hash.P .deps/hashtab.P \ +.deps/inet_aton.P .deps/init.P .deps/ioext.P .deps/kw.P .deps/list.P \ +.deps/load.P .deps/mallocs.P .deps/markers.P .deps/mbstrings.P \ +.deps/numbers.P .deps/objprop.P .deps/options.P .deps/pairs.P \ +.deps/ports.P .deps/posix.P .deps/print.P .deps/procprop.P \ +.deps/procs.P .deps/ramap.P .deps/read.P .deps/root.P .deps/scmsigs.P \ +.deps/sequences.P .deps/simpos.P .deps/smob.P .deps/socket.P \ +.deps/srcprop.P .deps/stackchk.P .deps/stacks.P .deps/stime.P \ +.deps/strerror.P .deps/strings.P .deps/strop.P .deps/strorder.P \ +.deps/strports.P .deps/struct.P .deps/symbols.P .deps/tag.P \ +.deps/throw.P .deps/unif.P .deps/variable.P .deps/vectors.P \ +.deps/version.P .deps/vports.P .deps/weaks.P +SOURCES = $(libguile_a_SOURCES) +OBJECTS = $(libguile_a_OBJECTS) + +default: all .SUFFIXES: -.SUFFIXES: .o .c .h .ps .dvi .info .texinfo .scm .x +.SUFFIXES: .c .o .x +$(srcdir)/aclocal.m4: configure.in acinclude.m4 + cd $(srcdir) && aclocal -.c.x: guile-snarf - ./guile-snarf $(ALL_CFLAGS) $< > $@ +$(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 + +$(CONFIG_HEADER): stamp-h +stamp-h: $(CONFIG_HEADER_IN) $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADER) \ + $(SHELL) ./config.status + @echo timestamp > stamp-h +$(srcdir)/$(CONFIG_HEADER_IN): stamp-h.in +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL) acconfig.h + cd $(top_srcdir) && autoheader + echo timestamp > $(srcdir)/stamp-h.in + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + rm -f $(CONFIG_HEADER) + +maintainer-clean-hdr: +fd.h: $(top_builddir)/config.status fd.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: +$(libguile_a_OBJECTS): scmconfig.h + +libguile.a: $(libguile_a_OBJECTS) $(libguile_a_DEPENDENCIES) + rm -f libguile.a + $(AR) cru libguile.a $(libguile_a_OBJECTS) $(libguile_a_LIBADD) + $(RANLIB) libguile.a + +install-modincludeDATA: $(modinclude_DATA) + $(NORMAL_INSTALL) + $(mkinstalldirs) $(modincludedir) + list="$(modinclude_DATA)"; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + $(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p; \ + else if test -f $$p; then \ + $(INSTALL_DATA) $$p $(modincludedir)/$$p; \ + fi; fi; \ + done + +uninstall-modincludeDATA: + list="$(modinclude_DATA)"; for p in $$list; do \ + rm -f $(modincludedir)/$$p; \ + done + +install-includeHEADERS: $(include_HEADERS) + $(NORMAL_INSTALL) + $(mkinstalldirs) $(includedir) + list="$(include_HEADERS)"; for p in $$list; do \ + $(INSTALL_DATA) $(srcdir)/$$p $(includedir)/$$p; \ + done + +uninstall-includeHEADERS: + list="$(include_HEADERS)"; for p in $$list; do \ + rm -f $(includedir)/$$p; \ + done + +install-modincludeHEADERS: $(modinclude_HEADERS) + $(NORMAL_INSTALL) + $(mkinstalldirs) $(modincludedir) + list="$(modinclude_HEADERS)"; for p in $$list; do \ + $(INSTALL_DATA) $(srcdir)/$$p $(modincludedir)/$$p; \ + done + +uninstall-modincludeHEADERS: + list="$(modinclude_HEADERS)"; for p in $$list; do \ + rm -f $(modincludedir)/$$p; \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) + +TAGS: $(HEADERS) $(SOURCES) scmconfig.h.in $(TAGS_DEPENDENCIES) + tags=; \ + here=`pwd`; \ + list="$(SUBDIRS)"; for subdir in $$list; do \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + done; \ + test -z "$(ETAGS_ARGS)scmconfig.h.in$(SOURCES)$(HEADERS)$$tags" \ + || cd $(srcdir) && etags $(ETAGS_ARGS) $$tags scmconfig.h.in $(SOURCES) $(HEADERS) -o $$here/TAGS + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + rm -f TAGS ID + +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 +.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: +dvi: +check: all + $(MAKE) +installcheck: +install-exec: install-libLIBRARIES + $(NORMAL_INSTALL) + +install-data: install-modincludeDATA install-includeHEADERS install-modincludeHEADERS + $(NORMAL_INSTALL) + +install: install-exec install-data all + @: + +uninstall: uninstall-libLIBRARIES uninstall-modincludeDATA uninstall-includeHEADERS uninstall-modincludeHEADERS + +all: $(LIBRARIES) $(DATA) $(HEADERS) Makefile scmconfig.h + +install-strip: + $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install +installdirs: + $(mkinstalldirs) $(libdir) $(modincludedir) $(includedir) \ + $(modincludedir) + + +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-hdr mostlyclean-libLIBRARIES \ + mostlyclean-compile mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + +clean: clean-hdr clean-libLIBRARIES clean-compile clean-tags \ + clean-depend clean-generic mostlyclean + +distclean: distclean-hdr distclean-libLIBRARIES distclean-compile \ + distclean-tags distclean-depend distclean-generic \ + clean + rm -f config.status + +maintainer-clean: maintainer-clean-hdr maintainer-clean-libLIBRARIES \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-depend 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 mostlyclean-hdr distclean-hdr clean-hdr \ +maintainer-clean-hdr mostlyclean-libLIBRARIES distclean-libLIBRARIES \ +clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \ +install-libLIBRARIES mostlyclean-compile distclean-compile \ +clean-compile maintainer-clean-compile uninstall-modincludeDATA \ +install-modincludeDATA uninstall-includeHEADERS install-includeHEADERS \ +uninstall-modincludeHEADERS install-modincludeHEADERS tags \ +mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ +distdir mostlyclean-depend distclean-depend clean-depend \ +maintainer-clean-depend 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 -.PHONY: all -all: libguile.a libpath.h: Makefile echo '/* generated by Makefile */' > libpath.h - echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> libpath.h - echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(VERSION)"' >> libpath.h - echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.h + echo '#define LIBRARY_PATH "$(pkgdatadir)/$(VERSION)"' >> libpath.h +.c.x: + $(CPP) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) \ + -DSCM_MAGIC_SNARFER $< | grep "^%%%" | sed -e "s/^%%%//" > $@ -$(gen_c_files): guile-snarf -guile-snarf: $(srcdir)/guile-snarf.sh - rm -f guile-snarf - sed -e 's,xCPPx,$(CPP),' $(srcdir)/guile-snarf.sh > guile-snarf-t - mv guile-snarf-t guile-snarf - chmod +x guile-snarf - -# 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 ${manifest}; do \ - ln ${srcdir}/$$f ${DISTDIR}; \ - done - mkdir ${DISTDIR}/PLUGIN - for f in REQ greet guile.config guile.libs; do \ - ln ${srcdir}/PLUGIN/$$f ${DISTDIR}/PLUGIN; \ - done - -SUBDIR=. -manifest: - for file in $(manifest) ; \ - do echo $(SUBDIR)/$$file ; \ - done - -libguile.a: $(libobjs) - rm -f libguile.a - $(AR) $(AR_FLAGS) libguile.a $(libobjs) - $(RANLIB) libguile.a - -install: all - test -d $(prefix) || mkdir $(prefix) - test -d $(libdir) || mkdir $(libdir) - $(INSTALL_DATA) libguile.a $(libdir)/libguile$(VERSION).a - ln -f -s libguile$(VERSION).a $(libdir)/libguile.a - test -d $(includedir) || mkdir $(includedir) - test -d $(innerincludedir) || mkdir $(innerincludedir) - for h in $(installed_h_files); do \ - $(INSTALL_DATA) $(srcdir)/$$h $(includedir); \ - done - $(INSTALL_DATA) scmconfig.h $(innerincludedir) - $(INSTALL_DATA) libpath.h $(innerincludedir) - for h in $(inner_h_files); do \ - $(INSTALL_DATA) $(srcdir)/$$h $(innerincludedir); \ - done - test -d $(bindir) || mkdir $(bindir) - $(INSTALL_PROGRAM) guile-snarf $(bindir) - -uninstall: - -rm $(libdir)/libguile$(VERSION).a - -rm $(libdir)/libguile.a - -rm -rf $(guileincludedir) - -rm $(includedir)/guile - -rm $(bindir)/guile-snarf - -TAGS: - etags $(c_sources) - - -info: - -clean: - -rm -f libguile.a - -rm -f $(libobjs) - -rm -f $(gen_c_files) - -rm -f libpath.h - -distclean: clean - -rm -f config.cache - -rm -f config.log - -rm -f config.status - -rm -f Makefile - -rm -f scmconfig.h - -rm -f fd.h - -rm -f guile-snarf - -realclean: distclean - -rm -f $(gen_c_files) - -rm -f scmconfig.h - -xfiles: $(gen_c_files) - -DEPENDS_CFLAGS= - -depends: - @gcc -MM -I. -I.. $(DEPENDS_CFLAGS) $(c_files) - -### -alist.o: alist.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h eq.h \ - alist.h alist.x -append.o: append.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - append.h append.x -appinit.o: appinit.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h -arbiters.o: arbiters.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h smob.h \ - ports.h genio.h markers.h \ - arbiters.h arbiters.x -async.o: async.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h eval.h \ - throw.h smob.h ports.h genio.h \ - markers.h async.x -backtrace.o: backtrace.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h eval.h \ - throw.h genio.h smob.h ports.h genio.h \ - markers.h procprop.h srcprop.h alist.h continuations.h \ - strports.h read.h feature.h backtrace.h backtrace.x -boolean.o: boolean.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - boolean.x -chars.o: chars.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h chars.x -continuations.o: continuations.c _scm.h __scm.h \ - scmconfig.h tags.h error.h \ - __scm.h print.h options.h pairs.h list.h gc.h \ - gsubr.h procs.h numbers.h symbols.h boolean.h strings.h vectors.h \ - root.h ports.h async.h stackchk.h continuations.h \ - debug.h debug.h dynwind.h continuations.h continuations.x -debug.o: debug.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h eval.h \ - throw.h genio.h smob.h ports.h genio.h \ - markers.h procprop.h srcprop.h alist.h continuations.h \ - strports.h read.h feature.h debug.h debug.x -dynwind.o: dynwind.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h eval.h \ - alist.h dynwind.h dynwind.x -eq.o: eq.c _scm.h __scm.h scmconfig.h tags.h \ - error.h __scm.h print.h options.h pairs.h \ - list.h gc.h gsubr.h procs.h numbers.h symbols.h boolean.h strings.h \ - vectors.h root.h ports.h async.h ramap.h stackchk.h \ - continuations.h debug.h strorder.h smob.h \ - ports.h genio.h markers.h unif.h \ - eq.h eq.x -error.o: error.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - genio.h throw.h error.x -eval.o: eval.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - debug.h append.h alist.h sequences.h eq.h continuations.h throw.h \ - smob.h ports.h genio.h markers.h \ - markers.h procprop.h hashtab.h hash.h srcprop.h stackchk.h \ - continuations.h debug.h eval.h eval.c eval.x -extchrs.o: extchrs.c extchrs.h -fdsocket.o: fdsocket.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - filesys.h unif.h fdsocket.h fdsocket.x -feature.o: feature.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - feature.h feature.x -filesys.o: filesys.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - genio.h smob.h ports.h genio.h \ - markers.h filesys.h filesys.x -fports.o: fports.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - markers.h fports.h ports.h fports.x -gc.o: gc.c _scm.h __scm.h scmconfig.h tags.h \ - error.h __scm.h print.h options.h pairs.h \ - list.h gc.h gsubr.h procs.h numbers.h symbols.h boolean.h strings.h \ - vectors.h root.h ports.h async.h stime.h stackchk.h \ - continuations.h debug.h struct.h genio.h \ - weaks.h smob.h ports.h genio.h \ - markers.h unif.h gc.x -gdbint.o: gdbint.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h tag.h \ - strports.h read.h eval.h chars.h gdbint.h gdb_interface.h -genio.o: genio.c extchrs.h _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h genio.h -gsubr.o: gsubr.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - genio.h -hash.o: hash.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h hash.h hash.x -hashtab.o: hashtab.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - alist.h hash.h eval.h hashtab.h hashtab.x -inet_aton.o: inet_aton.c -init.o: init.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - alist.h append.h arbiters.h chars.h continuations.h debug.h dynwind.h \ - eq.h eval.h fdsocket.h feature.h filesys.h fports.h \ - ports.h gdbint.h hash.h hashtab.h ioext.h kw.h load.h \ - mallocs.h mbstrings.h symbols.h objprop.h options.h \ - posix.h procprop.h ramap.h read.h scmsigs.h sequences.h simpos.h \ - smob.h genio.h markers.h socket.h srcprop.h \ - stackchk.h continuations.h debug.h stime.h \ - strop.h strorder.h strports.h struct.h tag.h throw.h unif.h \ - variable.h version.h vports.h weaks.h init.h -ioext.o: ioext.c fd.h _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - fports.h ports.h ioext.h ioext.x -kw.o: kw.c _scm.h __scm.h scmconfig.h tags.h \ - error.h __scm.h print.h options.h pairs.h \ - list.h gc.h gsubr.h procs.h numbers.h symbols.h boolean.h strings.h \ - vectors.h root.h ports.h async.h genio.h mbstrings.h \ - symbols.h smob.h ports.h genio.h \ - markers.h kw.h kw.x -list.o: list.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h eq.h \ - list.x -load.o: load.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - libpath.h fports.h ports.h read.h eval.h load.h load.x -mallocs.o: mallocs.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - genio.h smob.h ports.h genio.h \ - markers.h mallocs.h -markers.o: markers.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - markers.h -mbstrings.o: mbstrings.c extchrs.h _scm.h __scm.h \ - scmconfig.h tags.h error.h \ - __scm.h print.h options.h pairs.h list.h gc.h \ - gsubr.h procs.h numbers.h symbols.h boolean.h strings.h vectors.h \ - root.h ports.h async.h chars.h unif.h genio.h read.h mbstrings.h \ - symbols.h mbstrings.x -numbers.o: numbers.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - genio.h unif.h numbers.x -objprop.o: objprop.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - hashtab.h alist.h weaks.h objprop.h objprop.x -options.o: options.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - options.h options.x -pairs.o: pairs.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - pairs.x -ports.o: ports.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - genio.h chars.h markers.h fports.h ports.h strports.h \ - vports.h ports.x -posix.o: posix.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - fports.h ports.h genio.h scmsigs.h read.h unif.h \ - feature.h sequences.h posix.h posix.x -print.o: print.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h genio.h mbstrings.h symbols.h smob.h \ - ports.h genio.h markers.h eval.h \ - procprop.h read.h weaks.h unif.h alist.h struct.h print.x -procprop.o: procprop.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - alist.h eval.h procprop.h procprop.x -procs.o: procs.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - procs.x -ramap.o: ramap.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h unif.h \ - smob.h ports.h genio.h markers.h \ - chars.h eq.h eval.h feature.h ramap.h ramap.x -read.o: read.c extchrs.h _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h genio.h eval.h unif.h mbstrings.h symbols.h kw.h \ - alist.h srcprop.h hashtab.h hash.h read.h read.x -root.o: root.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - stackchk.h continuations.h debug.h dynwind.h \ - eval.h genio.h smob.h ports.h genio.h \ - markers.h throw.h root.x -scmsigs.o: scmsigs.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - scmsigs.h scmsigs.x -sequences.o: sequences.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - sequences.h sequences.x -simpos.o: simpos.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - scmsigs.h simpos.h simpos.x -smob.o: smob.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h smob.h \ - ports.h genio.h markers.h -socket.o: socket.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - feature.h socket.h socket.x -srcprop.o: srcprop.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h smob.h \ - ports.h genio.h markers.h alist.h \ - debug.h hashtab.h hash.h weaks.h srcprop.h srcprop.x -stackchk.o: stackchk.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - genio.h stackchk.h continuations.h debug.h \ - stackchk.x -stacks.o: stacks.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h eval.h \ - throw.h genio.h smob.h ports.h genio.h \ - markers.h procprop.h srcprop.h alist.h continuations.h \ - strports.h read.h feature.h stacks.h stacks.x -stime.o: stime.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - stime.h stime.x -strerror.o: strerror.c -strings.o: strings.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h strings.x -strop.o: strop.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h strop.h strop.x -strorder.o: strorder.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h strorder.h strorder.x -strports.o: strports.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h unif.h \ - eval.h read.h strports.h strports.x -struct.o: struct.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h struct.h struct.x -symbols.o: symbols.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h eval.h variable.h alist.h mbstrings.h symbols.h \ - symbols.x -tag.o: tag.c _scm.h __scm.h scmconfig.h tags.h \ - error.h __scm.h print.h options.h pairs.h \ - list.h gc.h gsubr.h procs.h numbers.h symbols.h boolean.h strings.h \ - vectors.h root.h ports.h async.h chars.h struct.h tag.h tag.x -throw.o: throw.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - genio.h smob.h ports.h genio.h \ - markers.h alist.h eval.h dynwind.h debug.h \ - continuations.h stackchk.h continuations.h \ - debug.h throw.h throw.x -unif.o: unif.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - chars.h eval.h genio.h smob.h ports.h genio.h \ - markers.h sequences.h strop.h feature.h unif.h ramap.h \ - unif.x -variable.o: variable.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - genio.h smob.h ports.h genio.h \ - markers.h variable.h variable.x -vectors.o: vectors.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h eq.h \ - vectors.x -version.o: version.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - version.h version.x -vports.o: vports.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h eval.h \ - chars.h fports.h ports.h vports.h vports.x -weaks.o: weaks.c _scm.h __scm.h scmconfig.h \ - tags.h error.h __scm.h print.h \ - options.h pairs.h list.h gc.h gsubr.h procs.h numbers.h \ - symbols.h boolean.h strings.h vectors.h root.h ports.h async.h \ - weaks.h weaks.x +# 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: diff --git a/libguile/acconfig.h b/libguile/acconfig.h index 90099bece..83950fc59 100644 --- a/libguile/acconfig.h +++ b/libguile/acconfig.h @@ -73,3 +73,6 @@ /* Define if using any sort of threads. */ #undef USE_THREADS + +/* Name of this package. */ +#undef PACKAGE diff --git a/libguile/acinclude.m4 b/libguile/acinclude.m4 new file mode 100644 index 000000000..e69de29bb diff --git a/libguile/aclocal.m4 b/libguile/aclocal.m4 index 65b4b11c2..7b063e779 100644 --- a/libguile/aclocal.m4 +++ b/libguile/aclocal.m4 @@ -1,3 +1,5 @@ +dnl aclocal.m4 generated automatically by aclocal 1.1i + dnl On the NeXT, #including 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_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_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_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" +) +]) + diff --git a/libguile/configure b/libguile/configure index 17d5b39a1..b55c56413 100755 --- a/libguile/configure +++ b/libguile/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 @@ -53,6 +53,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 @@ -334,7 +336,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-*) @@ -436,11 +438,14 @@ do done # NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# 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 @@ -502,6 +507,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. @@ -518,8 +524,187 @@ 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:559: 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 <> confdefs.h <&6 +echo "configure:627: 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:661: 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=libguile + + #-------------------------------------------------------------------- # # User options @@ -546,12 +731,10 @@ fi #-------------------------------------------------------------------- -test -z "$CFLAGS" && CFLAGS=-g -test -z "$LDFLAGS" && LDFLAGS=-g - # 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:738: 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 @@ -580,6 +763,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:767: 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 @@ -626,7 +810,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:815: 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 <&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:849: 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:854: 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 @@ -635,7 +859,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:639: \"$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:863: \"$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 @@ -643,29 +867,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 - 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 + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:878: 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 - if test $ac_cv_prog_gcc_g = yes; then - CFLAGS="-g -O" - else - CFLAGS="-O" - fi +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-O2" fi else GCC= @@ -673,6 +902,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:906: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -687,33 +917,37 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:927: \"$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 < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:944: \"$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 @@ -731,6 +965,7 @@ echo "$ac_t""$CPP" 1>&6 # 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:969: 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 @@ -758,8 +993,9 @@ fi echo $ac_n "checking for AIX""... $ac_c" 1>&6 +echo "configure:997: checking for AIX" >&5 cat > conftest.$ac_ext <&6 +echo "configure:1021: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -800,24 +1037,27 @@ else ISC= fi -ac_safe=`echo "minix/config.h" | tr './\055' '___'` +ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 +echo "configure:1043: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_$ac_safe=no" fi @@ -848,10 +1088,8 @@ fi - - - echo $ac_n "checking "threads package type"""... $ac_c" 1>&6 +echo "configure:1093: 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 @@ -910,62 +1148,65 @@ if test "$use_threads" != no; then LDFLAGS="-L$use_threads/lib" LIBS="-lgthreads -lmalloc" cat > conftest.$ac_ext < -int main() { return 0; } -int t() { +int main() { pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1161: \"$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 < -int main() { return 0; } -int t() { +int main() { pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1182: \"$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 < -int main() { return 0; } -int t() { +int main() { pthread_equal(NULL,NULL); ; return 0; } EOF -if { (eval echo configure:964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1203: \"$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" @@ -988,18 +1229,17 @@ fi echo "$ac_t""$cy_cv_threads_package" 1>&6 -CFLAGS="$CPPFLAGS $CFLAGS" echo $ac_n "checking for working const""... $ac_c" 1>&6 +echo "configure:1235: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_c_const=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_c_const" 1>&6 @@ -1065,38 +1306,13 @@ EOF fi -# If we cannot run a trivial program, we must be cross compiling. -echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_cross=yes -else -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_c_cross=no -else - ac_cv_c_cross=yes -fi -fi -rm -fr conftest* -fi - -echo "$ac_t""$ac_cv_c_cross" 1>&6 -cross_compiling=$ac_cv_c_cross - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:1311: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1104,13 +1320,15 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_stdc=no fi @@ -1119,7 +1337,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1137,7 +1355,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1157,8 +1375,8 @@ if test $ac_cv_header_stdc = yes; then if test "$cross_compiling" = yes; then : else -cat > conftest.$ac_ext < conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1169,14 +1387,18 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -{ (eval echo configure:1173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:1391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then : else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_header_stdc=no fi -fi rm -fr conftest* +fi + fi fi @@ -1191,34 +1413,35 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do -ac_safe=`echo "$ac_hdr" | tr './\055' '___'` +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +echo "configure:1419: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> -int main() { return 0; } -int t() { +int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=no" fi rm -f conftest* - fi if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdedfghijklmnopqrstuvwxyz./\055' 'ABCDEDFGHIJKLMNOPQRSTUVWXYZ___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >> confdefs.h <&6 -ac_lib_var=`echo dir'_'opendir | tr './+\055' '__p_'` +echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +echo "configure:1457: checking for opendir in -ldir" >&5 +ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__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="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=no" fi @@ -1268,30 +1493,32 @@ else fi else -echo $ac_n "checking for -lx""... $ac_c" 1>&6 -ac_lib_var=`echo x'_'opendir | tr './+\055' '__p_'` +echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +echo "configure:1498: checking for opendir in -lx" >&5 +ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__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="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=no" fi @@ -1309,29 +1536,30 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +echo "configure:1540: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include #include -int main() { return 0; } -int t() { +int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_time=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_header_time" 1>&6 @@ -1343,11 +1571,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 +echo "configure:1575: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1357,22 +1586,22 @@ else #ifndef WIFEXITED #define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -int main() { return 0; } -int t() { +int main() { int s; wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_sys_wait_h=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6 @@ -1385,24 +1614,27 @@ fi for ac_hdr in libc.h limits.h malloc.h memory.h string.h sys/ioctl.h sys/select.h sys/time.h sys/timeb.h sys/times.h sys/types.h sys/utime.h time.h unistd.h utime.h do -ac_safe=`echo "$ac_hdr" | tr './\055' '___'` +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:1620: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_$ac_safe=no" fi @@ -1410,7 +1642,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >> confdefs.h <&6 +echo "configure:1661: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_$ac_safe=no" fi @@ -1448,7 +1683,7 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >> confdefs.h <&6 +echo "configure:1698: checking "whether libc.h and unistd.h can be included together"" >&5 if eval "test \"`echo '$''{'guile_cv_header_libc_with_unistd'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1469,27 +1705,27 @@ else guile_cv_header_libc_with_unistd="yes" else cat > conftest.$ac_ext < # include -int main() { return 0; } -int t() { +int main() { ; return 0; } EOF -if { (eval echo configure:1484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* guile_cv_header_libc_with_unistd=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* guile_cv_header_libc_with_unistd=no fi rm -f conftest* - fi @@ -1506,11 +1742,12 @@ EOF echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +echo "configure:1746: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -1539,14 +1776,15 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 +echo "configure:1780: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then ac_cv_type_getgroups=cross else -cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:1813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then ac_cv_type_getgroups=gid_t else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_type_getgroups=int fi -fi rm -fr conftest* +fi + if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -1605,11 +1847,12 @@ EOF echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +echo "configure:1851: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1622,20 +1865,20 @@ extern "C" void (*signal (int, void (*)(int)))(int); void (*signal ()) (); #endif -int main() { return 0; } -int t() { +int main() { int i; ; return 0; } EOF -if { (eval echo configure:1631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_type_signal=int fi rm -f conftest* - fi echo "$ac_t""$ac_cv_type_signal" 1>&6 @@ -1645,19 +1888,21 @@ EOF echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +echo "configure:1892: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS #include +#include #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "mode_t" >/dev/null 2>&1; then + egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_mode_t=yes else @@ -1679,11 +1924,12 @@ fi for ac_func in ctermid ftime getcwd geteuid lstat mkdir mknod nice putenv readlink rename rmdir select setegid seteuid setlocale setpgid setsid strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1928: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` @@ -1733,11 +1980,12 @@ done for ac_func in inet_aton strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1984: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - : + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 LIBOBJS="$LIBOBJS ${ac_func}.o" fi - done + echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 +echo "configure:2040: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -int main() { return 0; } -int t() { +int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:1800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_struct_st_rdev=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_struct_st_rdev" 1>&6 @@ -1816,28 +2070,29 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 +echo "configure:2074: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -int main() { return 0; } -int t() { +int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:1833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_struct_st_blksize=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6 @@ -1849,28 +2104,29 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 +echo "configure:2108: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -int main() { return 0; } -int t() { +int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:1866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_struct_st_blocks=no fi rm -f conftest* - fi echo "$ac_t""$ac_cv_struct_st_blocks" 1>&6 @@ -1885,11 +2141,12 @@ fi echo $ac_n "checking whether we need POSIX to get struct utimbuf""... $ac_c" 1>&6 +echo "configure:2145: checking whether we need POSIX to get struct utimbuf" >&5 if eval "test \"`echo '$''{'guile_cv_struct_utimbuf_needs_posix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* guile_cv_struct_utimbuf_needs_posix=no else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* guile_cv_struct_utimbuf_needs_posix=yes fi @@ -1931,22 +2190,26 @@ EOF if test "$cross_compiling" = yes; then echo "configure: warning: Guessing that stack grows down -- see scmconfig.h.in" 1>&2 else -cat > conftest.$ac_ext < conftest.$ac_ext <= ((unsigned long)&x)); } main () { int q; aux((unsigned long)&q); } EOF -{ (eval echo configure:1942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:2201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then cat >> confdefs.h <<\EOF #define SCM_STACK_GROWS_UP 1 EOF -fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi rm -fr conftest* +fi + if test "$cross_compiling" = yes; then @@ -1956,43 +2219,48 @@ EOF echo "configure: warning: Guessing that sizeof(long) == sizeof(float) -- see scmconfig.h.in" 1>&2 else -cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then cat >> confdefs.h <<\EOF #define SCM_SINGLES 1 EOF -fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi rm -fr conftest* +fi + echo $ac_n "checking for struct linger""... $ac_c" 1>&6 +echo "configure:2243: checking for struct linger" >&5 if eval "test \"`echo '$''{'scm_cv_struct_linger'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -int main() { return 0; } -int t() { +int main() { struct linger lgr; lgr.l_linger = 100 ; return 0; } EOF -if { (eval echo configure:1988: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_linger="yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* scm_cv_struct_linger="no" fi rm -f conftest* - fi echo "$ac_t""$scm_cv_struct_linger" 1>&6 @@ -2013,40 +2281,42 @@ FD_SETTER="" if test "x$FD_SETTER" = x; then cat > conftest.$ac_ext < -int main() { return 0; } -int t() { +int main() { stdout->_file = 1 ; return 0; } EOF -if { (eval echo configure:2026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* FD_SETTER="((F)->_file = (D))" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi rm -f conftest* - fi if test "x$FD_SETTER" = x; then cat > conftest.$ac_ext < -int main() { return 0; } -int t() { +int main() { stdout->_fileno ; return 0; } EOF -if { (eval echo configure:2045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* FD_SETTER="((F)->_fileno = (D))" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi rm -f conftest* - fi @@ -2068,61 +2338,62 @@ EOF #-------------------------------------------------------------------- echo $ac_n "checking how to get buffer char count from FILE structure""... $ac_c" 1>&6 +echo "configure:2342: checking how to get buffer char count from FILE structure" >&5 if eval "test \"`echo '$''{'scm_cv_struct_file_count'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -int main() { return 0; } -int t() { +int main() { FILE *f = stdin; f->_cnt = 0 ; return 0; } EOF -if { (eval echo configure:2084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="_cnt" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < -int main() { return 0; } -int t() { +int main() { FILE *f = stdin; f->_r = 0 ; return 0; } EOF -if { (eval echo configure:2098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="_r" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < -int main() { return 0; } -int t() { +int main() { FILE *f = stdin; f->readCount = 0 ; return 0; } EOF -if { (eval echo configure:2112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_count="readCount" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* scm_cv_struct_file_count="" fi rm -f conftest* - fi rm -f conftest* - fi rm -f conftest* - fi if test "$scm_cv_struct_file_count"; then @@ -2136,23 +2407,23 @@ if eval "test \"`echo '$''{'scm_cv_struct_file_gptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -int main() { return 0; } -int t() { +int main() { FILE *f = stdin; f->_gptr = f->egptr; ; return 0; } EOF -if { (eval echo configure:2148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_gptr=1 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* scm_cv_struct_file_gptr="" fi rm -f conftest* - fi if test "$scm_cv_struct_gptr"; then @@ -2166,20 +2437,21 @@ if eval "test \"`echo '$''{'scm_cv_struct_file_readptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -int main() { return 0; } -int t() { +int main() { FILE *f = stdin; f->_IO_read_ptr = f->_IO_read_end; ; return 0; } EOF -if { (eval echo configure:2178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_file_readptr=1 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 fi rm -f conftest* - fi if test "$scm_cv_struct_file_readptr"; then @@ -2252,13 +2524,6 @@ EOF - - - - - - - trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -2276,11 +2541,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" \ - >> confcache + case `(ac_space=' '; set) 2>&1` in + *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 @@ -2335,7 +2614,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 ;; @@ -2344,6 +2623,7 @@ do done ac_given_srcdir=$srcdir +ac_given_INSTALL="$INSTALL" trap 'rm -fr `echo "Makefile fd.h scmconfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -2375,32 +2655,71 @@ 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%@module@%$module%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@RANLIB@%$RANLIB%g s%@LIBOBJS@%$LIBOBJS%g s%@FD_SETTER@%$FD_SETTER%g -s%@XINCLUDES@%$XINCLUDES%g -s%@GUILE_MAJOR_VERSION@%$GUILE_MAJOR_VERSION%g -s%@GUILE_MINOR_VERSION@%$GUILE_MINOR_VERSION%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 <> $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%/[^/][^/]*$%%'` @@ -2424,6 +2743,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." @@ -2432,13 +2756,16 @@ 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* # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where # NAME is the cpp macro being defined and VALUE is the value it is being given. @@ -2459,11 +2786,17 @@ ac_eB='$%\1#\2define\3' ac_eC=' ' ac_eD='%g' -CONFIG_HEADERS=${CONFIG_HEADERS-"scmconfig.h"} +if test "${CONFIG_HEADERS+set}" != set; then +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +fi for ac_file in .. $CONFIG_HEADERS; 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 @@ -2471,7 +2804,8 @@ for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - cp $ac_given_srcdir/$ac_file_in conftest.in + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in EOF @@ -2499,8 +2833,6 @@ EOF # Break up conftest.vals because some shells have a limit on # the size of here documents, and old seds have small limits too. -# Maximum number of lines to put in a single here document. -ac_max_here_lines=12 rm -f conftest.tail while : @@ -2542,8 +2874,14 @@ cat >> $CONFIG_STATUS <<\EOF fi fi; done +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +test -z "$CONFIG_HEADER" || echo timestamp > stamp-h + exit 0 EOF chmod +x $CONFIG_STATUS diff --git a/libguile/configure.in b/libguile/configure.in index bb6487438..3ce78e12a 100644 --- a/libguile/configure.in +++ b/libguile/configure.in @@ -1,7 +1,6 @@ AC_INIT(eval.c) -AC_CONFIG_HEADER(scmconfig.h) - -. $srcdir/../GUILE-VERSION +AM_CONFIG_HEADER(scmconfig.h) +AM_INIT_GUILE_MODULE(libguile) #-------------------------------------------------------------------- # @@ -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: diff --git a/libguile/scmconfig.h.in b/libguile/scmconfig.h.in index d0b292546..6440c7b8f 100644 --- a/libguile/scmconfig.h.in +++ b/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 diff --git a/libguile/stamp-h.in b/libguile/stamp-h.in new file mode 100644 index 000000000..e69de29bb diff --git a/qt/ChangeLog b/qt/ChangeLog index 8ac1d01e3..39ba4cb8f 100644 --- a/qt/ChangeLog +++ b/qt/ChangeLog @@ -1,3 +1,10 @@ +Sat Nov 30 23:59:06 1996 Tom Tromey + + * 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 * configure.in, Makefile.in: The 'install' and 'uninstall' diff --git a/qt/Makefile.am b/qt/Makefile.am new file mode 100644 index 000000000..bda848f19 --- /dev/null +++ b/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 diff --git a/qt/Makefile.in b/qt/Makefile.in index c1d160369..6d02e3481 100644 --- a/qt/Makefile.in +++ b/qt/Makefile.in @@ -1,131 +1,384 @@ -# Makefile for libqt -# -# Copyright (C) 1996, Free Software Foundation, Inc. -# -# This file is part of GNU GUILE. -# -# 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. +# 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 = $(prefix) -libdir = $(exec_prefix)/lib -includedir = $(prefix)/include/threads -infodir = $(prefix)/info +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 = . -CC = @CC@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - -DEFS = @DEFS@ -LIBS = @LIBS@ - -AR_FLAGS = rc +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@ -CFLAGS = -g -XCFLAGS = $(CFLAGS) -I. -LDFLAGS = -g +AUTOMAKE_OPTIONS = foreign -#### End of system configuration section. #### +SUBDIRS = md time -distfiles = .cvsignore CHANGES ChangeLog INSTALL Makefile.base \ - Makefile.in README README.MISC README.PORT b.h config configure \ - 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 +lib_LIBRARIES = @target_libs@ +EXTRA_LIBRARIES = libqt.a -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' -# target to select the appropriate files for distribution from the -# directory containing this Makefile. -.PHONY: dist-dir -dist-dir: - mkdir ${DISTDIR} - for f in ${distfiles}; do \ - ln ${srcdir}/$$f ${DISTDIR}; \ - done - mkdir ${DISTDIR}/PLUGIN - for f in ${plugin_distfiles}; do \ - ln ${srcdir}/PLUGIN/$$f ${DISTDIR}/PLUGIN; \ - done - mkdir ${DISTDIR}/md - for f in ${md_distfiles}; do \ - ln ${srcdir}/md/$$f ${DISTDIR}/md; \ - done - mkdir ${DISTDIR}/time - for f in ${time_distfiles}; do \ - ln ${srcdir}/time/$$f ${DISTDIR}/time; \ +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. + +@SET_MAKE@ + +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 -install: @target_install@ -install_qt: all - 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); +ID: $(HEADERS) $(SOURCES) + here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) -uninstall: @target_uninstall@ -uninstall_qt: - -rm -f $(libdir)/libqt.a - -rm -f $(includedir)/qt.h +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) + tags=; \ + here=`pwd`; \ + 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: - -rm -f guile - -rm -f $(all_objs) +clean-tags: -distclean: clean - -rm -f config.cache - -rm -f config.log - -rm -f config.status +distclean-tags: + rm -f TAGS ID -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: diff --git a/qt/aclocal.m4 b/qt/aclocal.m4 new file mode 100644 index 000000000..36f9ce0ae --- /dev/null +++ b/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_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_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_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" +) +]) + diff --git a/qt/configure b/qt/configure index c2075356f..d74651f57 100755 --- a/qt/configure +++ b/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. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# 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 <> confdefs.h <&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 <&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 - 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 + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +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 - if test $ac_cv_prog_gcc_g = yes; then - CFLAGS="-g -O" - else - CFLAGS="-O" - fi +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-O2" 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 < 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 < 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 < -int main() { return 0; } -int t() { +int main() { 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 < -int main() { return 0; } -int t() { +int main() { 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 < -int main() { return 0; } -int t() { +int main() { 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_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +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_install=install_qt - target_uninstall=uninstall_qt + target_libs=libqt.a else - target_all='' - target_install='' - target_uninstall='' + target_libs= 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" \ - >> confcache + case `(ac_space=' '; set) 2>&1` in + *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 <> $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 <> $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 <> $CONFIG_STATUS <<\EOF exit 0 EOF diff --git a/qt/configure.in b/qt/configure.in index 5aab26375..7038e19d5 100644 --- a/qt/configure.in +++ b/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_install=install_qt - target_uninstall=uninstall_qt + target_libs=libqt.a else - target_all='' - target_install='' - target_uninstall='' + target_libs= fi -AC_SUBST(target_all) -AC_SUBST(target_install) -AC_SUBST(target_uninstall) +AC_SUBST(target_libs) 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) diff --git a/qt/md/Makefile.am b/qt/md/Makefile.am new file mode 100644 index 000000000..aae2b5904 --- /dev/null +++ b/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 diff --git a/qt/md/Makefile.in b/qt/md/Makefile.in new file mode 100644 index 000000000..9861cce0f --- /dev/null +++ b/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: diff --git a/qt/time/Makefile.am b/qt/time/Makefile.am new file mode 100644 index 000000000..d56f14496 --- /dev/null +++ b/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 diff --git a/qt/time/Makefile.in b/qt/time/Makefile.in new file mode 100644 index 000000000..3f53ba9a0 --- /dev/null +++ b/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: diff --git a/threads.m4 b/threads.m4 new file mode 100644 index 000000000..0466e8c7b --- /dev/null +++ b/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_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_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_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" +) +])