summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--INSTALL2
-rw-r--r--acconfig.h3
-rwxr-xr-xconfigure461
-rw-r--r--configure.in7
-rw-r--r--libguile/Makefile.am6
-rw-r--r--libguile/Makefile.in18
-rw-r--r--libguile/dynwind.c32
-rw-r--r--libguile/eval.c6
-rw-r--r--libguile/init.c4
-rw-r--r--libguile/print.c2
-rw-r--r--libguile/scmconfig.h.in3
-rw-r--r--libguile/tags.h2
13 files changed, 247 insertions, 305 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e167329f..05a6a3588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-1999-07-27 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
-
- * acconfig.h (GUILE_LANG): New configuration variable.
-
- * configure.in: Added option --enable-lang.
-
1999-07-24 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
* README, config.guess, config.sub, liconfig, ltmain.sh: Switched
diff --git a/INSTALL b/INSTALL
index 6653db658..c18b0d23f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -88,8 +88,6 @@ not support dynamic linking.
This option has no effect on systems that do not support shared
libraries.
---enable-lang --- Include experimental multilanguage support in libguile.
-
--disable-shared --- Do not build shared libraries. Normally, Guile
will build shared libraries if your system supports them. Guile
always builds static libraries.
diff --git a/acconfig.h b/acconfig.h
index cab27cabc..f920ea44a 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -95,9 +95,6 @@
the Guile library itself. */
#undef GUILE_DEBUG
-/* Define this to include experimental multilanguage support. */
-#undef GUILE_LANG
-
/* Define to implement scm_internal_select */
#undef GUILE_ISELECT
diff --git a/configure b/configure
index d8ddb38aa..27c44bc0b 100755
--- a/configure
+++ b/configure
@@ -19,8 +19,6 @@ ac_help="$ac_help
ac_help="$ac_help
--enable-guile-debug Include internal debugging functions"
ac_help="$ac_help
- --enable-lang Include multilanguage support (experimental)"
-ac_help="$ac_help
--enable-shared[=PKGS] build shared libraries [default=yes]"
ac_help="$ac_help
--enable-static[=PKGS] build static libraries [default=yes]"
@@ -574,7 +572,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
# 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:578: checking for a BSD compatible install" >&5
+echo "configure:576: 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
@@ -627,7 +625,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:631: checking whether build environment is sane" >&5
+echo "configure:629: checking whether build environment is sane" >&5
# Just in case
sleep 1
echo timestamp > conftestfile
@@ -684,7 +682,7 @@ test "$program_suffix" != NONE &&
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:688: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:686: 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
@@ -723,7 +721,7 @@ fi
missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:727: checking for working aclocal" >&5
+echo "configure:725: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -736,7 +734,7 @@ else
fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:740: checking for working autoconf" >&5
+echo "configure:738: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -749,7 +747,7 @@ else
fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:753: checking for working automake" >&5
+echo "configure:751: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -762,7 +760,7 @@ else
fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:766: checking for working autoheader" >&5
+echo "configure:764: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -775,7 +773,7 @@ else
fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:779: checking for working makeinfo" >&5
+echo "configure:777: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh.
@@ -789,7 +787,7 @@ fi
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:793: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:791: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -851,19 +849,6 @@ EOF
fi
-# Check whether --enable-lang or --disable-lang was given.
-if test "${enable_lang+set}" = set; then
- enableval="$enable_lang"
- if test "$enable_lang" = y || test "$enable_lang" = yes; then
- cat >> confdefs.h <<\EOF
-#define GUILE_LANG 1
-EOF
-
- LIBOBJS="$LIBOBJS lang.o"
- fi
-fi
-
-
cat >> confdefs.h <<\EOF
#define DEBUG_EXTENSIONS 1
EOF
@@ -878,7 +863,7 @@ EOF
# 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:882: checking for $ac_word" >&5
+echo "configure:867: 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
@@ -908,7 +893,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:912: checking for $ac_word" >&5
+echo "configure:897: 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
@@ -959,7 +944,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:963: checking for $ac_word" >&5
+echo "configure:948: 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
@@ -991,7 +976,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:995: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:980: 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.
@@ -1002,12 +987,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 1006 "configure"
+#line 991 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
@@ -1033,12 +1018,12 @@ 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:1037: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1022: 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:1042: checking whether we are using GNU C" >&5
+echo "configure:1027: 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
@@ -1047,7 +1032,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1051: \"$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:1036: \"$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
@@ -1066,7 +1051,7 @@ 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:1070: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1055: 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
@@ -1098,7 +1083,7 @@ else
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1102: checking how to run the C preprocessor" >&5
+echo "configure:1087: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1113,13 +1098,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1117 "configure"
+#line 1102 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1130,13 +1115,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1134 "configure"
+#line 1119 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1147,13 +1132,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1151 "configure"
+#line 1136 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1253,7 +1238,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:1257: checking host system type" >&5
+echo "configure:1242: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -1274,7 +1259,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1278: checking build system type" >&5
+echo "configure:1263: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -1294,7 +1279,7 @@ echo "$ac_t""$build" 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:1298: checking for $ac_word" >&5
+echo "configure:1283: 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
@@ -1333,7 +1318,7 @@ ac_prog=ld
if test "$ac_cv_prog_gcc" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1337: checking for ld used by GCC" >&5
+echo "configure:1322: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
@@ -1357,10 +1342,10 @@ echo "configure:1337: checking for ld used by GCC" >&5
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1361: checking for GNU ld" >&5
+echo "configure:1346: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1364: checking for non-GNU ld" >&5
+echo "configure:1349: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1396,7 +1381,7 @@ fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1400: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1385: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1412,7 +1397,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1416: checking for BSD-compatible nm" >&5
+echo "configure:1401: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1449,7 +1434,7 @@ echo "$ac_t""$NM" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1453: checking whether ln -s works" >&5
+echo "configure:1438: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1493,8 +1478,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
case "$host" in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 1497 "configure"' > conftest.$ac_ext
- if { (eval echo configure:1498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ echo '#line 1482 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:1483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
LD="${LD-ld} -32"
@@ -1515,19 +1500,19 @@ case "$host" in
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1519: checking whether the C compiler needs -belf" >&5
+echo "configure:1504: checking whether the C compiler needs -belf" >&5
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1524 "configure"
+#line 1509 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
lt_cv_cc_needs_belf=yes
else
@@ -1630,9 +1615,9 @@ exec 5>>./config.log
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1634: checking for AIX" >&5
+echo "configure:1619: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 1636 "configure"
+#line 1621 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -1654,7 +1639,7 @@ rm -f conftest*
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1658: checking for POSIXized ISC" >&5
+echo "configure:1643: 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
@@ -1676,17 +1661,17 @@ fi
ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1680: checking for minix/config.h" >&5
+echo "configure:1665: 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
-#line 1685 "configure"
+#line 1670 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1690: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1728,7 +1713,7 @@ fi
echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1732: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:1717: checking for ${CC-cc} option to accept ANSI C" >&5
if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1744,7 +1729,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__
do
CC="$ac_save_CC $ac_arg"
cat > conftest.$ac_ext <<EOF
-#line 1748 "configure"
+#line 1733 "configure"
#include "confdefs.h"
#include <stdarg.h>
#include <stdio.h>
@@ -1781,7 +1766,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
; return 0; }
EOF
-if { (eval echo configure:1785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_prog_cc_stdc="$ac_arg"; break
else
@@ -1806,12 +1791,12 @@ esac
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1810: checking for working const" >&5
+echo "configure:1795: 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 1815 "configure"
+#line 1800 "configure"
#include "confdefs.h"
int main() {
@@ -1860,7 +1845,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:1864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1881,21 +1866,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1885: checking for inline" >&5
+echo "configure:1870: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 1892 "configure"
+#line 1877 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:1899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -1921,7 +1906,7 @@ EOF
esac
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1925: checking size of int" >&5
+echo "configure:1910: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1929,7 +1914,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1933 "configure"
+#line 1918 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1940,7 +1925,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_int=`cat conftestval`
else
@@ -1960,7 +1945,7 @@ EOF
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1964: checking size of long" >&5
+echo "configure:1949: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1968,7 +1953,7 @@ else
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
cat > conftest.$ac_ext <<EOF
-#line 1972 "configure"
+#line 1957 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1979,7 +1964,7 @@ main()
exit(0);
}
EOF
-if { (eval echo configure:1983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_sizeof_long=`cat conftestval`
else
@@ -1999,19 +1984,19 @@ EOF
echo $ac_n "checking for long longs""... $ac_c" 1>&6
-echo "configure:2003: checking for long longs" >&5
+echo "configure:1988: checking for long longs" >&5
if eval "test \"`echo '$''{'scm_cv_long_longs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2008 "configure"
+#line 1993 "configure"
#include "confdefs.h"
int main() {
long long a
; return 0; }
EOF
-if { (eval echo configure:2015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_long_longs=yes
else
@@ -2032,12 +2017,12 @@ EOF
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2036: checking for ANSI C header files" >&5
+echo "configure:2021: 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 2041 "configure"
+#line 2026 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -2045,7 +2030,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2062,7 +2047,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 2066 "configure"
+#line 2051 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -2080,7 +2065,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 2084 "configure"
+#line 2069 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -2101,7 +2086,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 2105 "configure"
+#line 2090 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2112,7 +2097,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:2116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2140,12 +2125,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:2144: checking for $ac_hdr that defines DIR" >&5
+echo "configure:2129: 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 2149 "configure"
+#line 2134 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -2153,7 +2138,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:2157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -2178,7 +2163,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:2182: checking for opendir in -ldir" >&5
+echo "configure:2167: 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
@@ -2186,7 +2171,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2190 "configure"
+#line 2175 "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
@@ -2197,7 +2182,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:2201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2219,7 +2204,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:2223: checking for opendir in -lx" >&5
+echo "configure:2208: 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
@@ -2227,7 +2212,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2231 "configure"
+#line 2216 "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
@@ -2238,7 +2223,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2261,12 +2246,12 @@ fi
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2265: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2250: 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 2270 "configure"
+#line 2255 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -2275,7 +2260,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:2279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -2296,12 +2281,12 @@ EOF
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2300: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2285: 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 2305 "configure"
+#line 2290 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -2317,7 +2302,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2341,17 +2326,17 @@ for ac_hdr in io.h libc.h limits.h malloc.h memory.h string.h regex.h rxposix.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2345: checking for $ac_hdr" >&5
+echo "configure:2330: 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 2350 "configure"
+#line 2335 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2382,17 +2367,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2386: checking for $ac_hdr" >&5
+echo "configure:2371: 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 2391 "configure"
+#line 2376 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2419,7 +2404,7 @@ fi
done
echo $ac_n "checking "whether libc.h and unistd.h can be included together"""... $ac_c" 1>&6
-echo "configure:2423: checking "whether libc.h and unistd.h can be included together"" >&5
+echo "configure:2408: 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
@@ -2430,7 +2415,7 @@ else
guile_cv_header_libc_with_unistd="yes"
else
cat > conftest.$ac_ext <<EOF
-#line 2434 "configure"
+#line 2419 "configure"
#include "confdefs.h"
# include <libc.h>
@@ -2440,7 +2425,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:2444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
guile_cv_header_libc_with_unistd=yes
else
@@ -2467,12 +2452,12 @@ EOF
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2471: checking for uid_t in sys/types.h" >&5
+echo "configure:2456: 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 2476 "configure"
+#line 2461 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -2501,7 +2486,7 @@ EOF
fi
echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:2505: checking type of array argument to getgroups" >&5
+echo "configure:2490: 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
@@ -2509,7 +2494,7 @@ else
ac_cv_type_getgroups=cross
else
cat > conftest.$ac_ext <<EOF
-#line 2513 "configure"
+#line 2498 "configure"
#include "confdefs.h"
/* Thanks to Mike Rendell for this test. */
@@ -2534,7 +2519,7 @@ main()
}
EOF
-if { (eval echo configure:2538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_type_getgroups=gid_t
else
@@ -2548,7 +2533,7 @@ fi
if test $ac_cv_type_getgroups = cross; then
cat > conftest.$ac_ext <<EOF
-#line 2552 "configure"
+#line 2537 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
@@ -2572,12 +2557,12 @@ EOF
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2576: checking return type of signal handlers" >&5
+echo "configure:2561: 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 2581 "configure"
+#line 2566 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -2594,7 +2579,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:2598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -2613,12 +2598,12 @@ EOF
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:2617: checking for mode_t" >&5
+echo "configure:2602: 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 2622 "configure"
+#line 2607 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2647,7 +2632,7 @@ fi
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:2651: checking for main in -lm" >&5
+echo "configure:2636: 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
@@ -2655,14 +2640,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2659 "configure"
+#line 2644 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:2666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2692,12 +2677,12 @@ fi
for ac_func in gethostbyname
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2696: checking for $ac_func" >&5
+echo "configure:2681: 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 2701 "configure"
+#line 2686 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2720,7 +2705,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2746,7 +2731,7 @@ done
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2750: checking for gethostbyname in -lnsl" >&5
+echo "configure:2735: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2754,7 +2739,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2758 "configure"
+#line 2743 "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
@@ -2765,7 +2750,7 @@ int main() {
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:2769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2796,12 +2781,12 @@ fi
for ac_func in connect
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2800: checking for $ac_func" >&5
+echo "configure:2785: 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 2805 "configure"
+#line 2790 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2824,7 +2809,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2850,7 +2835,7 @@ done
if test $ac_cv_func_connect = no; then
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:2854: checking for connect in -lsocket" >&5
+echo "configure:2839: checking for connect in -lsocket" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2858,7 +2843,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2862 "configure"
+#line 2847 "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
@@ -2869,7 +2854,7 @@ int main() {
connect()
; return 0; }
EOF
-if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2903,7 +2888,7 @@ fi
if test "$enable_dynamic_linking" = "yes"; then
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2907: checking for dlopen in -ldl" >&5
+echo "configure:2892: 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
@@ -2911,7 +2896,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2915 "configure"
+#line 2900 "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
@@ -2922,7 +2907,7 @@ int main() {
dlopen()
; return 0; }
EOF
-if { (eval echo configure:2926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2953,12 +2938,12 @@ if test "$ac_cv_lib_dl_dlopen" = "yes"; then
for ac_func in dlopen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2957: checking for $ac_func" >&5
+echo "configure:2942: 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 2962 "configure"
+#line 2947 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2981,7 +2966,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3011,7 +2996,7 @@ EOF
else
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:3015: checking for dld_link in -ldld" >&5
+echo "configure:3000: 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
@@ -3019,7 +3004,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3023 "configure"
+#line 3008 "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
@@ -3030,7 +3015,7 @@ int main() {
dld_link()
; return 0; }
EOF
-if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3066,12 +3051,12 @@ else
for ac_func in shl_load
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3070: checking for $ac_func" >&5
+echo "configure:3055: 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 3075 "configure"
+#line 3060 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3094,7 +3079,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3127,12 +3112,12 @@ else
for ac_func in dlopen
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3131: checking for $ac_func" >&5
+echo "configure:3116: 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 3136 "configure"
+#line 3121 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3155,7 +3140,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3193,7 +3178,7 @@ fi
echo $ac_n "checking for underscore before symbols""... $ac_c" 1>&6
-echo "configure:3197: checking for underscore before symbols" >&5
+echo "configure:3182: checking for underscore before symbols" >&5
if eval "test \"`echo '$''{'guile_cv_uscore'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3219,7 +3204,7 @@ EOF
if test $ac_cv_func_dlopen = yes -o $ac_cv_lib_dl_dlopen = yes ; then
echo $ac_n "checking whether dlsym always adds an underscore for us""... $ac_c" 1>&6
-echo "configure:3223: checking whether dlsym always adds an underscore for us" >&5
+echo "configure:3208: checking whether dlsym always adds an underscore for us" >&5
if eval "test \"`echo '$''{'guile_cv_dlsym_adds_uscore'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3227,7 +3212,7 @@ else
guile_cv_dlsym_adds_uscore=no
else
cat > conftest.$ac_ext <<EOF
-#line 3231 "configure"
+#line 3216 "configure"
#include "confdefs.h"
#include <dlfcn.h>
@@ -3238,7 +3223,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY);
if(ptr1 && !ptr2) exit(0); } exit(1); }
EOF
-if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
guile_cv_dlsym_adds_uscore=yes
cat >> confdefs.h <<\EOF
@@ -3265,12 +3250,12 @@ fi
for ac_func in ctermid ftime getcwd geteuid gettimeofday lstat mkdir mknod nice readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid bzero strdup system usleep
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3269: checking for $ac_func" >&5
+echo "configure:3254: 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 3274 "configure"
+#line 3259 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3293,7 +3278,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3329,12 +3314,12 @@ done
echo $ac_n "checking for strptime declaration""... $ac_c" 1>&6
-echo "configure:3333: checking for strptime declaration" >&5
+echo "configure:3318: checking for strptime declaration" >&5
if eval "test \"`echo '$''{'guile_cv_func_strptime_declared'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3338 "configure"
+#line 3323 "configure"
#include "confdefs.h"
#include <time.h>
EOF
@@ -3360,12 +3345,12 @@ EOF
echo $ac_n "checking for bzero declaration""... $ac_c" 1>&6
-echo "configure:3364: checking for bzero declaration" >&5
+echo "configure:3349: checking for bzero declaration" >&5
if eval "test \"`echo '$''{'guile_cv_func_bzero_declared'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3369 "configure"
+#line 3354 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -3391,12 +3376,12 @@ EOF
echo $ac_n "checking for sleep declaration""... $ac_c" 1>&6
-echo "configure:3395: checking for sleep declaration" >&5
+echo "configure:3380: checking for sleep declaration" >&5
if eval "test \"`echo '$''{'guile_cv_func_sleep_declared'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3400 "configure"
+#line 3385 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
@@ -3422,12 +3407,12 @@ EOF
echo $ac_n "checking for usleep declaration""... $ac_c" 1>&6
-echo "configure:3426: checking for usleep declaration" >&5
+echo "configure:3411: checking for usleep declaration" >&5
if eval "test \"`echo '$''{'guile_cv_func_usleep_declared'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3431 "configure"
+#line 3416 "configure"
#include "confdefs.h"
#include <unistd.h>
EOF
@@ -3455,12 +3440,12 @@ EOF
### On some systems usleep has no return value. If it does have one,
### we'd like to return it; otherwise, we'll fake it.
echo $ac_n "checking return type of usleep""... $ac_c" 1>&6
-echo "configure:3459: checking return type of usleep" >&5
+echo "configure:3444: checking return type of usleep" >&5
if eval "test \"`echo '$''{'guile_cv_func_usleep_return_type'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3464 "configure"
+#line 3449 "configure"
#include "confdefs.h"
#include </usr/include/unistd.h>
EOF
@@ -3489,17 +3474,17 @@ esac
ac_safe=`echo "sys/un.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/un.h""... $ac_c" 1>&6
-echo "configure:3493: checking for sys/un.h" >&5
+echo "configure:3478: checking for sys/un.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
-#line 3498 "configure"
+#line 3483 "configure"
#include "confdefs.h"
#include <sys/un.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3530,12 +3515,12 @@ fi
for ac_func in socketpair getgroups setpwent pause tzset
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3534: checking for $ac_func" >&5
+echo "configure:3519: 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 3539 "configure"
+#line 3524 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3558,7 +3543,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3589,12 +3574,12 @@ done
for ac_func in sethostent gethostent endhostent setnetent getnetent endnetent setprotoent getprotoent endprotoent setservent getservent endservent getnetbyaddr getnetbyname inet_lnaof inet_makeaddr inet_netof
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3593: checking for $ac_func" >&5
+echo "configure:3578: 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 3598 "configure"
+#line 3583 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3617,7 +3602,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3644,20 +3629,20 @@ done
echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
-echo "configure:3648: checking for restartable system calls" >&5
+echo "configure:3633: checking for restartable system calls" >&5
if eval "test \"`echo '$''{'scm_cv_restarts'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test $ac_cv_func_sigaction = yes; then
cat > conftest.$ac_ext <<EOF
-#line 3654 "configure"
+#line 3639 "configure"
#include "confdefs.h"
#include <signal.h>
int main() {
int a = SA_RESTART
; return 0; }
EOF
-if { (eval echo configure:3661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_restarts=yes
else
@@ -3684,12 +3669,12 @@ if test "$ac_cv_header_regex_h" = yes ||
test "$ac_cv_header_rxposix_h" = yes ||
test "$ac_cv_header_rx_rxposix_h" = yes; then
echo $ac_n "checking for regcomp""... $ac_c" 1>&6
-echo "configure:3688: checking for regcomp" >&5
+echo "configure:3673: checking for regcomp" >&5
if eval "test \"`echo '$''{'ac_cv_func_regcomp_norx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3693 "configure"
+#line 3678 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char regcomp(); below. */
@@ -3712,7 +3697,7 @@ regcomp();
; return 0; }
EOF
-if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_regcomp_norx=yes"
else
@@ -3730,7 +3715,7 @@ if eval "test \"`echo '$ac_cv_func_'regcomp'_'norx`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for main in -lrx""... $ac_c" 1>&6
-echo "configure:3734: checking for main in -lrx" >&5
+echo "configure:3719: checking for main in -lrx" >&5
ac_lib_var=`echo rx'_'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
@@ -3738,14 +3723,14 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lrx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3742 "configure"
+#line 3727 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3773,12 +3758,12 @@ else
fi
echo $ac_n "checking for regcomp""... $ac_c" 1>&6
-echo "configure:3777: checking for regcomp" >&5
+echo "configure:3762: checking for regcomp" >&5
if eval "test \"`echo '$''{'ac_cv_func_regcomp_rx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3782 "configure"
+#line 3767 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char regcomp(); below. */
@@ -3801,7 +3786,7 @@ regcomp();
; return 0; }
EOF
-if { (eval echo configure:3805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_regcomp_rx=yes"
else
@@ -3835,12 +3820,12 @@ fi
for ac_func in inet_aton putenv strerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3839: checking for $ac_func" >&5
+echo "configure:3824: 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 3844 "configure"
+#line 3829 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -3863,7 +3848,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:3867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -3896,19 +3881,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:3900: checking for working alloca.h" >&5
+echo "configure:3885: 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 3905 "configure"
+#line 3890 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:3912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -3929,12 +3914,12 @@ EOF
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:3933: checking for alloca" >&5
+echo "configure:3918: 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 3938 "configure"
+#line 3923 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -3962,7 +3947,7 @@ int main() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:3966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
@@ -3994,12 +3979,12 @@ EOF
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:3998: checking whether alloca needs Cray hooks" >&5
+echo "configure:3983: 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 4003 "configure"
+#line 3988 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -4024,12 +4009,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:4028: checking for $ac_func" >&5
+echo "configure:4013: 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 4033 "configure"
+#line 4018 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4052,7 +4037,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:4056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -4079,7 +4064,7 @@ done
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:4083: checking stack direction for C alloca" >&5
+echo "configure:4068: 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
@@ -4087,7 +4072,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 4091 "configure"
+#line 4076 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -4106,7 +4091,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:4110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_c_stack_direction=1
else
@@ -4130,12 +4115,12 @@ fi
if test "$ALLOCA" = "alloca.o"; then LIBOBJS="alloca.o $LIBOBJS"; fi
echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:4134: checking for st_rdev in struct stat" >&5
+echo "configure:4119: 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 4139 "configure"
+#line 4124 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -4143,7 +4128,7 @@ int main() {
struct stat s; s.st_rdev;
; return 0; }
EOF
-if { (eval echo configure:4147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_rdev=yes
else
@@ -4164,12 +4149,12 @@ EOF
fi
echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:4168: checking for st_blksize in struct stat" >&5
+echo "configure:4153: 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 4173 "configure"
+#line 4158 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -4177,7 +4162,7 @@ int main() {
struct stat s; s.st_blksize;
; return 0; }
EOF
-if { (eval echo configure:4181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blksize=yes
else
@@ -4201,12 +4186,12 @@ fi
# We could use AC_STRUCT_ST_BLOCKS here, but that adds fileblocks.o to
# LIBOBJS, which we don't need. This seems more direct.
echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:4205: checking for st_blocks in struct stat" >&5
+echo "configure:4190: 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 4210 "configure"
+#line 4195 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -4214,7 +4199,7 @@ int main() {
struct stat s; s.st_blocks;
; return 0; }
EOF
-if { (eval echo configure:4218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blocks=yes
else
@@ -4235,12 +4220,12 @@ EOF
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4239: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4224: 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 4244 "configure"
+#line 4229 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -4248,7 +4233,7 @@ int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:4252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -4269,12 +4254,12 @@ EOF
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4273: checking for tm_zone in struct tm" >&5
+echo "configure:4258: 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 4278 "configure"
+#line 4263 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -4282,7 +4267,7 @@ int main() {
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:4286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
@@ -4302,12 +4287,12 @@ EOF
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4306: checking for tzname" >&5
+echo "configure:4291: 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 4311 "configure"
+#line 4296 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
@@ -4317,7 +4302,7 @@ int main() {
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
@@ -4340,12 +4325,12 @@ fi
echo $ac_n "checking whether we need POSIX to get struct utimbuf""... $ac_c" 1>&6
-echo "configure:4344: checking whether we need POSIX to get struct utimbuf" >&5
+echo "configure:4329: 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 4349 "configure"
+#line 4334 "configure"
#include "confdefs.h"
#ifdef __EMX__
@@ -4357,7 +4342,7 @@ struct utime blah;
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -4390,13 +4375,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 4394 "configure"
+#line 4379 "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:4400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
cat >> confdefs.h <<\EOF
#define SCM_STACK_GROWS_UP 1
@@ -4411,7 +4396,7 @@ fi
echo $ac_n "checking whether floats fit in longs""... $ac_c" 1>&6
-echo "configure:4415: checking whether floats fit in longs" >&5
+echo "configure:4400: checking whether floats fit in longs" >&5
if eval "test \"`echo '$''{'guile_cv_type_float_fits_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4419,11 +4404,11 @@ else
guile_cv_type_float_fits_long=guess-yes
else
cat > conftest.$ac_ext <<EOF
-#line 4423 "configure"
+#line 4408 "configure"
#include "confdefs.h"
main () { exit (sizeof(float) > sizeof(long)); }
EOF
-if { (eval echo configure:4427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
guile_cv_type_float_fits_long=yes
else
@@ -4457,12 +4442,12 @@ esac
echo $ac_n "checking for struct linger""... $ac_c" 1>&6
-echo "configure:4461: checking for struct linger" >&5
+echo "configure:4446: 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 4466 "configure"
+#line 4451 "configure"
#include "confdefs.h"
#include <sys/types.h>
@@ -4471,7 +4456,7 @@ int main() {
struct linger lgr; lgr.l_linger = 100
; return 0; }
EOF
-if { (eval echo configure:4475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
scm_cv_struct_linger="yes"
else
@@ -4531,7 +4516,7 @@ fi
### Turn $with_threads into either the name of a threads package, like
### `qt', or `no', meaning that threads should not be supported.
echo $ac_n "checking whether to support threads""... $ac_c" 1>&6
-echo "configure:4535: checking whether to support threads" >&5
+echo "configure:4520: checking whether to support threads" >&5
case "$with_threads" in
"yes" | "qt" | "coop" | "")
with_threads=qt
@@ -4555,7 +4540,7 @@ case "${with_threads}" in
echo $ac_n "checking QuickThreads configuration""... $ac_c" 1>&6
-echo "configure:4559: checking QuickThreads configuration" >&5
+echo "configure:4544: checking QuickThreads configuration" >&5
# How can we refer to the qt source directory from within the qt build
# directory? For headers, we can rely on the fact that the qt src
# directory appears in the #include path.
@@ -4700,7 +4685,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:4704: checking for $ac_word" >&5
+echo "configure:4689: 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
diff --git a/configure.in b/configure.in
index 030866c02..caaff6f9e 100644
--- a/configure.in
+++ b/configure.in
@@ -50,13 +50,6 @@ AC_ARG_ENABLE(guile-debug,
AC_DEFINE(GUILE_DEBUG)
fi)
-AC_ARG_ENABLE(lang,
- [ --enable-lang Include multilanguage support (experimental)],
- if test "$enable_lang" = y || test "$enable_lang" = yes; then
- AC_DEFINE(GUILE_LANG)
- LIBOBJS="$LIBOBJS lang.o"
- fi)
-
dnl The --disable-debug used to control these two. But now they are
dnl a required part of the distribution.
AC_DEFINE(DEBUG_EXTENSIONS)
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 4a5e08fe2..531087674 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -40,7 +40,7 @@ libguile_la_SOURCES = \
evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c \
gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c \
gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c \
- ioext.c keywords.c list.c load.c macros.c mallocs.c \
+ ioext.c keywords.c lang.c list.c load.c macros.c mallocs.c \
modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c \
ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c \
root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c \
@@ -65,7 +65,7 @@ BUILT_SOURCES = \
EXTRA_libguile_la_SOURCES = _scm.h \
strerror.c inet_aton.c putenv.c \
- threads.c alloca.c lang.c \
+ threads.c alloca.c \
regex-posix.c iselect.c
## This is kind of nasty... there are ".c" files that we don't want to
@@ -98,7 +98,7 @@ modinclude_HEADERS = \
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 \
threads.h coop-defs.h fluids.h iselect.h
-
+
## This file is generated at configure time. That is why it is DATA
## and not a header -- headers are included in the distribution.
modinclude_DATA = scmconfig.h
diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index ed25c42d3..7b2c0aa96 100644
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -103,13 +103,13 @@ bin_PROGRAMS = guile
guile_SOURCES = guile.c
guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL}
-libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c ioext.c keywords.c list.c load.c macros.c mallocs.c modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c srcprop.c stackchk.c stacks.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
+libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c evalext.c feature.c filesys.c fluids.c fports.c gc.c gdbint.c gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c gh_predicates.c gsubr.c guardians.c hash.c hashtab.c init.c ioext.c keywords.c lang.c list.c load.c macros.c mallocs.c modules.c net_db.c numbers.c objects.c objprop.c options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c random.c read.c root.c scmsigs.c script.c simpos.c smob.c socket.c sort.c srcprop.c stackchk.c stacks.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
BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h alist.x arbiters.x async.x backtrace.x boolean.x chars.x continuations.x debug.x dynl.x dynwind.x eq.x error.x eval.x evalext.x feature.x filesys.x fluids.x fports.x gc.x gdbint.x gh_data.x gh_eval.x gh_funcs.x gh_init.x gh_io.x gh_list.x gh_predicates.x gsubr.x guardians.x hash.x hashtab.x init.x ioext.x iselect.x keywords.x lang.x list.x load.x macros.x mallocs.x modules.x net_db.x numbers.x objects.x objprop.x options.x pairs.x ports.x posix.x print.x procprop.x procs.x random.x ramap.x read.x regex-posix.x root.x scmsigs.x script.x simpos.x smob.x socket.x sort.x srcprop.x stackchk.x stacks.x stime.x strings.x strop.x strorder.x strports.x struct.x symbols.x tag.x threads.x throw.x unif.x variable.x vectors.x version.x vports.x weaks.x
-EXTRA_libguile_la_SOURCES = _scm.h strerror.c inet_aton.c putenv.c threads.c alloca.c lang.c regex-posix.c iselect.c
+EXTRA_libguile_la_SOURCES = _scm.h strerror.c inet_aton.c putenv.c threads.c alloca.c regex-posix.c iselect.c
noinst_HEADERS = coop-threads.c coop-threads.h coop.c
@@ -167,13 +167,13 @@ boolean.lo chars.lo continuations.lo debug.lo dynl.lo dynwind.lo eq.lo \
error.lo eval.lo evalext.lo feature.lo filesys.lo fluids.lo fports.lo \
gc.lo gdbint.lo gh_data.lo gh_eval.lo gh_funcs.lo gh_init.lo gh_io.lo \
gh_list.lo gh_predicates.lo gsubr.lo guardians.lo hash.lo hashtab.lo \
-init.lo ioext.lo keywords.lo list.lo load.lo macros.lo mallocs.lo \
-modules.lo net_db.lo numbers.lo objects.lo objprop.lo options.lo \
-pairs.lo ports.lo posix.lo print.lo procprop.lo procs.lo ramap.lo \
-random.lo read.lo root.lo scmsigs.lo script.lo simpos.lo smob.lo \
-socket.lo sort.lo srcprop.lo stackchk.lo stacks.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
+init.lo ioext.lo keywords.lo lang.lo list.lo load.lo macros.lo \
+mallocs.lo modules.lo net_db.lo numbers.lo objects.lo objprop.lo \
+options.lo pairs.lo ports.lo posix.lo print.lo procprop.lo procs.lo \
+ramap.lo random.lo read.lo root.lo scmsigs.lo script.lo simpos.lo \
+smob.lo socket.lo sort.lo srcprop.lo stackchk.lo stacks.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
diff --git a/libguile/dynwind.c b/libguile/dynwind.c
index f570594f1..c562ccc7b 100644
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@@ -153,7 +153,6 @@ scm_wind_chain ()
}
#endif
-#ifdef GUILE_LANG
static void
scm_swap_bindings (SCM glocs, SCM vals)
{
@@ -167,7 +166,6 @@ scm_swap_bindings (SCM glocs, SCM vals)
vals = SCM_CDR (vals);
}
}
-#endif
void
scm_dowinds (to, delta)
@@ -195,17 +193,14 @@ scm_dowinds (to, delta)
/* key = #t | symbol | thunk | list of glocs | list of fluids */
if (SCM_NIMP (wind_key))
{
-#ifdef GUILE_LANG
if (SCM_TYP3 (wind_key) == scm_tc3_cons_gloc)
scm_swap_bindings (wind_key, SCM_CDR (wind_elt));
- else
-#endif
- if (SCM_TYP3 (wind_key) == scm_tc3_cons)
- scm_swap_fluids (wind_key, SCM_CDR (wind_elt));
- else if (SCM_GUARDSP (wind_key))
- SCM_BEFORE_GUARD (wind_key) (SCM_GUARD_DATA (wind_key));
- else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
- scm_apply (wind_key, SCM_EOL, SCM_EOL);
+ else if (SCM_TYP3 (wind_key) == scm_tc3_cons)
+ scm_swap_fluids (wind_key, SCM_CDR (wind_elt));
+ else if (SCM_GUARDSP (wind_key))
+ SCM_BEFORE_GUARD (wind_key) (SCM_GUARD_DATA (wind_key));
+ else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
+ scm_apply (wind_key, SCM_EOL, SCM_EOL);
}
}
scm_dynwinds = to;
@@ -230,17 +225,14 @@ scm_dowinds (to, delta)
wind_key = SCM_CAR (wind_elt);
if (SCM_NIMP (wind_key))
{
-#ifdef GUILE_LANG
if (SCM_TYP3 (wind_key) == scm_tc3_cons_gloc)
scm_swap_bindings (wind_key, from);
- else
-#endif
- if (SCM_TYP3 (wind_key) == scm_tc3_cons)
- scm_swap_fluids_reverse (wind_key, from);
- else if (SCM_GUARDSP (wind_key))
- SCM_AFTER_GUARD (wind_key) (SCM_GUARD_DATA (wind_key));
- else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
- scm_apply (from, SCM_EOL, SCM_EOL);
+ else if (SCM_TYP3 (wind_key) == scm_tc3_cons)
+ scm_swap_fluids_reverse (wind_key, from);
+ else if (SCM_GUARDSP (wind_key))
+ SCM_AFTER_GUARD (wind_key) (SCM_GUARD_DATA (wind_key));
+ else if (SCM_TYP3 (wind_key) == scm_tc3_closure)
+ scm_apply (from, SCM_EOL, SCM_EOL);
}
}
delta--;
diff --git a/libguile/eval.c b/libguile/eval.c
index 6022bba46..1c48d72c0 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -1028,7 +1028,6 @@ scm_m_cont (xorig, env)
return scm_cons (SCM_IM_CONT, SCM_CDR (xorig));
}
-#ifdef GUILE_LANG
/* Multi-language support */
SCM scm_nil;
@@ -1137,7 +1136,6 @@ scm_m_atbind (SCM xorig, SCM env)
}
return scm_cons (SCM_IM_BIND, SCM_CDR (xorig));
}
-#endif /* GUILE_LANG */
/* scm_unmemocopy takes a memoized expression together with its
@@ -2122,7 +2120,6 @@ dispatch:
}
goto find_method;
}
-#ifdef GUILE_LANG
case (SCM_ISYMNUM (SCM_IM_NIL_COND)):
proc = SCM_CDR (x);
@@ -2217,7 +2214,6 @@ dispatch:
RETURN (proc)
-#endif /* GUILE_LANG */
default:
goto badfun;
}
@@ -3637,14 +3633,12 @@ scm_init_eval ()
scm_i_unquote = SCM_CAR (scm_sysintern ("unquote", SCM_UNDEFINED));
scm_i_uq_splicing = SCM_CAR (scm_sysintern ("unquote-splicing", SCM_UNDEFINED));
-#ifdef GUILE_LANG
scm_nil = scm_sysintern ("nil", SCM_UNDEFINED);
SCM_SETCDR (scm_nil, SCM_CAR (scm_nil));
scm_nil = SCM_CAR (scm_nil);
scm_t = scm_sysintern ("t", SCM_UNDEFINED);
SCM_SETCDR (scm_t, SCM_CAR (scm_t));
scm_t = SCM_CAR (scm_t);
-#endif /* GUILE_LANG */
/* acros */
/* end of acros */
diff --git a/libguile/init.c b/libguile/init.c
index 49811938a..ebdaf56cb 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -76,9 +76,7 @@
#endif
#include "ioext.h"
#include "keywords.h"
-#ifdef GUILE_LANG
#include "lang.h"
-#endif
#include "list.h"
#include "load.h"
#include "macros.h"
@@ -527,9 +525,7 @@ scm_boot_guile_1 (base, closure)
scm_init_load_path ();
scm_init_standard_ports ();
scm_init_dynamic_linking ();
-#ifdef GUILE_LANG
scm_init_lang ();
-#endif
scm_init_script ();
initialized = 1;
}
diff --git a/libguile/print.c b/libguile/print.c
index 98ec9cb83..5c380303b 100644
--- a/libguile/print.c
+++ b/libguile/print.c
@@ -99,7 +99,6 @@ char *scm_isymnames[] =
"#@dispatch",
"#@hash-dispatch",
-#ifdef GUILE_LANG
/* Multi-language support */
"#@nil-cond",
@@ -109,7 +108,6 @@ char *scm_isymnames[] =
"#@0-ify",
"#@1-ify",
"#@bind"
-#endif /* GUILE_LANG */
};
scm_option scm_print_opts[] = {
diff --git a/libguile/scmconfig.h.in b/libguile/scmconfig.h.in
index 137d06662..dde611a02 100644
--- a/libguile/scmconfig.h.in
+++ b/libguile/scmconfig.h.in
@@ -119,9 +119,6 @@
the Guile library itself. */
#undef GUILE_DEBUG
-/* Define this to include experimental multilanguage support. */
-#undef GUILE_LANG
-
/* Define to implement scm_internal_select */
#undef GUILE_ISELECT
diff --git a/libguile/tags.h b/libguile/tags.h
index 3b4c71aab..941e39e3a 100644
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -472,7 +472,6 @@ enum scm_tags
#define SCM_IM_DISPATCH SCM_MAKISYM(22)
#define SCM_IM_HASH_DISPATCH SCM_MAKISYM(23)
-#ifdef GUILE_LANG
/* Multi-language support */
#define SCM_IM_NIL_COND SCM_MAKISYM(24)
@@ -482,7 +481,6 @@ enum scm_tags
#define SCM_IM_0_IFY SCM_MAKISYM(28)
#define SCM_IM_1_IFY SCM_MAKISYM(29)
#define SCM_IM_BIND SCM_MAKISYM(30)
-#endif
#define SCM_UNBNDP(x) (SCM_UNDEFINED==(x))