From 52cfc69be6fb601a4622f288d28a97aeb660ec07 Mon Sep 17 00:00:00 2001 From: Gary Houston Date: Sun, 26 Sep 1999 16:00:36 +0000 Subject: [PATCH] support new configure options: --disable-posix, --disable-net and --disable-regex. --- ChangeLog | 13 + NEWS | 8 + acconfig.h | 22 +- aclocal.m4 | 176 ++++++------- configure | 550 +++++++++++++++++++++------------------- configure.in | 136 +++------- ice-9/ChangeLog | 20 ++ ice-9/Makefile.am | 5 +- ice-9/Makefile.in | 2 +- ice-9/boot-9.scm | 179 ++----------- ice-9/networking.scm | 71 ++++++ ice-9/posix.scm | 70 +++++ libguile/ChangeLog | 13 + libguile/Makefile.am | 11 +- libguile/Makefile.in | 22 +- libguile/filesys.c | 2 - libguile/init.c | 8 +- libguile/ioext.c | 2 + libguile/scmconfig.h.in | 4 + 19 files changed, 676 insertions(+), 638 deletions(-) create mode 100644 ice-9/networking.scm create mode 100644 ice-9/posix.scm diff --git a/ChangeLog b/ChangeLog index fecc7b131..0ea5d4c63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +1999-09-23 Gary Houston + + * acconfig.h: add HAVE_POSIX, HAVE_NETWORKING. remove FD_SETTER, + FILE_CNT_FIELD, FILE_CNT_GPTR, FILE_CNT_READPTR. + + * configure.in: new options --disable-posix, --disable-net + and --disable-regex + export HAVE_POSIX and HAVE_NETWORKING definitions. + don't add regex-posix.o to LIBOBJS if regex disabled. + + LIBOBJS: add filesys.c, posix.c, net_db.c, socket.c, + conditionally. + 1999-09-25 Jim Blandy * Guile 1.3.4 released. diff --git a/NEWS b/NEWS index 2626a0d09..07f2444fb 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,14 @@ Please send Guile bug reports to bug-guile@gnu.org. Changes since Guile 1.3.4: +configure has new options to remove support for certain features: + +--disable-posix omit posix interfaces +--disable-net omit networking interfaces +--disable-regex omit regular expression interfaces + +These are likely to become separate modules some day. + Changes since Guile 1.3.2: diff --git a/acconfig.h b/acconfig.h index 1b04480e5..6f5fc715e 100644 --- a/acconfig.h +++ b/acconfig.h @@ -52,24 +52,6 @@ #undef DEBUG_EXTENSIONS #undef READER_EXTENSIONS -/* Define this if your system has a way to set a stdio stream's file - descriptor. */ -#undef FD_SETTER - -/* Set this to the name of a field in FILE which contains the number - of buffered characters waiting to be read. */ -#undef FILE_CNT_FIELD - -/* Define this if your stdio has _gptr and _egptr fields which can - be compared to give the number of buffered characters waiting to - be read. */ -#undef FILE_CNT_GPTR - -/* Define this if your stdio has _IO_read_ptr and _IO_read_end fields - which can be compared to give the number of buffered characters - waiting to be read. */ -#undef FILE_CNT_READPTR - /* Define this if your system defines S_ISLNK in sys/stat.h */ #undef HAVE_S_ISLNK @@ -134,6 +116,10 @@ /* This is included as part of a workaround for a autoheader bug. */ #undef HAVE_REGCOMP +#undef HAVE_POSIX + +#undef HAVE_NETWORKING + /* Define if the operating system supplies bzero without declaring it. */ #undef MISSING_BZERO_DECL diff --git a/aclocal.m4 b/aclocal.m4 index 88e8c4e8d..a33bff91a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -443,6 +443,94 @@ done<<>>dnl>>) changequote([,]))]) +# serial 1 + +# @defmac AC_PROG_CC_STDC +# @maindex PROG_CC_STDC +# @ovindex CC +# If the C compiler in not in ANSI C mode by default, try to add an option +# to output variable @code{CC} to make it so. This macro tries various +# options that select ANSI C on some system or another. It considers the +# compiler to be in ANSI C mode if it handles function prototypes correctly. +# +# If you use this macro, you should check after calling it whether the C +# compiler has been set to accept ANSI C; if not, the shell variable +# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source +# code in ANSI C, you can make an un-ANSIfied copy of it by using the +# program @code{ansi2knr}, which comes with Ghostscript. +# @end defmac + +AC_DEFUN(AM_PROG_CC_STDC, +[AC_REQUIRE([AC_PROG_CC]) +AC_BEFORE([$0], [AC_C_INLINE]) +AC_BEFORE([$0], [AC_C_CONST]) +dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require +dnl a magic option to avoid problems with ANSI preprocessor commands +dnl like #elif. +dnl FIXME: can't do this because then AC_AIX won't work due to a +dnl circular dependency. +dnl AC_BEFORE([$0], [AC_PROG_CPP]) +AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) +AC_CACHE_VAL(am_cv_prog_cc_stdc, +[am_cv_prog_cc_stdc=no +ac_save_CC="$CC" +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + AC_TRY_COMPILE( +[#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +], [ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +], +[am_cv_prog_cc_stdc="$ac_arg"; break]) +done +CC="$ac_save_CC" +]) +if test -z "$am_cv_prog_cc_stdc"; then + AC_MSG_RESULT([none needed]) +else + AC_MSG_RESULT($am_cv_prog_cc_stdc) +fi +case "x$am_cv_prog_cc_stdc" in + x|xno) ;; + *) CC="$CC $am_cv_prog_cc_stdc" ;; +esac +]) + + # serial 40 AC_PROG_LIBTOOL AC_DEFUN(AC_PROG_LIBTOOL, [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl @@ -848,91 +936,3 @@ AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl dnl This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL])dnl - -# serial 1 - -# @defmac AC_PROG_CC_STDC -# @maindex PROG_CC_STDC -# @ovindex CC -# If the C compiler in not in ANSI C mode by default, try to add an option -# to output variable @code{CC} to make it so. This macro tries various -# options that select ANSI C on some system or another. It considers the -# compiler to be in ANSI C mode if it handles function prototypes correctly. -# -# If you use this macro, you should check after calling it whether the C -# compiler has been set to accept ANSI C; if not, the shell variable -# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source -# code in ANSI C, you can make an un-ANSIfied copy of it by using the -# program @code{ansi2knr}, which comes with Ghostscript. -# @end defmac - -AC_DEFUN(AM_PROG_CC_STDC, -[AC_REQUIRE([AC_PROG_CC]) -AC_BEFORE([$0], [AC_C_INLINE]) -AC_BEFORE([$0], [AC_C_CONST]) -dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require -dnl a magic option to avoid problems with ANSI preprocessor commands -dnl like #elif. -dnl FIXME: can't do this because then AC_AIX won't work due to a -dnl circular dependency. -dnl AC_BEFORE([$0], [AC_PROG_CPP]) -AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) -AC_CACHE_VAL(am_cv_prog_cc_stdc, -[am_cv_prog_cc_stdc=no -ac_save_CC="$CC" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - AC_TRY_COMPILE( -[#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -], [ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -], -[am_cv_prog_cc_stdc="$ac_arg"; break]) -done -CC="$ac_save_CC" -]) -if test -z "$am_cv_prog_cc_stdc"; then - AC_MSG_RESULT([none needed]) -else - AC_MSG_RESULT($am_cv_prog_cc_stdc) -fi -case "x$am_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $am_cv_prog_cc_stdc" ;; -esac -]) - diff --git a/configure b/configure index 33b40048b..b6dd0f578 100755 --- a/configure +++ b/configure @@ -15,9 +15,15 @@ ac_help="$ac_help --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer" ac_help="$ac_help - --enable-dynamic-linking Include support for dynamic linking" + --enable-dynamic-linking include support for dynamic linking" ac_help="$ac_help - --enable-guile-debug Include internal debugging functions" + --enable-guile-debug include internal debugging functions" +ac_help="$ac_help + --disable-posix omit posix interfaces" +ac_help="$ac_help + --disable-net omit networking interfaces" +ac_help="$ac_help + --disable-regex omit regular expression interfaces" ac_help="$ac_help --enable-shared[=PKGS] build shared libraries [default=yes]" ac_help="$ac_help @@ -572,7 +578,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:576: checking for a BSD compatible install" >&5 +echo "configure:582: 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 @@ -625,7 +631,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:629: checking whether build environment is sane" >&5 +echo "configure:635: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -682,7 +688,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:686: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:692: 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 @@ -721,7 +727,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:725: checking for working aclocal" >&5 +echo "configure:731: 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. @@ -734,7 +740,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:738: checking for working autoconf" >&5 +echo "configure:744: 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. @@ -747,7 +753,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:751: checking for working automake" >&5 +echo "configure:757: 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. @@ -760,7 +766,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:764: checking for working autoheader" >&5 +echo "configure:770: 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. @@ -773,7 +779,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:777: checking for working makeinfo" >&5 +echo "configure:783: 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. @@ -787,7 +793,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:791: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:797: 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" @@ -849,6 +855,33 @@ EOF fi +# Check whether --enable-posix or --disable-posix was given. +if test "${enable_posix+set}" = set; then + enableval="$enable_posix" + : +else + enable_posix=yes +fi + + +# Check whether --enable-networking or --disable-networking was given. +if test "${enable_networking+set}" = set; then + enableval="$enable_networking" + : +else + enable_networking=yes +fi + + +# Check whether --enable-regex or --disable-regex was given. +if test "${enable_regex+set}" = set; then + enableval="$enable_regex" + : +else + enable_regex=yes +fi + + cat >> confdefs.h <<\EOF #define DEBUG_EXTENSIONS 1 EOF @@ -858,12 +891,29 @@ cat >> confdefs.h <<\EOF EOF + +if test "$enable_posix" = yes; then + LIBOBJS="$LIBOBJS filesys.o posix.o" + cat >> confdefs.h <<\EOF +#define HAVE_POSIX 1 +EOF + +fi + +if test "$enable_networking" = yes; then + LIBOBJS="$LIBOBJS net_db.o socket.o" + cat >> confdefs.h <<\EOF +#define HAVE_NETWORKING 1 +EOF + +fi + #-------------------------------------------------------------------- # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:867: checking for $ac_word" >&5 +echo "configure:917: 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 @@ -893,7 +943,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:897: checking for $ac_word" >&5 +echo "configure:947: 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 @@ -944,7 +994,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:948: checking for $ac_word" >&5 +echo "configure:998: 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 @@ -976,7 +1026,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:980: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1030: 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. @@ -987,12 +1037,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 991 "configure" +#line 1041 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1046: \"$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 @@ -1018,12 +1068,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:1022: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1072: 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:1027: checking whether we are using GNU C" >&5 +echo "configure:1077: 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 @@ -1032,7 +1082,7 @@ else yes; #endif EOF -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 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1086: \"$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 @@ -1051,7 +1101,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:1055: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1105: 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 @@ -1083,7 +1133,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1087: checking how to run the C preprocessor" >&5 +echo "configure:1137: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1098,13 +1148,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1158: \"$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 : @@ -1115,13 +1165,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1175: \"$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 : @@ -1132,13 +1182,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1192: \"$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 : @@ -1164,9 +1214,9 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1168: checking for AIX" >&5 +echo "configure:1218: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1192: checking for POSIXized ISC" >&5 +echo "configure:1242: 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 @@ -1210,17 +1260,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:1214: checking for minix/config.h" >&5 +echo "configure:1264: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1274: \"$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* @@ -1262,7 +1312,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1266: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1316: 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 @@ -1278,7 +1328,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 < #include @@ -1315,7 +1365,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; return 0; } EOF -if { (eval echo configure:1319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -1414,7 +1464,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:1418: checking host system type" >&5 +echo "configure:1468: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1435,7 +1485,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:1439: checking build system type" >&5 +echo "configure:1489: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1455,7 +1505,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:1459: checking for $ac_word" >&5 +echo "configure:1509: 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 @@ -1494,7 +1544,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:1498: checking for ld used by GCC" >&5 +echo "configure:1548: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1518,10 +1568,10 @@ echo "configure:1498: 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:1522: checking for GNU ld" >&5 +echo "configure:1572: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1525: checking for non-GNU ld" >&5 +echo "configure:1575: 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 @@ -1557,7 +1607,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:1561: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1611: 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 @@ -1573,7 +1623,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:1577: checking for BSD-compatible nm" >&5 +echo "configure:1627: 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 @@ -1610,7 +1660,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1614: checking whether ln -s works" >&5 +echo "configure:1664: 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 @@ -1654,8 +1704,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1658 "configure"' > conftest.$ac_ext - if { (eval echo configure:1659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1708 "configure"' > conftest.$ac_ext + if { (eval echo configure:1709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1676,19 +1726,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:1680: checking whether the C compiler needs -belf" >&5 +echo "configure:1730: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1742: \"$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 @@ -1791,12 +1841,12 @@ exec 5>>./config.log echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1795: checking for working const" >&5 +echo "configure:1845: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1866,21 +1916,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1870: checking for inline" >&5 +echo "configure:1920: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1906,7 +1956,7 @@ EOF esac echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1910: checking size of int" >&5 +echo "configure:1960: 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 @@ -1914,7 +1964,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1925,7 +1975,7 @@ main() exit(0); } EOF -if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1979: \"$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 @@ -1945,7 +1995,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1949: checking size of long" >&5 +echo "configure:1999: 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 @@ -1953,7 +2003,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1964,7 +2014,7 @@ main() exit(0); } EOF -if { (eval echo configure:1968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2018: \"$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 @@ -1984,19 +2034,19 @@ EOF echo $ac_n "checking for long longs""... $ac_c" 1>&6 -echo "configure:1988: checking for long longs" >&5 +echo "configure:2038: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_long_longs=yes else @@ -2017,12 +2067,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2021: checking for ANSI C header files" >&5 +echo "configure:2071: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2030,7 +2080,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2084: \"$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* @@ -2047,7 +2097,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 @@ -2065,7 +2115,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 @@ -2086,7 +2136,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2097,7 +2147,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2125,12 +2175,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:2129: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2179: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -2138,7 +2188,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2163,7 +2213,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:2167: checking for opendir in -ldir" >&5 +echo "configure:2217: 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 @@ -2171,7 +2221,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2236: \"$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 @@ -2204,7 +2254,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2208: checking for opendir in -lx" >&5 +echo "configure:2258: 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 @@ -2212,7 +2262,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2277: \"$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 @@ -2246,12 +2296,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2250: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2300: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2260,7 +2310,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2281,12 +2331,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2285: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2335: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2302,7 +2352,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2326,17 +2376,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:2330: checking for $ac_hdr" >&5 +echo "configure:2380: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2390: \"$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* @@ -2367,17 +2417,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2371: checking for $ac_hdr" >&5 +echo "configure:2421: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2431: \"$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* @@ -2404,7 +2454,7 @@ fi done echo $ac_n "checking "whether libc.h and unistd.h can be included together"""... $ac_c" 1>&6 -echo "configure:2408: checking "whether libc.h and unistd.h can be included together"" >&5 +echo "configure:2458: 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 @@ -2415,7 +2465,7 @@ else guile_cv_header_libc_with_unistd="yes" else cat > conftest.$ac_ext < @@ -2425,7 +2475,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* guile_cv_header_libc_with_unistd=yes else @@ -2452,12 +2502,12 @@ EOF echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2456: checking for uid_t in sys/types.h" >&5 +echo "configure:2506: 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 @@ -2486,7 +2536,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:2490: checking type of array argument to getgroups" >&5 +echo "configure:2540: 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 @@ -2494,7 +2544,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2573: \"$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 @@ -2533,7 +2583,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -2557,12 +2607,12 @@ EOF echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2561: checking return type of signal handlers" >&5 +echo "configure:2611: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2579,7 +2629,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2598,12 +2648,12 @@ EOF echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:2602: checking for mode_t" >&5 +echo "configure:2652: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2632,7 +2682,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:2636: checking for main in -lm" >&5 +echo "configure:2686: 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 @@ -2640,14 +2690,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2701: \"$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 @@ -2677,12 +2727,12 @@ fi for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2681: checking for $ac_func" >&5 +echo "configure:2731: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2759: \"$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 @@ -2731,7 +2781,7 @@ done if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2735: checking for gethostbyname in -lnsl" >&5 +echo "configure:2785: 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 @@ -2739,7 +2789,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2804: \"$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 @@ -2781,12 +2831,12 @@ fi for ac_func in connect do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2785: checking for $ac_func" >&5 +echo "configure:2835: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2863: \"$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 @@ -2835,7 +2885,7 @@ done if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2839: checking for connect in -lsocket" >&5 +echo "configure:2889: 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 @@ -2843,7 +2893,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2908: \"$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 @@ -2888,7 +2938,7 @@ fi if test "$enable_dynamic_linking" = "yes"; then echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2892: checking for dlopen in -ldl" >&5 +echo "configure:2942: 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 @@ -2896,7 +2946,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2961: \"$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 @@ -2938,12 +2988,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:2942: checking for $ac_func" >&5 +echo "configure:2992: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3020: \"$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 @@ -2996,7 +3046,7 @@ EOF else echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 -echo "configure:3000: checking for dld_link in -ldld" >&5 +echo "configure:3050: 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 @@ -3004,7 +3054,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3069: \"$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 @@ -3051,12 +3101,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3055: checking for $ac_func" >&5 +echo "configure:3105: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3133: \"$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 @@ -3112,12 +3162,12 @@ else for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3116: checking for $ac_func" >&5 +echo "configure:3166: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3194: \"$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 @@ -3178,7 +3228,7 @@ fi echo $ac_n "checking for underscore before symbols""... $ac_c" 1>&6 -echo "configure:3182: checking for underscore before symbols" >&5 +echo "configure:3232: 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 @@ -3204,7 +3254,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:3208: checking whether dlsym always adds an underscore for us" >&5 +echo "configure:3258: 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 @@ -3212,7 +3262,7 @@ else guile_cv_dlsym_adds_uscore=no else cat > conftest.$ac_ext < @@ -3223,7 +3273,7 @@ main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY); if(ptr1 && !ptr2) exit(0); } exit(1); } EOF -if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3277: \"$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 @@ -3250,12 +3300,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 siginterrupt strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid bzero strdup system usleep atexit on_exit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3254: checking for $ac_func" >&5 +echo "configure:3304: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3332: \"$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 @@ -3314,12 +3364,12 @@ done echo $ac_n "checking for strptime declaration""... $ac_c" 1>&6 -echo "configure:3318: checking for strptime declaration" >&5 +echo "configure:3368: 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 @@ -3345,12 +3395,12 @@ EOF echo $ac_n "checking for bzero declaration""... $ac_c" 1>&6 -echo "configure:3349: checking for bzero declaration" >&5 +echo "configure:3399: 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 @@ -3376,12 +3426,12 @@ EOF echo $ac_n "checking for sleep declaration""... $ac_c" 1>&6 -echo "configure:3380: checking for sleep declaration" >&5 +echo "configure:3430: 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 @@ -3407,12 +3457,12 @@ EOF echo $ac_n "checking for usleep declaration""... $ac_c" 1>&6 -echo "configure:3411: checking for usleep declaration" >&5 +echo "configure:3461: 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 @@ -3440,12 +3490,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:3444: checking return type of usleep" >&5 +echo "configure:3494: 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 @@ -3474,17 +3524,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:3478: checking for sys/un.h" >&5 +echo "configure:3528: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3538: \"$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* @@ -3515,12 +3565,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:3519: checking for $ac_func" >&5 +echo "configure:3569: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3597: \"$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 @@ -3574,12 +3624,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:3578: checking for $ac_func" >&5 +echo "configure:3628: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3656: \"$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 @@ -3630,7 +3680,7 @@ done echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6 -echo "configure:3634: checking for restartable system calls" >&5 +echo "configure:3684: checking for restartable system calls" >&5 if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3638,7 +3688,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sys_restartable_syscalls=yes else @@ -3679,16 +3729,17 @@ EOF fi -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:3687: checking for regcomp" >&5 +if test "$enable_regex" = yes; then + 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:3738: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3766: \"$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 @@ -3729,7 +3780,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:3733: checking for main in -lrx" >&5 +echo "configure:3784: 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 @@ -3737,14 +3788,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lrx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3799: \"$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 @@ -3771,13 +3822,13 @@ else echo "$ac_t""no" 1>&6 fi - echo $ac_n "checking for regcomp""... $ac_c" 1>&6 -echo "configure:3776: checking for regcomp" >&5 + echo $ac_n "checking for regcomp""... $ac_c" 1>&6 +echo "configure:3827: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3855: \"$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 @@ -3819,27 +3870,28 @@ else echo "$ac_t""no" 1>&6 fi - + fi - if test "$ac_cv_func_regcomp_norx" = yes || - test "$ac_cv_func_regcomp_rx" = yes; then - cat >> confdefs.h <<\EOF + if test "$ac_cv_func_regcomp_norx" = yes || + test "$ac_cv_func_regcomp_rx" = yes; then + cat >> confdefs.h <<\EOF #define HAVE_REGCOMP 1 EOF - fi + fi + fi fi for ac_func in inet_aton putenv strerror memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3838: checking for $ac_func" >&5 +echo "configure:3890: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3918: \"$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 @@ -3895,19 +3947,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:3899: checking for working alloca.h" >&5 +echo "configure:3951: 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 < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:3911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3963: \"$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 @@ -3928,12 +3980,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:3932: checking for alloca" >&5 +echo "configure:3984: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4017: \"$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 @@ -3993,12 +4045,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3997: checking whether alloca needs Cray hooks" >&5 +echo "configure:4049: 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 <&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:4027: checking for $ac_func" >&5 +echo "configure:4079: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4107: \"$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 @@ -4078,7 +4130,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:4082: checking stack direction for C alloca" >&5 +echo "configure:4134: 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 @@ -4086,7 +4138,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4161: \"$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 @@ -4129,12 +4181,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:4133: checking for st_rdev in struct stat" >&5 +echo "configure:4185: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4142,7 +4194,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:4146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -4163,12 +4215,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:4167: checking for st_blksize in struct stat" >&5 +echo "configure:4219: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4176,7 +4228,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:4180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -4200,12 +4252,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:4204: checking for st_blocks in struct stat" >&5 +echo "configure:4256: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4213,7 +4265,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:4217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -4234,12 +4286,12 @@ EOF fi echo $ac_n "checking for S_ISLNK in sys/stat.h""... $ac_c" 1>&6 -echo "configure:4238: checking for S_ISLNK in sys/stat.h" >&5 +echo "configure:4290: checking for S_ISLNK in sys/stat.h" >&5 if eval "test \"`echo '$''{'ac_cv_macro_S_ISLNK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef S_ISLNK @@ -4247,7 +4299,7 @@ else #endif EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4303: \"$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* @@ -4271,12 +4323,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4275: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4327: 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 < #include @@ -4284,7 +4336,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4305,12 +4357,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4309: checking for tm_zone in struct tm" >&5 +echo "configure:4361: 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 < #include <$ac_cv_struct_tm> @@ -4318,7 +4370,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4338,12 +4390,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4342: checking for tzname" >&5 +echo "configure:4394: 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 < #ifndef tzname /* For SGI. */ @@ -4353,7 +4405,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4376,12 +4428,12 @@ fi echo $ac_n "checking whether we need POSIX to get struct utimbuf""... $ac_c" 1>&6 -echo "configure:4380: checking whether we need POSIX to get struct utimbuf" >&5 +echo "configure:4432: checking whether we need POSIX to get struct utimbuf" >&5 if eval "test \"`echo '$''{'guile_cv_struct_utimbuf_needs_posix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4449: \"$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* @@ -4426,13 +4478,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 <= ((unsigned long)&x)); } main () { int q; aux((unsigned long)&q); } EOF -if { (eval echo configure:4436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4488: \"$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 @@ -4447,7 +4499,7 @@ fi echo $ac_n "checking whether floats fit in longs""... $ac_c" 1>&6 -echo "configure:4451: checking whether floats fit in longs" >&5 +echo "configure:4503: 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 @@ -4455,11 +4507,11 @@ else guile_cv_type_float_fits_long=guess-yes else cat > conftest.$ac_ext < sizeof(long)); } EOF -if { (eval echo configure:4463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4515: \"$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 @@ -4493,12 +4545,12 @@ esac echo $ac_n "checking for struct linger""... $ac_c" 1>&6 -echo "configure:4497: checking for struct linger" >&5 +echo "configure:4549: 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 < @@ -4507,7 +4559,7 @@ int main() { struct linger lgr; lgr.l_linger = 100 ; return 0; } EOF -if { (eval echo configure:4511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* scm_cv_struct_linger="yes" else @@ -4526,27 +4578,6 @@ if test $scm_cv_struct_linger = yes; then EOF fi - -#-------------------------------------------------------------------- -# -# How can you violate a stdio abstraction by setting a stream's fd? -# -#-------------------------------------------------------------------- - - - -#-------------------------------------------------------------------- -# How to find out whether a FILE structure contains buffered data. -# From Tk we have the following list: -# _cnt: Most UNIX systems -# __cnt: HPUX and SCO -# _r: BSD -# readCount: Sprite -# Or, in GNU libc there are two fields, _gptr and _egptr, which -# have to be compared. -# These can also be known as _IO_read_ptr and _IO_read_end. -#-------------------------------------------------------------------- - #-------------------------------------------------------------------- # @@ -4567,7 +4598,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:4571: checking whether to support threads" >&5 +echo "configure:4602: checking whether to support threads" >&5 case "$with_threads" in "yes" | "qt" | "coop" | "") with_threads=qt @@ -4591,7 +4622,7 @@ case "${with_threads}" in echo $ac_n "checking QuickThreads configuration""... $ac_c" 1>&6 -echo "configure:4595: checking QuickThreads configuration" >&5 +echo "configure:4626: 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. @@ -4721,7 +4752,6 @@ EOF fi fi - ## If we're using GCC, ask for aggressive warnings. case "$GCC" in yes ) @@ -4736,7 +4766,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:4740: checking for $ac_word" >&5 +echo "configure:4770: 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 2ead0369e..dc8ab11e4 100644 --- a/configure.in +++ b/configure.in @@ -41,20 +41,44 @@ AC_CONFIG_SUBDIRS(guile-readline) #-------------------------------------------------------------------- AC_ARG_ENABLE(dynamic-linking, - [ --enable-dynamic-linking Include support for dynamic linking],, + [ --enable-dynamic-linking include support for dynamic linking],, enable_dynamic_linking=yes) AC_ARG_ENABLE(guile-debug, - [ --enable-guile-debug Include internal debugging functions], + [ --enable-guile-debug include internal debugging functions], if test "$enable_guile_debug" = y || test "$enable_guile_debug" = yes; then AC_DEFINE(GUILE_DEBUG) fi) +AC_ARG_ENABLE(posix, + [ --disable-posix omit posix interfaces],, + enable_posix=yes) + +AC_ARG_ENABLE(networking, + [ --disable-net omit networking interfaces],, + enable_networking=yes) + +AC_ARG_ENABLE(regex, + [ --disable-regex omit regular expression interfaces],, + enable_regex=yes) + dnl The --disable-debug used to control these two. But now they are dnl a required part of the distribution. AC_DEFINE(DEBUG_EXTENSIONS) AC_DEFINE(READER_EXTENSIONS) +dnl files which are destined for separate modules. + +if test "$enable_posix" = yes; then + LIBOBJS="$LIBOBJS filesys.o posix.o" + AC_DEFINE(HAVE_POSIX) +fi + +if test "$enable_networking" = yes; then + LIBOBJS="$LIBOBJS net_db.o socket.o" + AC_DEFINE(HAVE_NETWORKING) +fi + #-------------------------------------------------------------------- AC_PROG_CC @@ -220,19 +244,21 @@ dnl to behave differently.) AC_SYS_RESTARTABLE_SYSCALLS -if test "$ac_cv_header_regex_h" = yes || - test "$ac_cv_header_rxposix_h" = yes || - test "$ac_cv_header_rx_rxposix_h" = yes; then - GUILE_NAMED_CHECK_FUNC(regcomp, norx, [LIBOBJS="regex-posix.o $LIBOBJS"], - [AC_CHECK_LIB(rx, main) - GUILE_NAMED_CHECK_FUNC(regcomp, rx, [LIBOBJS="regex-posix.o $LIBOBJS"])] - ) - dnl The following should not be necessary, but for some reason - dnl autoheader misses it if we don't include it! - if test "$ac_cv_func_regcomp_norx" = yes || - test "$ac_cv_func_regcomp_rx" = yes; then - AC_DEFINE(HAVE_REGCOMP) - fi +if test "$enable_regex" = yes; then + if test "$ac_cv_header_regex_h" = yes || + test "$ac_cv_header_rxposix_h" = yes || + test "$ac_cv_header_rx_rxposix_h" = yes; then + GUILE_NAMED_CHECK_FUNC(regcomp, norx, [LIBOBJS="regex-posix.o $LIBOBJS"], + [AC_CHECK_LIB(rx, main) + GUILE_NAMED_CHECK_FUNC(regcomp, rx, [LIBOBJS="regex-posix.o $LIBOBJS"])] + ) + dnl The following should not be necessary, but for some reason + dnl autoheader misses it if we don't include it! + if test "$ac_cv_func_regcomp_norx" = yes || + test "$ac_cv_func_regcomp_rx" = yes; then + AC_DEFINE(HAVE_REGCOMP) + fi + fi fi AC_REPLACE_FUNCS(inet_aton putenv strerror memmove) @@ -310,85 +336,6 @@ AC_MSG_RESULT($scm_cv_struct_linger) if test $scm_cv_struct_linger = yes; then AC_DEFINE(HAVE_STRUCT_LINGER) fi - -#-------------------------------------------------------------------- -# -# How can you violate a stdio abstraction by setting a stream's fd? -# -#-------------------------------------------------------------------- - -dnl AC_MSG_CHECKING(how to set a stream file descriptor) -dnl AC_CACHE_VAL(scm_cv_fd_setter, -dnl AC_TRY_COMPILE([#include ], -dnl [stdout->_file = 1], -dnl scm_cv_fd_setter="_file", -dnl AC_TRY_COMPILE([#include ], -dnl [stdout->__file = 1], -dnl scm_cv_fd_setter="__file", -dnl AC_TRY_COMPILE([#include ], -dnl [stdout->_fileno = 1], -dnl scm_cv_fd_setter="_fileno", -dnl scm_cv_fd_setter="")))) - -dnl if test "$scm_cv_fd_setter"; then -dnl AC_MSG_RESULT($scm_cv_fd_setter) -dnl AC_DEFINE_UNQUOTED(FD_SETTER, $scm_cv_fd_setter) -dnl else -dnl AC_MSG_RESULT(we couldn't do it!) -dnl fi - -#-------------------------------------------------------------------- -# How to find out whether a FILE structure contains buffered data. -# From Tk we have the following list: -# _cnt: Most UNIX systems -# __cnt: HPUX and SCO -# _r: BSD -# readCount: Sprite -# Or, in GNU libc there are two fields, _gptr and _egptr, which -# have to be compared. -# These can also be known as _IO_read_ptr and _IO_read_end. -#-------------------------------------------------------------------- - -dnl AC_MSG_CHECKING(how to get buffer char count from FILE structure) -dnl AC_CACHE_VAL(scm_cv_struct_file_count, -dnl AC_TRY_COMPILE([#include ], -dnl [FILE *f = stdin; f->_cnt = 0], -dnl scm_cv_struct_file_count="_cnt", -dnl AC_TRY_COMPILE([#include ], -dnl [FILE *f = stdin; f->__cnt = 0], -dnl scm_cv_struct_file_count="__cnt", -dnl AC_TRY_COMPILE([#include ], -dnl [FILE *f = stdin; f->_r = 0], -dnl scm_cv_struct_file_count="_r", -dnl AC_TRY_COMPILE([#include ], -dnl [FILE *f = stdin; f->readCount = 0], -dnl scm_cv_struct_file_count="readCount", -dnl scm_cv_struct_file_count=""))))) -dnl if test "$scm_cv_struct_file_count"; then -dnl AC_MSG_RESULT($scm_cv_struct_file_count) -dnl AC_DEFINE_UNQUOTED(FILE_CNT_FIELD, $scm_cv_struct_file_count) -dnl else -dnl AC_CACHE_VAL(scm_cv_struct_file_gptr, -dnl AC_TRY_COMPILE([#include ], -dnl [FILE *f = stdin; f->_gptr = f->egptr;], -dnl scm_cv_struct_file_gptr=1, -dnl scm_cv_struct_file_gptr="")) -dnl if test "$scm_cv_struct_gptr"; then -dnl AC_MSG_RESULT(gptr) -dnl AC_DEFINE_UNQUOTED(FILE_CNT_GPTR, $scm_cv_struct_file_gptr) -dnl else -dnl AC_CACHE_VAL(scm_cv_struct_file_readptr, -dnl AC_TRY_COMPILE([#include ], -dnl [FILE *f = stdin; f->_IO_read_ptr = f->_IO_read_end;], -dnl scm_cv_struct_file_readptr=1)) -dnl if test "$scm_cv_struct_file_readptr"; then -dnl AC_MSG_RESULT(read_ptr) -dnl AC_DEFINE_UNQUOTED(FILE_CNT_READPTR, $scm_cv_struct_file_readptr) -dnl else -dnl AC_MSG_RESULT(we couldn't do it!) -dnl fi -dnl fi -dnl fi #-------------------------------------------------------------------- # @@ -452,7 +399,6 @@ if test "${THREAD_PACKAGE}" != "" ; then fi fi - ## If we're using GCC, ask for aggressive warnings. case "$GCC" in yes ) diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index a1a06066d..995282d38 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -1,3 +1,23 @@ +1999-09-23 Gary Houston + + * boot-9.scm (load-user-init): check that the posix feature is + available before using getpw and getuid. + (top-repl): don't install handlers for SIGINT etc., without posix. + (file-is-directory?): use 'posix instead of i/o-extensions to + check for stat. + (load-user-init): use file-exists? and file-is-directory? to + check for .guile, instead of stat. + (file-is-directory?): don't display the file name if posix not + available. + (feature?): I guess this is deprecated. redefined using "provided?" + and changed users in boot-9.scm to "provided?". + Conditionally load posix.scm and networking.scm. + + posix.scm, networking.scm: new files. Move definitions from + boot-9.scm if they are only useful with posix/networking available. + + * Makefile.am (ice9_sources): add posix.scm, networking.scm. + 1999-09-17 Mikael Djurfeldt * debugger.scm (read-and-dispatch-commands): Handle other throws diff --git a/ice-9/Makefile.am b/ice-9/Makefile.am index fd4d2ed97..802c375d6 100644 --- a/ice-9/Makefile.am +++ b/ice-9/Makefile.am @@ -26,8 +26,9 @@ ice9_sources = \ and-let*.scm boot-9.scm calling.scm common-list.scm debug.scm \ debugger.scm emacs.scm expect.scm format.scm \ getopt-gnu-style.scm getopt-long.scm hcons.scm lineio.scm \ - ls.scm mapping.scm \ - optargs.scm poe.scm popen.scm psyntax.pp psyntax.ss q.scm \ + ls.scm mapping.scm networking.scm \ + optargs.scm poe.scm popen.scm posix.scm \ + psyntax.pp psyntax.ss q.scm \ r4rs.scm regex.scm runq.scm session.scm slib.scm \ streams.scm string-fun.scm syncase.scm tags.scm threads.scm diff --git a/ice-9/Makefile.in b/ice-9/Makefile.in index 4a8d07b4b..c4a2ed239 100644 --- a/ice-9/Makefile.in +++ b/ice-9/Makefile.in @@ -93,7 +93,7 @@ qtmds_s = @qtmds_s@ AUTOMAKE_OPTIONS = foreign # These should be installed and distributed. -ice9_sources = and-let*.scm boot-9.scm calling.scm common-list.scm debug.scm debugger.scm emacs.scm expect.scm format.scm getopt-gnu-style.scm getopt-long.scm hcons.scm lineio.scm ls.scm mapping.scm optargs.scm poe.scm popen.scm psyntax.pp psyntax.ss q.scm r4rs.scm regex.scm runq.scm session.scm slib.scm streams.scm string-fun.scm syncase.scm tags.scm threads.scm +ice9_sources = and-let*.scm boot-9.scm calling.scm common-list.scm debug.scm debugger.scm emacs.scm expect.scm format.scm getopt-gnu-style.scm getopt-long.scm hcons.scm lineio.scm ls.scm mapping.scm networking.scm optargs.scm poe.scm popen.scm posix.scm psyntax.pp psyntax.ss q.scm r4rs.scm regex.scm runq.scm session.scm slib.scm streams.scm string-fun.scm syncase.scm tags.scm threads.scm subpkgdatadir = $(pkgdatadir)/$(VERSION)/ice-9 diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm index f983ebb89..b1b0cd5d9 100644 --- a/ice-9/boot-9.scm +++ b/ice-9/boot-9.scm @@ -40,6 +40,9 @@ (define (provided? feature) (and (memq feature *features*) #t)) +;;; presumably deprecated. +(define feature? provided?) + ;;; {R4RS compliance} @@ -564,37 +567,15 @@ (loop (f (car l)) (cdr l)))))) -;;; {Files} -;;; -;;; If no one can explain this comment to me by 31 Jan 1998, I will -;;; assume it is meaningless and remove it. -twp -;;; !!!! these should be implemented using Tcl commands, not fports. -(define (feature? feature) - (and (memq feature *features*) #t)) +(if (provided? 'posix) + (primitive-load-path "ice-9/posix.scm")) -;; Using the vector returned by stat directly is probably not a good -;; idea (it could just as well be a record). Hence some accessors. -(define (stat:dev f) (vector-ref f 0)) -(define (stat:ino f) (vector-ref f 1)) -(define (stat:mode f) (vector-ref f 2)) -(define (stat:nlink f) (vector-ref f 3)) -(define (stat:uid f) (vector-ref f 4)) -(define (stat:gid f) (vector-ref f 5)) -(define (stat:rdev f) (vector-ref f 6)) -(define (stat:size f) (vector-ref f 7)) -(define (stat:atime f) (vector-ref f 8)) -(define (stat:mtime f) (vector-ref f 9)) -(define (stat:ctime f) (vector-ref f 10)) -(define (stat:blksize f) (vector-ref f 11)) -(define (stat:blocks f) (vector-ref f 12)) - -;; derived from stat mode. -(define (stat:type f) (vector-ref f 13)) -(define (stat:perms f) (vector-ref f 14)) +(if (provided? 'socket) + (primitive-load-path "ice-9/networking.scm")) (define file-exists? - (if (feature? 'posix) + (if (provided? 'posix) (lambda (str) (access? str F_OK)) (lambda (str) @@ -604,12 +585,10 @@ #f))))) (define file-is-directory? - (if (feature? 'i/o-extensions) + (if (provided? 'posix) (lambda (str) (eq? (stat:type (stat str)) 'directory)) (lambda (str) - (display str) - (newline) (let ((port (catch 'system-error (lambda () (open-file (string-append str "/.") OPEN_READ)) @@ -650,82 +629,6 @@ (apply error "unhandled-exception:" key args)))) -;;; {Non-polymorphic versions of POSIX functions} - -(define (getgrnam name) (getgr name)) -(define (getgrgid id) (getgr id)) -(define (gethostbyaddr addr) (gethost addr)) -(define (gethostbyname name) (gethost name)) -(define (getnetbyaddr addr) (getnet addr)) -(define (getnetbyname name) (getnet name)) -(define (getprotobyname name) (getproto name)) -(define (getprotobynumber addr) (getproto addr)) -(define (getpwnam name) (getpw name)) -(define (getpwuid uid) (getpw uid)) -(define (getservbyname name proto) (getserv name proto)) -(define (getservbyport port proto) (getserv port proto)) -(define (endgrent) (setgr)) -(define (endhostent) (sethost)) -(define (endnetent) (setnet)) -(define (endprotoent) (setproto)) -(define (endpwent) (setpw)) -(define (endservent) (setserv)) -(define (getgrent) (getgr)) -(define (gethostent) (gethost)) -(define (getnetent) (getnet)) -(define (getprotoent) (getproto)) -(define (getpwent) (getpw)) -(define (getservent) (getserv)) -(define (setgrent) (setgr #f)) -(define (sethostent) (sethost #t)) -(define (setnetent) (setnet #t)) -(define (setprotoent) (setproto #t)) -(define (setpwent) (setpw #t)) -(define (setservent) (setserv #t)) - -(define (passwd:name obj) (vector-ref obj 0)) -(define (passwd:passwd obj) (vector-ref obj 1)) -(define (passwd:uid obj) (vector-ref obj 2)) -(define (passwd:gid obj) (vector-ref obj 3)) -(define (passwd:gecos obj) (vector-ref obj 4)) -(define (passwd:dir obj) (vector-ref obj 5)) -(define (passwd:shell obj) (vector-ref obj 6)) - -(define (group:name obj) (vector-ref obj 0)) -(define (group:passwd obj) (vector-ref obj 1)) -(define (group:gid obj) (vector-ref obj 2)) -(define (group:mem obj) (vector-ref obj 3)) - -(define (hostent:name obj) (vector-ref obj 0)) -(define (hostent:aliases obj) (vector-ref obj 1)) -(define (hostent:addrtype obj) (vector-ref obj 2)) -(define (hostent:length obj) (vector-ref obj 3)) -(define (hostent:addr-list obj) (vector-ref obj 4)) - -(define (netent:name obj) (vector-ref obj 0)) -(define (netent:aliases obj) (vector-ref obj 1)) -(define (netent:addrtype obj) (vector-ref obj 2)) -(define (netent:net obj) (vector-ref obj 3)) - -(define (protoent:name obj) (vector-ref obj 0)) -(define (protoent:aliases obj) (vector-ref obj 1)) -(define (protoent:proto obj) (vector-ref obj 2)) - -(define (servent:name obj) (vector-ref obj 0)) -(define (servent:aliases obj) (vector-ref obj 1)) -(define (servent:port obj) (vector-ref obj 2)) -(define (servent:proto obj) (vector-ref obj 3)) - -(define (sockaddr:fam obj) (vector-ref obj 0)) -(define (sockaddr:path obj) (vector-ref obj 1)) -(define (sockaddr:addr obj) (vector-ref obj 1)) -(define (sockaddr:port obj) (vector-ref obj 2)) - -(define (utsname:sysname obj) (vector-ref obj 0)) -(define (utsname:nodename obj) (vector-ref obj 1)) -(define (utsname:release obj) (vector-ref obj 2)) -(define (utsname:version obj) (vector-ref obj 3)) -(define (utsname:machine obj) (vector-ref obj 4)) (define (tm:sec obj) (vector-ref obj 0)) (define (tm:min obj) (vector-ref obj 1)) @@ -862,16 +765,15 @@ ;; This is mostly for the internal use of the code generated by ;; scm_compile_shell_switches. (define (load-user-init) - (define (has-init? dir) + (define (existing-file dir) (let ((path (in-vicinity dir ".guile"))) - (catch 'system-error - (lambda () - (let ((stats (stat path))) - (if (not (eq? (stat:type stats) 'directory)) - path))) - (lambda dummy #f)))) - (let ((path (or (has-init? (or (getenv "HOME") "/")) - (has-init? (passwd:dir (getpw (getuid))))))) + (if (and (file-exists? path) + (not (file-is-directory? path))) + path + #f))) + (let ((path (or (existing-file (or (getenv "HOME") "/")) + (and (provided? 'posix) + (existing-file (passwd:dir (getpw (getuid)))))))) (if path (primitive-load path)))) @@ -1000,7 +902,7 @@ (read-hash-extend #\. (lambda (c port) (eval (read port)))) -(if (feature? 'array) +(if (provided? 'array) (begin (let ((make-array-proc (lambda (template) (lambda (c port) @@ -2937,40 +2839,6 @@ (define-module (guile-user) :use-module (ice-9 emacs))) -;;; {I/O functions for Tcl channels (disabled)} - -;; (define in-ch (get-standard-channel TCL_STDIN)) -;; (define out-ch (get-standard-channel TCL_STDOUT)) -;; (define err-ch (get-standard-channel TCL_STDERR)) -;; -;; (define inp (%make-channel-port in-ch "r")) -;; (define outp (%make-channel-port out-ch "w")) -;; (define errp (%make-channel-port err-ch "w")) -;; -;; (define %system-char-ready? char-ready?) -;; -;; (define (char-ready? p) -;; (if (not (channel-port? p)) -;; (%system-char-ready? p) -;; (let* ((channel (%channel-port-channel p)) -;; (old-blocking (channel-option-ref channel :blocking))) -;; (dynamic-wind -;; (lambda () (set-channel-option the-root-tcl-interpreter channel :blocking "0")) -;; (lambda () (not (eof-object? (peek-char p)))) -;; (lambda () (set-channel-option the-root-tcl-interpreter channel :blocking old-blocking)))))) -;; -;; (define (top-repl) -;; (with-input-from-port inp -;; (lambda () -;; (with-output-to-port outp -;; (lambda () -;; (with-error-to-port errp -;; (lambda () -;; (scm-style-repl)))))))) -;; -;; (set-current-input-port inp) -;; (set-current-output-port outp) -;; (set-current-error-port errp) (define using-readline? (let ((using-readline? (make-fluid))) @@ -2999,10 +2867,13 @@ (define-module (guile-user) :use-module (ice-9 regex))) (let ((old-handlers #f) - (signals `((,SIGINT . "User interrupt") - (,SIGFPE . "Arithmetic error") - (,SIGBUS . "Bad memory access (bus error)") - (,SIGSEGV . "Bad memory access (Segmentation violation)")))) + (signals (if (provided? 'posix) + `((,SIGINT . "User interrupt") + (,SIGFPE . "Arithmetic error") + (,SIGBUS . "Bad memory access (bus error)") + (,SIGSEGV . + "Bad memory access (Segmentation violation)")) + '()))) (dynamic-wind diff --git a/ice-9/networking.scm b/ice-9/networking.scm new file mode 100644 index 000000000..c3ccb63be --- /dev/null +++ b/ice-9/networking.scm @@ -0,0 +1,71 @@ +;;; installed-scm-file + +;;;; Copyright (C) 1999 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, Inc., 59 Temple Place, Suite 330, +;;;; Boston, MA 02111-1307 USA +;;;; + +(define (gethostbyaddr addr) (gethost addr)) +(define (gethostbyname name) (gethost name)) + +(define (getnetbyaddr addr) (getnet addr)) +(define (getnetbyname name) (getnet name)) + +(define (getprotobyname name) (getproto name)) +(define (getprotobynumber addr) (getproto addr)) + +(define (getservbyname name proto) (getserv name proto)) +(define (getservbyport port proto) (getserv port proto)) + +(define (sethostent) (sethost #t)) +(define (setnetent) (setnet #t)) +(define (setprotoent) (setproto #t)) +(define (setservent) (setserv #t)) + +(define (gethostent) (gethost)) +(define (getnetent) (getnet)) +(define (getprotoent) (getproto)) +(define (getservent) (getserv)) + +(define (endhostent) (sethost)) +(define (endnetent) (setnet)) +(define (endprotoent) (setproto)) +(define (endservent) (setserv)) + +(define (hostent:name obj) (vector-ref obj 0)) +(define (hostent:aliases obj) (vector-ref obj 1)) +(define (hostent:addrtype obj) (vector-ref obj 2)) +(define (hostent:length obj) (vector-ref obj 3)) +(define (hostent:addr-list obj) (vector-ref obj 4)) + +(define (netent:name obj) (vector-ref obj 0)) +(define (netent:aliases obj) (vector-ref obj 1)) +(define (netent:addrtype obj) (vector-ref obj 2)) +(define (netent:net obj) (vector-ref obj 3)) + +(define (protoent:name obj) (vector-ref obj 0)) +(define (protoent:aliases obj) (vector-ref obj 1)) +(define (protoent:proto obj) (vector-ref obj 2)) + +(define (servent:name obj) (vector-ref obj 0)) +(define (servent:aliases obj) (vector-ref obj 1)) +(define (servent:port obj) (vector-ref obj 2)) +(define (servent:proto obj) (vector-ref obj 3)) + +(define (sockaddr:fam obj) (vector-ref obj 0)) +(define (sockaddr:path obj) (vector-ref obj 1)) +(define (sockaddr:addr obj) (vector-ref obj 1)) +(define (sockaddr:port obj) (vector-ref obj 2)) diff --git a/ice-9/posix.scm b/ice-9/posix.scm new file mode 100644 index 000000000..9698a0b8a --- /dev/null +++ b/ice-9/posix.scm @@ -0,0 +1,70 @@ +;;; installed-scm-file + +;;;; Copyright (C) 1999 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, Inc., 59 Temple Place, Suite 330, +;;;; Boston, MA 02111-1307 USA +;;;; + +(define (stat:dev f) (vector-ref f 0)) +(define (stat:ino f) (vector-ref f 1)) +(define (stat:mode f) (vector-ref f 2)) +(define (stat:nlink f) (vector-ref f 3)) +(define (stat:uid f) (vector-ref f 4)) +(define (stat:gid f) (vector-ref f 5)) +(define (stat:rdev f) (vector-ref f 6)) +(define (stat:size f) (vector-ref f 7)) +(define (stat:atime f) (vector-ref f 8)) +(define (stat:mtime f) (vector-ref f 9)) +(define (stat:ctime f) (vector-ref f 10)) +(define (stat:blksize f) (vector-ref f 11)) +(define (stat:blocks f) (vector-ref f 12)) + +;; derived from stat mode. +(define (stat:type f) (vector-ref f 13)) +(define (stat:perms f) (vector-ref f 14)) + +(define (passwd:name obj) (vector-ref obj 0)) +(define (passwd:passwd obj) (vector-ref obj 1)) +(define (passwd:uid obj) (vector-ref obj 2)) +(define (passwd:gid obj) (vector-ref obj 3)) +(define (passwd:gecos obj) (vector-ref obj 4)) +(define (passwd:dir obj) (vector-ref obj 5)) +(define (passwd:shell obj) (vector-ref obj 6)) + +(define (group:name obj) (vector-ref obj 0)) +(define (group:passwd obj) (vector-ref obj 1)) +(define (group:gid obj) (vector-ref obj 2)) +(define (group:mem obj) (vector-ref obj 3)) + +(define (utsname:sysname obj) (vector-ref obj 0)) +(define (utsname:nodename obj) (vector-ref obj 1)) +(define (utsname:release obj) (vector-ref obj 2)) +(define (utsname:version obj) (vector-ref obj 3)) +(define (utsname:machine obj) (vector-ref obj 4)) + +(define (getpwent) (getpw)) +(define (setpwent) (setpw #t)) +(define (endpwent) (setpw)) + +(define (getpwnam name) (getpw name)) +(define (getpwuid uid) (getpw uid)) + +(define (getgrent) (getgr)) +(define (setgrent) (setgr #f)) +(define (endgrent) (setgr)) + +(define (getgrnam name) (getgr name)) +(define (getgrgid id) (getgr id)) diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 44464d9f2..0d09456c2 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,3 +1,16 @@ +1999-09-23 Gary Houston + + * ioext.c (scm_init_ioext): enable "i/o-extensions" feature here + instead of in scm_init_filesys. + + * init.c (scm_boot_guile_1): don't call scm_init_posix or + scm_init_filesys unless HAVE_POSIX is defined. + don't call scm_init_netdb or scm_init_socket unless + HAVE_NETWORKING is defined. + + * Makefile.am (EXTRA_libguile_la_SOURCES): filesys.c, posix.c, + net_db.c, socket.c: moved here from libguile_la_SOURCES. + 1999-09-25 Jim Blandy * root.c (scm_make_root): Initialize all the fields of the new diff --git a/libguile/Makefile.am b/libguile/Makefile.am index e6f4f22eb..061982107 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -37,13 +37,13 @@ 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 \ + evalext.c feature.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 \ + modules.c numbers.c objects.c objprop.c options.c pairs.c \ + ports.c print.c procprop.c procs.c ramap.c random.c read.c \ + root.c scmsigs.c script.c simpos.c smob.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 @@ -64,7 +64,8 @@ BUILT_SOURCES = \ EXTRA_libguile_la_SOURCES = _scm.h \ alloca.c inet_aton.c memmove.c putenv.c strerror.c \ - threads.c regex-posix.c iselect.c + threads.c regex-posix.c iselect.c \ + filesys.c posix.c netdb.c socket.c ## This is kind of nasty... there are ".c" files that we don't want to ## compile, since they are #included in threads.c. So instead we list diff --git a/libguile/Makefile.in b/libguile/Makefile.in index de9432cd1..d6cd522ef 100644 --- a/libguile/Makefile.in +++ b/libguile/Makefile.in @@ -102,13 +102,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 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 +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 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 numbers.c objects.c objprop.c options.c pairs.c ports.c print.c procprop.c procs.c ramap.c random.c read.c root.c scmsigs.c script.c simpos.c smob.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 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 alloca.c inet_aton.c memmove.c putenv.c strerror.c threads.c regex-posix.c iselect.c +EXTRA_libguile_la_SOURCES = _scm.h alloca.c inet_aton.c memmove.c putenv.c strerror.c threads.c regex-posix.c iselect.c filesys.c posix.c netdb.c socket.c noinst_HEADERS = coop-threads.c coop-threads.h coop.c @@ -163,16 +163,16 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libguile_la_OBJECTS = alist.lo arbiters.lo async.lo backtrace.lo \ 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 \ +error.lo eval.lo evalext.lo feature.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 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 +mallocs.lo modules.lo numbers.lo objects.lo objprop.lo options.lo \ +pairs.lo ports.lo print.lo procprop.lo procs.lo ramap.lo random.lo \ +read.lo root.lo scmsigs.lo script.lo simpos.lo smob.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 @@ -216,7 +216,7 @@ DEP_FILES = .deps/alist.P .deps/alloca.P .deps/arbiters.P .deps/async.P \ .deps/hash.P .deps/hashtab.P .deps/inet_aton.P .deps/init.P \ .deps/ioext.P .deps/iselect.P .deps/keywords.P .deps/lang.P \ .deps/list.P .deps/load.P .deps/macros.P .deps/mallocs.P \ -.deps/memmove.P .deps/modules.P .deps/net_db.P .deps/numbers.P \ +.deps/memmove.P .deps/modules.P .deps/netdb.P .deps/numbers.P \ .deps/objects.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/random.P .deps/read.P \ diff --git a/libguile/filesys.c b/libguile/filesys.c index 2f172c4d7..1d857dbed 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -1203,8 +1203,6 @@ scm_basename (SCM filename, SCM suffix) void scm_init_filesys () { - scm_add_feature ("i/o-extensions"); - scm_tc16_dir = scm_make_smob_type_mfpe ("directory", 0, NULL, scm_dir_free,scm_dir_print, NULL); diff --git a/libguile/init.c b/libguile/init.c index 73315e548..82e5977b0 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -461,7 +461,6 @@ scm_boot_guile_1 (base, closure) scm_init_fluids (); scm_init_backtrace (); /* Requires fluids */ scm_init_fports (); - scm_init_filesys (); scm_init_gc (); scm_init_gdbint (); scm_init_hash (); @@ -475,20 +474,25 @@ scm_boot_guile_1 (base, closure) scm_init_macros (); scm_init_mallocs (); scm_init_modules (); - scm_init_net_db (); scm_init_numbers (); scm_init_objprop (); scm_init_options (); scm_init_pairs (); scm_init_ports (); +#ifdef HAVE_POSIX + scm_init_filesys (); scm_init_posix (); +#endif #ifdef HAVE_REGCOMP scm_init_regex_posix (); #endif scm_init_procs (); scm_init_procprop (); scm_init_scmsigs (); +#ifdef HAVE_NETWORKING + scm_init_net_db (); scm_init_socket (); +#endif scm_init_sort (); #ifdef DEBUG_EXTENSIONS scm_init_srcprop (); diff --git a/libguile/ioext.c b/libguile/ioext.c index 86ee512de..c3c4599b6 100644 --- a/libguile/ioext.c +++ b/libguile/ioext.c @@ -505,6 +505,8 @@ scm_fdes_to_ports (fd) void scm_init_ioext () { + scm_add_feature ("i/o-extensions"); + #include "ioext.x" } diff --git a/libguile/scmconfig.h.in b/libguile/scmconfig.h.in index c5bce416e..a1cc26e8d 100644 --- a/libguile/scmconfig.h.in +++ b/libguile/scmconfig.h.in @@ -150,6 +150,10 @@ /* This is included as part of a workaround for a autoheader bug. */ #undef HAVE_REGCOMP +#undef HAVE_POSIX + +#undef HAVE_NETWORKING + /* Define if the operating system supplies bzero without declaring it. */ #undef MISSING_BZERO_DECL -- 2.20.1