summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/Makefile.in114
-rw-r--r--libguile/aclocal.m4340
-rwxr-xr-xlibguile/configure657
-rw-r--r--libguile/configure.in17
-rw-r--r--libguile/guile.c68
-rw-r--r--libguile/init.c1
-rw-r--r--libguile/libguile.h1
7 files changed, 487 insertions, 711 deletions
diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index cde3c58fe..d97b2975a 100644
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -67,6 +67,10 @@ AUTOMAKE_OPTIONS = foreign
INCLUDES = -I.. -I$(srcdir)/..
lib_LTLIBRARIES = libguile.la
+bin_PROGRAMS = guile
+
+guile_SOURCES = guile.c
+guile_LDADD = libguile.la ${THREAD_LIBS}
libguile_la_SOURCES = \
alist.c append.c appinit.c arbiters.c async.c boolean.c chars.c \
@@ -76,13 +80,14 @@ libguile_la_SOURCES = \
hashtab.c init.c ioext.c kw.c list.c load.c mallocs.c markers.c \
mbstrings.c net_db.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 stackchk.c stime.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
+ script.c sequences.c simpos.c smob.c socket.c stackchk.c stime.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_libguile_la_SOURCES = _scm.h \
backtrace.c stacks.c debug.c srcprop.c \
strerror.c inet_aton.c putenv.c \
- threads.c
+ threads.c alloca.c
noinst_HEADERS = coop-threads.c coop-threads.h coop.c
@@ -103,7 +108,7 @@ modinclude_HEADERS = __scm.h alist.h append.h arbiters.h async.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 net_db.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 \
+ procprop.h procs.h ramap.h read.h root.h scmhob.h scmsigs.h script.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 \
@@ -121,7 +126,7 @@ gh_test_c_LDADD = ${check_ldadd}
gh_test_repl_SOURCES = gh_test_repl.c
gh_test_repl_LDADD = ${check_ldadd}
-EXTRA_DIST = gscm.c gscm.h ChangeLog-scm dynl-dl.c dynl-dld.c dynl-shl.c \
+EXTRA_DIST = ChangeLog-scm dynl-dl.c dynl-dld.c dynl-shl.c \
dynl-vms.c DYNAMIC-LINKING PLUGIN/REQ PLUGIN/guile.config \
PLUGIN/guile.libs.in cpp_signal.c cpp_errno.c cpp_err_symbols.in \
cpp_sig_symbols.in cpp_cnvt.awk \
@@ -155,10 +160,15 @@ gh_io.lo gh_list.lo gh_predicates.lo gsubr.lo hash.lo hashtab.lo \
init.lo ioext.lo kw.lo list.lo load.lo mallocs.lo markers.lo \
mbstrings.lo net_db.lo numbers.lo objprop.lo options.lo pairs.lo \
ports.lo posix.lo print.lo procprop.lo procs.lo ramap.lo read.lo \
-root.lo scmsigs.lo sequences.lo simpos.lo smob.lo socket.lo stackchk.lo \
-stime.lo strings.lo strop.lo strorder.lo strports.lo struct.lo \
-symbols.lo tag.lo throw.lo unif.lo variable.lo vectors.lo version.lo \
-vports.lo weaks.lo
+root.lo scmsigs.lo script.lo sequences.lo simpos.lo smob.lo socket.lo \
+stackchk.lo stime.lo strings.lo strop.lo strorder.lo strports.lo \
+struct.lo symbols.lo tag.lo throw.lo unif.lo variable.lo vectors.lo \
+version.lo vports.lo weaks.lo
+PROGRAMS = $(bin_PROGRAMS)
+
+guile_OBJECTS = guile.o
+guile_DEPENDENCIES = libguile.la
+guile_LDFLAGS =
gh_test_c_OBJECTS = gh_test_c.o
gh_test_c_DEPENDENCIES = libguile.la
gh_test_c_LDFLAGS =
@@ -185,7 +195,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP = --best
-DEP_FILES = .deps/alist.P .deps/append.P .deps/appinit.P \
+DEP_FILES = .deps/alist.P .deps/alloca.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/dynl.P \
.deps/dynwind.P .deps/eq.P .deps/error.P .deps/eval.P .deps/extchrs.P \
@@ -193,20 +203,21 @@ DEP_FILES = .deps/alist.P .deps/append.P .deps/appinit.P \
.deps/gdbint.P .deps/genio.P .deps/gh_data.P .deps/gh_eval.P \
.deps/gh_funcs.P .deps/gh_init.P .deps/gh_io.P .deps/gh_list.P \
.deps/gh_predicates.P .deps/gh_test_c.P .deps/gh_test_repl.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/net_db.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/putenv.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/threads.P .deps/throw.P .deps/unif.P .deps/variable.P \
+.deps/gsubr.P .deps/guile.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/net_db.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/putenv.P .deps/ramap.P \
+.deps/read.P .deps/root.P .deps/scmsigs.P .deps/script.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/threads.P .deps/throw.P .deps/unif.P .deps/variable.P \
.deps/vectors.P .deps/version.P .deps/vports.P .deps/weaks.P
-SOURCES = $(libguile_la_SOURCES) $(EXTRA_libguile_la_SOURCES) $(gh_test_c_SOURCES) $(gh_test_repl_SOURCES)
-OBJECTS = $(libguile_la_OBJECTS) $(gh_test_c_OBJECTS) $(gh_test_repl_OBJECTS)
+SOURCES = $(libguile_la_SOURCES) $(EXTRA_libguile_la_SOURCES) $(guile_SOURCES) $(gh_test_c_SOURCES) $(gh_test_repl_SOURCES)
+OBJECTS = $(libguile_la_OBJECTS) $(guile_OBJECTS) $(gh_test_c_OBJECTS) $(gh_test_repl_OBJECTS)
default: all
@@ -303,6 +314,31 @@ maintainer-clean-libtool:
libguile.la: $(libguile_la_OBJECTS) $(libguile_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libguile_la_LDFLAGS) $(libguile_la_OBJECTS) $(libguile_la_LIBADD) $(LIBS)
+mostlyclean-binPROGRAMS:
+
+clean-binPROGRAMS:
+ test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+distclean-binPROGRAMS:
+
+maintainer-clean-binPROGRAMS:
+
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(bindir)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; \
+ done
+
+uninstall-binPROGRAMS:
+ $(NORMAL_UNINSTALL)
+ list='$(bin_PROGRAMS)'; for p in $$list; do \
+ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
+ done
+
mostlyclean-checkPROGRAMS:
clean-checkPROGRAMS:
@@ -312,6 +348,10 @@ distclean-checkPROGRAMS:
maintainer-clean-checkPROGRAMS:
+guile: $(guile_OBJECTS) $(guile_DEPENDENCIES)
+ @rm -f guile
+ $(LINK) $(guile_LDFLAGS) $(guile_OBJECTS) $(guile_LDADD) $(LIBS)
+
gh_test_c: $(gh_test_c_OBJECTS) $(gh_test_c_DEPENDENCIES)
@rm -f gh_test_c
$(LINK) $(gh_test_c_LDFLAGS) $(gh_test_c_OBJECTS) $(gh_test_c_LDADD) $(LIBS)
@@ -493,7 +533,7 @@ dvi:
check: all $(check_PROGRAMS)
$(MAKE)
installcheck:
-install-exec: install-libLTLIBRARIES install-binSCRIPTS
+install-exec: install-libLTLIBRARIES install-binPROGRAMS install-binSCRIPTS
@$(NORMAL_INSTALL)
install-data: install-modincludeDATA install-includeHEADERS install-modincludeHEADERS install-pkgincludeHEADERS
@@ -502,15 +542,15 @@ install-data: install-modincludeDATA install-includeHEADERS install-modincludeHE
install: install-exec install-data all
@:
-uninstall: uninstall-libLTLIBRARIES uninstall-binSCRIPTS uninstall-modincludeDATA uninstall-includeHEADERS uninstall-modincludeHEADERS uninstall-pkgincludeHEADERS
+uninstall: uninstall-libLTLIBRARIES uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-modincludeDATA uninstall-includeHEADERS uninstall-modincludeHEADERS uninstall-pkgincludeHEADERS
-all: $(LTLIBRARIES) $(SCRIPTS) $(DATA) $(HEADERS) Makefile scmconfig.h
+all: $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) Makefile scmconfig.h
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
installdirs:
- $(mkinstalldirs) $(libdir) $(bindir) $(modincludedir) $(includedir) \
- $(modincludedir) $(pkgincludedir)
+ $(mkinstalldirs) $(libdir) $(bindir) $(bindir) $(modincludedir) \
+ $(includedir) $(modincludedir) $(pkgincludedir)
mostlyclean-generic:
@@ -529,21 +569,23 @@ maintainer-clean-generic:
test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
mostlyclean: mostlyclean-hdr mostlyclean-libLTLIBRARIES \
mostlyclean-compile mostlyclean-libtool \
- mostlyclean-checkPROGRAMS mostlyclean-tags \
- mostlyclean-depend mostlyclean-generic
+ mostlyclean-binPROGRAMS mostlyclean-checkPROGRAMS \
+ mostlyclean-tags mostlyclean-depend mostlyclean-generic
clean: clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
- clean-checkPROGRAMS clean-tags clean-depend \
- clean-generic mostlyclean
+ clean-binPROGRAMS clean-checkPROGRAMS clean-tags \
+ clean-depend clean-generic mostlyclean
distclean: distclean-hdr distclean-libLTLIBRARIES distclean-compile \
- distclean-libtool distclean-checkPROGRAMS \
- distclean-tags distclean-depend distclean-generic clean
+ distclean-libtool distclean-binPROGRAMS \
+ distclean-checkPROGRAMS distclean-tags distclean-depend \
+ distclean-generic clean
rm -f config.status
rm -f libtool
maintainer-clean: maintainer-clean-hdr maintainer-clean-libLTLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \
+ maintainer-clean-binPROGRAMS \
maintainer-clean-checkPROGRAMS maintainer-clean-tags \
maintainer-clean-depend maintainer-clean-generic \
distclean
@@ -558,6 +600,8 @@ maintainer-clean-libLTLIBRARIES uninstall-libLTLIBRARIES \
install-libLTLIBRARIES mostlyclean-compile distclean-compile \
clean-compile maintainer-clean-compile mostlyclean-libtool \
distclean-libtool clean-libtool maintainer-clean-libtool \
+mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
+maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
mostlyclean-checkPROGRAMS distclean-checkPROGRAMS clean-checkPROGRAMS \
maintainer-clean-checkPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \
uninstall-modincludeDATA install-modincludeDATA \
diff --git a/libguile/aclocal.m4 b/libguile/aclocal.m4
index 7eda3e8f5..e69de29bb 100644
--- a/libguile/aclocal.m4
+++ b/libguile/aclocal.m4
@@ -1,340 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.1n
-
-dnl On the NeXT, #including <utime.h> doesn't give you a definition for
-dnl struct utime, unless you #define _POSIX_SOURCE.
-
-AC_DEFUN(GUILE_STRUCT_UTIMBUF, [
- AC_CACHE_CHECK([whether we need POSIX to get struct utimbuf],
- guile_cv_struct_utimbuf_needs_posix,
- [AC_TRY_CPP([
-#ifdef __EMX__
-#include <sys/utime.h>
-#else
-#include <utime.h>
-#endif
-struct utime blah;
-],
- guile_cv_struct_utimbuf_needs_posix=no,
- guile_cv_struct_utimbuf_needs_posix=yes)])
- if test "$guile_cv_struct_utimbuf_needs_posix" = yes; then
- AC_DEFINE(UTIMBUF_NEEDS_POSIX)
- fi])
-
-
-
-
-dnl
-dnl Apparently, at CMU they have a weird version of libc.h that is
-dnl installed in /usr/local/include and conflicts with unistd.h.
-dnl In these situations, we should not #include libc.h.
-dnl This test arranges to #define LIBC_H_WITH_UNISTD_H iff libc.h is
-dnl present on the system, and is safe to #include.
-dnl
-AC_DEFUN([GUILE_HEADER_LIBC_WITH_UNISTD],
- [
- AC_CHECK_HEADERS(libc.h unistd.h)
- AC_CACHE_CHECK(
- "whether libc.h and unistd.h can be included together",
- guile_cv_header_libc_with_unistd,
- [
- if test "$ac_cv_header_libc_h" = "no"; then
- guile_cv_header_libc_with_unistd="no"
- elif test "$ac_cv_header_unistd.h" = "no"; then
- guile_cv_header_libc_with_unistd="yes"
- else
- AC_TRY_COMPILE(
- [
-# include <libc.h>
-# include <unistd.h>
- ],
- [],
- [guile_cv_header_libc_with_unistd=yes],
- [guile_cv_header_libc_with_unistd=no]
- )
- fi
- ]
- )
- if test "$guile_cv_header_libc_with_unistd" = yes; then
- AC_DEFINE(LIBC_H_WITH_UNISTD_H)
- 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_HEADERS" || 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, no-define)
-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, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AM_SANITY_CHECK
-AC_ARG_PROGRAM
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-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])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
- if test "$@" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftestfile`
- fi
- 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 AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-if ($2 --version) > /dev/null 2>&1; then
- $1=$2
- AC_MSG_RESULT(found)
-else
- $1="$3/missing $2"
- AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN(AM_MAINTAINER_MODE,
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
- dnl maintainer-mode is disabled by default
- AC_ARG_ENABLE(maintainer-mode,
-[ --enable-maintainer-mode enable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer],
- USE_MAINTAINER_MODE=$enableval,
- USE_MAINTAINER_MODE=no)
- AC_MSG_RESULT($USE_MAINTAINER_MODE)
- if test $USE_MAINTAINER_MODE = yes; then
- MAINT=
- else
- MAINT='#M#'
- fi
- AC_SUBST(MAINT)dnl
-]
-)
-
-
-# serial 4 AM_PROG_LIBTOOL
-AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_RANLIB])
-
-# Always use our own libtool.
-LIBTOOL='$(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)
-
-dnl Allow the --disable-shared flag to stop us from building shared libs.
-AC_ARG_ENABLE(shared,
-[ --enable-shared build shared libraries [default=yes]],
-test "$enableval" = no && libtool_shared=" --disable-shared",
-libtool_shared=)
-
-libtool_flags="$libtool_shared"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-
-[case "$host" in
-*-*-irix6*)
- # For IRIX 6, ld needs -n32 if cc uses it.
- if echo " $CC $CFLAGS " | egrep -e '[ ]-n32[ ]' > /dev/null; then
- LD="${LD-ld} -n32"
- fi
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- CFLAGS="$CFLAGS -belf"
- ;;
-esac]
-
-# Actually configure libtool. ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LD="$LD" RANLIB="$RANLIB" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-])
-
-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="../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="../qt/libqt.a"
- fi
- fi
- if test "$use_threads" = pthreads; then
- # Look for pthreads in srcdir. See above to understand why
- # we always set threads_package.
- if test -f $srcdir/../../pthreads/pthreads/queue.c \
- || test -f $srcdir/../pthreads/pthreads/queue.c; then
- threads_package=MIT
- cy_cv_threads_cflags="-I$srcdir/../../pthreads/include"
- cy_cv_threads_libs="-L../../pthreads/lib -lpthread"
- fi
- fi
- saved_CPP="$CPPFLAGS"
- saved_LD="$LDFLAGS"
- saved_LIBS="$LIBS"
- if test "$threads_package" = unknown; then
-dnl
-dnl Test for the FSU threads package
-dnl
- CPPFLAGS="-I$use_threads/include"
- LDFLAGS="-L$use_threads/lib"
- LIBS="-lgthreads -lmalloc"
- AC_TRY_LINK([#include <pthread.h>],[
-pthread_equal(NULL,NULL);
-], threads_package=FSU)
- fi
- if test "$threads_package" = unknown; then
-dnl
-dnl Test for the MIT threads package
-dnl
- LIBS="-lpthread"
- AC_TRY_LINK([#include <pthread.h>],[
-pthread_equal(NULL,NULL);
-], threads_package=MIT)
- fi
- if test "$threads_package" = unknown; then
-dnl
-dnl Test for the PCthreads package
-dnl
- LIBS="-lpthreads"
- AC_TRY_LINK([#include <pthread.h>],[
-pthread_equal(NULL,NULL);
-], threads_package=PCthreads)
- fi
-dnl
-dnl Set the appropriate flags!
-dnl
- cy_cv_threads_cflags="$CPPFLAGS $cy_cv_threads_cflags"
- cy_cv_threads_libs="$LDFLAGS $LIBS $cy_cv_threads_libs"
- cy_cv_threads_package=$threads_package
- CPPFLAGS="$saved_CPP"
- LDFLAGS="$saved_LD"
- LIBS="$saved_LIBS"
- if test "$threads_package" = unknown; then
- AC_MSG_ERROR("cannot find thread library installation")
- fi
-fi
-])
-])
-],
-dnl
-dnl Set flags according to what is cached.
-dnl
-CPPFLAGS="$cy_cv_threads_cflags"
-LIBS="$cy_cv_threads_libs"
-)
-])
-
diff --git a/libguile/configure b/libguile/configure
index 98884ce31..85c2151e4 100755
--- a/libguile/configure
+++ b/libguile/configure
@@ -1268,159 +1268,13 @@ EOF
fi
-
-echo $ac_n "checking "threads package type"""... $ac_c" 1>&6
-echo "configure:1274: 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
-
-if eval "test \"`echo '$''{'cy_cv_threads_cflags'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
-if eval "test \"`echo '$''{'cy_cv_threads_libs'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
-use_threads=no;
-# Check whether --with-threads or --without-threads was given.
-if test "${with_threads+set}" = set; then
- withval="$with_threads"
- use_threads=$withval
-else
- use_threads=no
-fi
-
-test -n "$use_threads" || use_threads=qt
-threads_package=unknown
-if test "$use_threads" != no; then
- 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="../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="../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
- CPPFLAGS="-I$use_threads/include"
- LDFLAGS="-L$use_threads/lib"
- LIBS="-lgthreads -lmalloc"
- cat > conftest.$ac_ext <<EOF
-#line 1333 "configure"
-#include "confdefs.h"
-#include <pthread.h>
-int main() {
-
-pthread_equal(NULL,NULL);
-
-; return 0; }
-EOF
-if { (eval echo configure:1342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- threads_package=FSU
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
- fi
- if test "$threads_package" = unknown; then
- LIBS="-lpthread"
- cat > conftest.$ac_ext <<EOF
-#line 1354 "configure"
-#include "confdefs.h"
-#include <pthread.h>
-int main() {
-
-pthread_equal(NULL,NULL);
-
-; return 0; }
-EOF
-if { (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
- rm -rf conftest*
- threads_package=MIT
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
- fi
- if test "$threads_package" = unknown; then
- LIBS="-lpthreads"
- cat > conftest.$ac_ext <<EOF
-#line 1375 "configure"
-#include "confdefs.h"
-#include <pthread.h>
-int main() {
-
-pthread_equal(NULL,NULL);
-
-; return 0; }
-EOF
-if { (eval echo configure:1384: \"$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"
- cy_cv_threads_package=$threads_package
- CPPFLAGS="$saved_CPP"
- LDFLAGS="$saved_LD"
- LIBS="$saved_LIBS"
- if test "$threads_package" = unknown; then
- { echo "configure: error: "cannot find thread library installation"" 1>&2; exit 1; }
- fi
-fi
-
-fi
-
-
-fi
-
-
-fi
-
-echo "$ac_t""$cy_cv_threads_package" 1>&6
-
-CFLAGS="$CFLAGS $cy_cv_threads_cflags"
-THREAD_LIBS="$cy_cv_threads_libs"
-
-
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1419: checking for working const" >&5
+echo "configure:1273: 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 <<EOF
-#line 1424 "configure"
+#line 1278 "configure"
#include "confdefs.h"
int main() {
@@ -1469,7 +1323,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:1473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1491,12 +1345,12 @@ fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1495: checking for ANSI C header files" >&5
+echo "configure:1349: 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 <<EOF
-#line 1500 "configure"
+#line 1354 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1504,7 +1358,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1521,7 +1375,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
-#line 1525 "configure"
+#line 1379 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1539,7 +1393,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
-#line 1543 "configure"
+#line 1397 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1560,7 +1414,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1564 "configure"
+#line 1418 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1571,7 +1425,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1599,12 +1453,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1603: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1457: 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 <<EOF
-#line 1608 "configure"
+#line 1462 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1612,7 +1466,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:1616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1637,7 +1491,7 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1641: checking for opendir in -ldir" >&5
+echo "configure:1495: 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
@@ -1645,7 +1499,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1649 "configure"
+#line 1503 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1656,7 +1510,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1514: \"$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
@@ -1678,7 +1532,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1682: checking for opendir in -lx" >&5
+echo "configure:1536: 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
@@ -1686,7 +1540,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1690 "configure"
+#line 1544 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1697,7 +1551,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1555: \"$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
@@ -1720,12 +1574,12 @@ fi
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1724: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1578: 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 <<EOF
-#line 1729 "configure"
+#line 1583 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -1734,7 +1588,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:1738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -1755,12 +1609,12 @@ EOF
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1759: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:1613: 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 <<EOF
-#line 1764 "configure"
+#line 1618 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -1776,7 +1630,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:1780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -1800,17 +1654,17 @@ for ac_hdr in libc.h limits.h malloc.h memory.h string.h sys/ioctl.h sys/select.
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1804: checking for $ac_hdr" >&5
+echo "configure:1658: 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
-#line 1809 "configure"
+#line 1663 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1841,17 +1695,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1845: checking for $ac_hdr" >&5
+echo "configure:1699: 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
-#line 1850 "configure"
+#line 1704 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1878,7 +1732,7 @@ fi
done
echo $ac_n "checking "whether libc.h and unistd.h can be included together"""... $ac_c" 1>&6
-echo "configure:1882: checking "whether libc.h and unistd.h can be included together"" >&5
+echo "configure:1736: 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
@@ -1889,7 +1743,7 @@ else
guile_cv_header_libc_with_unistd="yes"
else
cat > conftest.$ac_ext <<EOF
-#line 1893 "configure"
+#line 1747 "configure"
#include "confdefs.h"
# include <libc.h>
@@ -1899,7 +1753,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:1903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
guile_cv_header_libc_with_unistd=yes
else
@@ -1926,12 +1780,12 @@ EOF
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:1930: checking for uid_t in sys/types.h" >&5
+echo "configure:1784: 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
-#line 1935 "configure"
+#line 1789 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -1960,7 +1814,7 @@ EOF
fi
echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:1964: checking type of array argument to getgroups" >&5
+echo "configure:1818: 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
@@ -1968,7 +1822,7 @@ else
ac_cv_type_getgroups=cross
else
cat > conftest.$ac_ext <<EOF
-#line 1972 "configure"
+#line 1826 "configure"
#include "confdefs.h"
/* Thanks to Mike Rendell for this test. */
@@ -1993,7 +1847,7 @@ main()
}
EOF
-if { (eval echo configure:1997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1851: \"$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
@@ -2007,7 +1861,7 @@ fi
if test $ac_cv_type_getgroups = cross; then
cat > conftest.$ac_ext <<EOF
-#line 2011 "configure"
+#line 1865 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
@@ -2031,12 +1885,12 @@ EOF
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2035: checking return type of signal handlers" >&5
+echo "configure:1889: 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 <<EOF
-#line 2040 "configure"
+#line 1894 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -2053,7 +1907,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:2057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -2072,12 +1926,12 @@ EOF
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:2076: checking for mode_t" >&5
+echo "configure:1930: 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 <<EOF
-#line 2081 "configure"
+#line 1935 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2108,12 +1962,12 @@ fi
for ac_func in ctermid ftime getcwd geteuid gettimeofday lstat mkdir mknod nice 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:2112: checking for $ac_func" >&5
+echo "configure:1966: 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 <<EOF
-#line 2117 "configure"
+#line 1971 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2136,7 +1990,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2164,12 +2018,12 @@ done
for ac_func in inet_aton putenv strerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2168: checking for $ac_func" >&5
+echo "configure:2022: 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 <<EOF
-#line 2173 "configure"
+#line 2027 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2192,7 +2046,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2222,19 +2076,19 @@ done
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2226: checking for working alloca.h" >&5
+echo "configure:2080: checking for working alloca.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2231 "configure"
+#line 2085 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:2238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -2255,12 +2109,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2259: checking for alloca" >&5
+echo "configure:2113: checking for alloca" >&5
if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2264 "configure"
+#line 2118 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -2283,7 +2137,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:2287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -2315,12 +2169,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2319: checking whether alloca needs Cray hooks" >&5
+echo "configure:2173: checking whether alloca needs Cray hooks" >&5
if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2324 "configure"
+#line 2178 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -2345,12 +2199,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2349: checking for $ac_func" >&5
+echo "configure:2203: 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 <<EOF
-#line 2354 "configure"
+#line 2208 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2373,7 +2227,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2400,7 +2254,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2404: checking stack direction for C alloca" >&5
+echo "configure:2258: checking stack direction for C alloca" >&5
if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2408,7 +2262,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 2412 "configure"
+#line 2266 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -2427,7 +2281,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:2431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -2450,12 +2304,12 @@ fi
echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:2454: checking for st_rdev in struct stat" >&5
+echo "configure:2308: 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 <<EOF
-#line 2459 "configure"
+#line 2313 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -2463,7 +2317,7 @@ int main() {
struct stat s; s.st_rdev;
; return 0; }
EOF
-if { (eval echo configure:2467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_rdev=yes
else
@@ -2484,12 +2338,12 @@ EOF
fi
echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:2488: checking for st_blksize in struct stat" >&5
+echo "configure:2342: 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 <<EOF
-#line 2493 "configure"
+#line 2347 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -2497,7 +2351,7 @@ int main() {
struct stat s; s.st_blksize;
; return 0; }
EOF
-if { (eval echo configure:2501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blksize=yes
else
@@ -2518,12 +2372,12 @@ EOF
fi
echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:2522: checking for st_blocks in struct stat" >&5
+echo "configure:2376: 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 <<EOF
-#line 2527 "configure"
+#line 2381 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -2531,7 +2385,7 @@ int main() {
struct stat s; s.st_blocks;
; return 0; }
EOF
-if { (eval echo configure:2535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blocks=yes
else
@@ -2554,12 +2408,12 @@ else
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:2558: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:2412: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2563 "configure"
+#line 2417 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -2567,7 +2421,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:2571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -2588,12 +2442,12 @@ EOF
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:2592: checking for tm_zone in struct tm" >&5
+echo "configure:2446: checking for tm_zone in struct tm" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2597 "configure"
+#line 2451 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -2601,7 +2455,7 @@ int main() {
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:2605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
@@ -2621,12 +2475,12 @@ EOF
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:2625: checking for tzname" >&5
+echo "configure:2479: checking for tzname" >&5
if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2630 "configure"
+#line 2484 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
@@ -2636,7 +2490,7 @@ int main() {
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
@@ -2659,12 +2513,12 @@ fi
echo $ac_n "checking whether we need POSIX to get struct utimbuf""... $ac_c" 1>&6
-echo "configure:2663: checking whether we need POSIX to get struct utimbuf" >&5
+echo "configure:2517: 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 <<EOF
-#line 2668 "configure"
+#line 2522 "configure"
#include "confdefs.h"
#ifdef __EMX__
@@ -2676,7 +2530,7 @@ struct utime blah;
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2704,29 +2558,23 @@ EOF
xtra_PLUGIN_guile_libs=""
-if test "$enable_dynamic_linking" = "yes"; then
-
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2711: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
+echo "configure:2563: checking for main in -lm" >&5
+ac_lib_var=`echo m'_'main | 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="-ldl $LIBS"
+LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2719 "configure"
+#line 2571 "configure"
#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen();
int main() {
-dlopen()
+main()
; return 0; }
EOF
-if { (eval echo configure:2730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2578: \"$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
@@ -2741,46 +2589,35 @@ 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 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
- LIBS="-ldl $LIBS"
+ LIBS="-lm $LIBS"
else
echo "$ac_t""no" 1>&6
fi
-if test "$ac_cv_lib_dl_dlopen" = "yes"; then
- xtra_PLUGIN_guile_libs="-lguile -ldl"
- cat >> confdefs.h <<\EOF
-#define DYNAMIC_LINKING 1
-EOF
-
-else
-echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:2765: checking for dld_link in -ldld" >&5
-ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
+echo "configure:2606: checking for main in -lsocket" >&5
+ac_lib_var=`echo socket'_'main | 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="-ldld $LIBS"
+LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2773 "configure"
+#line 2614 "configure"
#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dld_link();
int main() {
-dld_link()
+main()
; return 0; }
EOF
-if { (eval echo configure:2784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2621: \"$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
@@ -2795,42 +2632,35 @@ 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 dld | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
- LIBS="-ldld $LIBS"
+ LIBS="-lsocket $LIBS"
else
echo "$ac_t""no" 1>&6
fi
-if test "$ac_cv_lib_dld_dld_link" = "yes"; then
- xtra_PLUGIN_guile_libs="-lguile -ldld"
- cat >> confdefs.h <<\EOF
-#define DYNAMIC_LINKING 1
-EOF
-
-else
-echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:2819: checking for main in -lm" >&5
-ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
+echo "configure:2649: checking for main in -lnsl" >&5
+ac_lib_var=`echo nsl'_'main | 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="-lm $LIBS"
+LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2827 "configure"
+#line 2657 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2664: \"$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
@@ -2845,35 +2675,42 @@ 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 m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
- LIBS="-lm $LIBS"
+ LIBS="-lnsl $LIBS"
else
echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:2862: checking for main in -lsocket" >&5
-ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
+
+if test "$enable_dynamic_linking" = "yes"; then
+
+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:2695: checking for dlopen in -ldl" >&5
+ac_lib_var=`echo dl'_'dlopen | 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="-lsocket $LIBS"
+LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2870 "configure"
+#line 2703 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dlopen();
int main() {
-main()
+dlopen()
; return 0; }
EOF
-if { (eval echo configure:2877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2714: \"$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
@@ -2888,35 +2725,46 @@ 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 socket | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
- LIBS="-lsocket $LIBS"
+ LIBS="-ldl $LIBS"
else
echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:2905: checking for main in -lnsl" >&5
-ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
+if test "$ac_cv_lib_dl_dlopen" = "yes"; then
+ xtra_PLUGIN_guile_libs="-lguile -ldl"
+ cat >> confdefs.h <<\EOF
+#define DYNAMIC_LINKING 1
+EOF
+
+else
+echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
+echo "configure:2749: checking for dld_link in -ldld" >&5
+ac_lib_var=`echo dld'_'dld_link | 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="-lnsl $LIBS"
+LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2913 "configure"
+#line 2757 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char dld_link();
int main() {
-main()
+dld_link()
; return 0; }
EOF
-if { (eval echo configure:2920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2768: \"$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
@@ -2931,27 +2779,34 @@ 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 nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ ac_tr_lib=HAVE_LIB`echo dld | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
- LIBS="-lnsl $LIBS"
+ LIBS="-ldld $LIBS"
else
echo "$ac_t""no" 1>&6
fi
+if test "$ac_cv_lib_dld_dld_link" = "yes"; then
+ xtra_PLUGIN_guile_libs="-lguile -ldld"
+ cat >> confdefs.h <<\EOF
+#define DYNAMIC_LINKING 1
+EOF
+
+else
for ac_func in shl_load
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2950: checking for $ac_func" >&5
+echo "configure:2805: 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 <<EOF
-#line 2955 "configure"
+#line 2810 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2974,7 +2829,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3019,13 +2874,13 @@ 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 <<EOF
-#line 3023 "configure"
+#line 2878 "configure"
#include "confdefs.h"
aux (l) unsigned long l;
{ int x; exit (l >= ((unsigned long)&x)); }
main () { int q; aux((unsigned long)&q); }
EOF
-if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2884: \"$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
@@ -3048,11 +2903,11 @@ EOF
echo "configure: warning: Guessing that sizeof(long) == sizeof(float) -- see scmconfig.h.in" 1>&2
else
cat > conftest.$ac_ext <<EOF
-#line 3052 "configure"
+#line 2907 "configure"
#include "confdefs.h"
main () { exit (sizeof(float) != sizeof(long)); }
EOF
-if { (eval echo configure:3056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2911: \"$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
@@ -3067,12 +2922,12 @@ fi
echo $ac_n "checking for struct linger""... $ac_c" 1>&6
-echo "configure:3071: checking for struct linger" >&5
+echo "configure:2926: 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 <<EOF
-#line 3076 "configure"
+#line 2931 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -3081,7 +2936,7 @@ int main() {
struct linger lgr; lgr.l_linger = 100
; return 0; }
EOF
-if { (eval echo configure:3085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_struct_linger="yes"
else
@@ -3108,19 +2963,19 @@ fi
#--------------------------------------------------------------------
echo $ac_n "checking how to set a stream file descriptor""... $ac_c" 1>&6
-echo "configure:3112: checking how to set a stream file descriptor" >&5
+echo "configure:2967: checking how to set a stream file descriptor" >&5
if eval "test \"`echo '$''{'scm_cv_fd_setter'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3117 "configure"
+#line 2972 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
stdout->_file = 1
; return 0; }
EOF
-if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_fd_setter="_file"
else
@@ -3128,14 +2983,14 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 3132 "configure"
+#line 2987 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
stdout->_fileno = 1
; return 0; }
EOF
-if { (eval echo configure:3139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_fd_setter="_fileno"
else
@@ -3173,19 +3028,19 @@ fi
#--------------------------------------------------------------------
echo $ac_n "checking how to get buffer char count from FILE structure""... $ac_c" 1>&6
-echo "configure:3177: checking how to get buffer char count from FILE structure" >&5
+echo "configure:3032: 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 <<EOF
-#line 3182 "configure"
+#line 3037 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
FILE *f = stdin; f->_cnt = 0
; return 0; }
EOF
-if { (eval echo configure:3189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_struct_file_count="_cnt"
else
@@ -3193,14 +3048,14 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 3197 "configure"
+#line 3052 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
FILE *f = stdin; f->_r = 0
; return 0; }
EOF
-if { (eval echo configure:3204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_struct_file_count="_r"
else
@@ -3208,14 +3063,14 @@ else
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 3212 "configure"
+#line 3067 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
FILE *f = stdin; f->readCount = 0
; return 0; }
EOF
-if { (eval echo configure:3219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_struct_file_count="readCount"
else
@@ -3242,14 +3097,14 @@ 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 <<EOF
-#line 3246 "configure"
+#line 3101 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
FILE *f = stdin; f->_gptr = f->egptr;
; return 0; }
EOF
-if { (eval echo configure:3253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_struct_file_gptr=1
else
@@ -3272,14 +3127,14 @@ 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 <<EOF
-#line 3276 "configure"
+#line 3131 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
FILE *f = stdin; f->_IO_read_ptr = f->_IO_read_end;
; return 0; }
EOF
-if { (eval echo configure:3283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_struct_file_readptr=1
else
@@ -3307,6 +3162,152 @@ fi
#
#--------------------------------------------------------------------
+
+echo $ac_n "checking "threads package type"""... $ac_c" 1>&6
+echo "configure:3168: 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
+
+if eval "test \"`echo '$''{'cy_cv_threads_cflags'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+if eval "test \"`echo '$''{'cy_cv_threads_libs'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+
+use_threads=no;
+# Check whether --with-threads or --without-threads was given.
+if test "${with_threads+set}" = set; then
+ withval="$with_threads"
+ use_threads=$withval
+else
+ use_threads=no
+fi
+
+test -n "$use_threads" || use_threads=qt
+threads_package=unknown
+if test "$use_threads" != no; then
+ 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
+ CPPFLAGS="-I$use_threads/include"
+ LDFLAGS="-L$use_threads/lib"
+ LIBS="-lgthreads -lmalloc"
+ cat > conftest.$ac_ext <<EOF
+#line 3227 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
+
+pthread_equal(NULL,NULL);
+
+; return 0; }
+EOF
+if { (eval echo configure:3236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ threads_package=FSU
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+ fi
+ if test "$threads_package" = unknown; then
+ LIBS="-lpthread"
+ cat > conftest.$ac_ext <<EOF
+#line 3248 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
+
+pthread_equal(NULL,NULL);
+
+; return 0; }
+EOF
+if { (eval echo configure:3257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ rm -rf conftest*
+ threads_package=MIT
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+ fi
+ if test "$threads_package" = unknown; then
+ LIBS="-lpthreads"
+ cat > conftest.$ac_ext <<EOF
+#line 3269 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
+
+pthread_equal(NULL,NULL);
+
+; return 0; }
+EOF
+if { (eval echo configure:3278: \"$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"
+ cy_cv_threads_package=$threads_package
+ CPPFLAGS="$saved_CPP"
+ LDFLAGS="$saved_LD"
+ LIBS="$saved_LIBS"
+ if test "$threads_package" = unknown; then
+ { echo "configure: error: "cannot find thread library installation"" 1>&2; exit 1; }
+ fi
+fi
+
+fi
+
+
+fi
+
+
+fi
+
+echo "$ac_t""$cy_cv_threads_package" 1>&6
+
+CFLAGS="$CFLAGS $cy_cv_threads_cflags"
+THREAD_LIBS="$cy_cv_threads_libs"
+
+
if test "$cy_cv_threads_package" = FSU; then
cat >> confdefs.h <<\EOF
#define USE_FSU_PTHREADS 1
@@ -3353,7 +3354,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3357: checking for $ac_word" >&5
+echo "configure:3358: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3555,10 +3556,10 @@ s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g
s%@RANLIB@%$RANLIB%g
s%@LIBTOOL@%$LIBTOOL%g
-s%@THREAD_LIBS@%$THREAD_LIBS%g
s%@LIBOBJS@%$LIBOBJS%g
s%@ALLOCA@%$ALLOCA%g
s%@xtra_PLUGIN_guile_libs@%$xtra_PLUGIN_guile_libs%g
+s%@THREAD_LIBS@%$THREAD_LIBS%g
s%@AWK@%$AWK%g
s%@LIBLOBJS@%$LIBLOBJS%g
diff --git a/libguile/configure.in b/libguile/configure.in
index c5ed06a3e..ed5d8de08 100644
--- a/libguile/configure.in
+++ b/libguile/configure.in
@@ -36,11 +36,6 @@ AC_AIX
AC_ISC_POSIX
AC_MINIX
-CY_AC_WITH_THREADS
-CFLAGS="$CFLAGS $cy_cv_threads_cflags"
-THREAD_LIBS="$cy_cv_threads_libs"
-AC_SUBST(THREAD_LIBS)
-
AC_C_CONST
AC_HEADER_STDC
@@ -71,6 +66,10 @@ GUILE_STRUCT_UTIMBUF
xtra_PLUGIN_guile_libs=""
AC_SUBST(xtra_PLUGIN_guile_libs)
+AC_CHECK_LIB(m, main)
+AC_CHECK_LIB(socket, main)
+AC_CHECK_LIB(nsl, main)
+
if test "$enable_dynamic_linking" = "yes"; then
AC_CHECK_LIB(dl,dlopen)
@@ -83,9 +82,6 @@ if test "$ac_cv_lib_dld_dld_link" = "yes"; then
xtra_PLUGIN_guile_libs="-lguile -ldld"
AC_DEFINE(DYNAMIC_LINKING)
else
-AC_CHECK_LIB(m, main)
-AC_CHECK_LIB(socket, main)
-AC_CHECK_LIB(nsl, main)
AC_CHECK_FUNCS(shl_load)
if test "$ac_cv_func_shl_load" = "yes"; then
AC_DEFINE(DYNAMIC_LINKING)
@@ -203,6 +199,11 @@ fi
#
#--------------------------------------------------------------------
+CY_AC_WITH_THREADS
+CFLAGS="$CFLAGS $cy_cv_threads_cflags"
+THREAD_LIBS="$cy_cv_threads_libs"
+AC_SUBST(THREAD_LIBS)
+
dnl
dnl Set the appropriate flags!
dnl
diff --git a/libguile/guile.c b/libguile/guile.c
new file mode 100644
index 000000000..a93f16104
--- /dev/null
+++ b/libguile/guile.c
@@ -0,0 +1,68 @@
+/* Copyright (C) 1996, 1997 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.
+ *
+ * As a special exception, the Free Software Foundation gives permission
+ * for additional uses of the text contained in its release of GUILE.
+ *
+ * The exception is that, if you link the GUILE library with other files
+ * to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the GUILE library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the
+ * Free Software Foundation under the name GUILE. If you copy
+ * code from other Free Software Foundation releases into a copy of
+ * GUILE, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way. To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for GUILE, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ */
+
+/* This is the 'main' function for the `guile' executable. It is not
+ included in libguile.a.
+
+ Eventually, we hope this file will be automatically generated,
+ based on the list of installed, statically linked libraries on the
+ system. For now, please don't put interesting code in here. */
+
+#include <libguile.h>
+
+/* Debugger interface (don't change the order of the following lines) */
+#define GDB_TYPE SCM
+#include <libguile/gdb_interface.h>
+GDB_INTERFACE;
+
+static void
+inner_main (void *closure, int argc, char **argv)
+{
+ /* module initializations would go here */
+ scm_shell (argc, argv);
+}
+
+int
+main (int argc, char **argv)
+{
+ scm_boot_guile (argc, argv, inner_main, 0);
+ return 0; /* never reached */
+}
diff --git a/libguile/init.c b/libguile/init.c
index edb480a26..dc4c9b67a 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -441,6 +441,7 @@ scm_boot_guile_1 (base, closure)
scm_init_load_path ();
scm_init_standard_ports ();
scm_init_dynamic_linking ();
+ scm_init_script ();
initialized = 1;
}
diff --git a/libguile/libguile.h b/libguile/libguile.h
index a35a09b11..b3db2ec51 100644
--- a/libguile/libguile.h
+++ b/libguile/libguile.h
@@ -99,6 +99,7 @@
#include "libguile/read.h"
#include "libguile/root.h"
#include "libguile/scmsigs.h"
+#include "libguile/script.h"
#include "libguile/sequences.h"
#include "libguile/simpos.h"
#include "libguile/snarf.h"