diff --git a/guile-readline/.cvsignore b/guile-readline/.cvsignore index 0d3a474f6..22b5d0d48 100644 --- a/guile-readline/.cvsignore +++ b/guile-readline/.cvsignore @@ -14,8 +14,11 @@ config.status config.sub configure depcomp +guile-readline-config.h +guile-readline-config.h.in install-sh libtool ltmain.sh missing mkinstalldirs +stamp-h1 diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am index 6d6e16882..f1f038755 100644 --- a/guile-readline/Makefile.am +++ b/guile-readline/Makefile.am @@ -26,7 +26,7 @@ DEFS = @DEFS@ @EXTRA_DEFS@ ## Check for headers in $(srcdir)/.., so that #include ## will find MUMBLE.h in this dir when we're ## building. -INCLUDES = -I.. -I$(srcdir)/.. +INCLUDES = -I. -I.. -I$(srcdir)/.. GUILE_SNARF = ../libguile/guile-snarf diff --git a/guile-readline/configure.in b/guile-readline/configure.in index 1f0a08cd4..b58b46b87 100644 --- a/guile-readline/configure.in +++ b/guile-readline/configure.in @@ -2,7 +2,9 @@ AC_PREREQ(2.50) AC_INIT(guile-readline, m4_esyscmd(. ../GUILE-VERSION && echo -n ${GUILE_VERSION})) +AC_CONFIG_AUX_DIR([.]) AC_CONFIG_SRCDIR(readline.c) +AM_CONFIG_HEADER([guile-readline-config.h]) AM_INIT_AUTOMAKE([foreign no-define]) . $srcdir/../GUILE-VERSION @@ -58,7 +60,8 @@ ac_cv_var_rl_pre_input_hook=yes, ac_cv_var_rl_pre_input_hook=no)]) AC_MSG_RESULT($ac_cv_var_rl_pre_input_hook) if test $ac_cv_var_rl_pre_input_hook = yes; then - AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK) + AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK,1, + [Define if rl_pre_input_hook is available.]) fi @@ -107,7 +110,8 @@ guile_cv_sigwinch_sa_restart_cleared=no, guile_cv_sigwinch_sa_restart_cleared=yes)) AC_MSG_RESULT($guile_cv_sigwinch_sa_restart_cleared) if test $guile_cv_sigwinch_sa_restart_cleared = yes; then - AC_DEFINE(GUILE_SIGWINCH_SA_RESTART_CLEARED) + AC_DEFINE(GUILE_SIGWINCH_SA_RESTART_CLEARED, 1, + [Define if readline disables SA_RESTART.]) fi AC_CACHE_CHECK([for rl_getc_function pointer in readline], diff --git a/guile-readline/readline.c b/guile-readline/readline.c index 37eab2433..4eab67582 100644 --- a/guile-readline/readline.c +++ b/guile-readline/readline.c @@ -22,11 +22,9 @@ -#if HAVE_CONFIG_H -# include -#endif +/* Include private, configure generated header (i.e. config.h). */ +#include "guile-readline-config.h" -#include "libguile/_scm.h" #ifdef HAVE_RL_GETC_FUNCTION #include "libguile.h" #include "libguile/gh.h" diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog index f0e8294b2..690a76780 100644 --- a/ice-9/ChangeLog +++ b/ice-9/ChangeLog @@ -1,3 +1,15 @@ +2006-05-28 Kevin Ryde + + * documentation.scm (file-commentary): Move make-regexp into + file-commentary so that it's possible to get to the repl prompt when + regexps are not available. + +2006-05-09 Kevin Ryde + + * threads.scm (n-par-for-each, n-for-each-par-map): Two more spots + where `futures' should become `threads' from Marius' change of + 2006-01-29. + 2006-03-04 Ludovic Courtès * ice-9/boot-9.scm (make-autoload-interface): Don't call `set-car!' if diff --git a/ice-9/documentation.scm b/ice-9/documentation.scm index 4cf3263b0..6e74799e6 100644 --- a/ice-9/documentation.scm +++ b/ice-9/documentation.scm @@ -90,14 +90,21 @@ ;; ;; commentary extraction ;; -(define default-in-line-re (make-regexp "^;;; Commentary:")) -(define default-after-line-re (make-regexp "^;;; Code:")) -(define default-scrub (let ((dirt (make-regexp "^;+"))) - (lambda (line) - (let ((m (regexp-exec dirt line))) - (if m (match:suffix m) line))))) (define (file-commentary filename . cust) ; (IN-LINE-RE AFTER-LINE-RE SCRUB) + + ;; These are constants but are not at the top level because the repl in + ;; boot-9.scm loads session.scm which in turn loads this file, and we want + ;; that to work even even when regexps are not available (ie. make-regexp + ;; doesn't exist), as for instance is the case on mingw. + ;; + (define default-in-line-re (make-regexp "^;;; Commentary:")) + (define default-after-line-re (make-regexp "^;;; Code:")) + (define default-scrub (let ((dirt (make-regexp "^;+"))) + (lambda (line) + (let ((m (regexp-exec dirt line))) + (if m (match:suffix m) line))))) + ;; fixme: might be cleaner to use optargs here... (let ((in-line-re (if (> 1 (length cust)) default-in-line-re diff --git a/ice-9/threads.scm b/ice-9/threads.scm index 74021dc3d..cdabb2417 100644 --- a/ice-9/threads.scm +++ b/ice-9/threads.scm @@ -86,7 +86,7 @@ (threads '())) (do ((i 0 (+ 1 i))) ((= i n) - (for-each join-thread futures)) + (for-each join-thread threads)) (set! threads (cons (begin-thread (let loop () @@ -115,7 +115,7 @@ of applying P-PROC on ARGLISTS." (result results)) (do ((i 0 (+ 1 i))) ((= i n) - (for-each join-thread futures)) + (for-each join-thread threads)) (set! threads (cons (begin-thread (let loop () diff --git a/libguile-ltdl/.cvsignore b/libguile-ltdl/.cvsignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/COPYING.LIB b/libguile-ltdl/COPYING.LIB deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/ChangeLog b/libguile-ltdl/ChangeLog deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/Makefile.am b/libguile-ltdl/Makefile.am deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/README b/libguile-ltdl/README deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/guile-ltdl.c b/libguile-ltdl/guile-ltdl.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/guile-ltdl.h b/libguile-ltdl/guile-ltdl.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/raw-ltdl.c b/libguile-ltdl/raw-ltdl.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/raw-ltdl.h b/libguile-ltdl/raw-ltdl.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/upstream/.cvsignore b/libguile-ltdl/upstream/.cvsignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/upstream/Makefile.am b/libguile-ltdl/upstream/Makefile.am deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/upstream/ltdl.c b/libguile-ltdl/upstream/ltdl.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/libguile-ltdl/upstream/ltdl.h b/libguile-ltdl/upstream/ltdl.h deleted file mode 100644 index e69de29bb..000000000