1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-03 18:50:19 +02:00

Delete the test which compares the configuration date of libguile

with the configuration date of ice-9.  This test yields too many
false positives to be helpful.  For example, if you build Guile
for several architectures but have them all share a "share"
directory (which is supposed to work), then all but one
architecture's Guile will complain that the configuration dates
don't match.  Which is true, but indicates nothing wrong.
* boot-9.scm: Delete code which compares ice-9-config-stamp with
libguile-config-stamp.
* version.scm.in: Delete.
* Makefile.am (ice9_generated): Delete.
(subpkgdata_DATA): Remove ice9_generated.
(EXTRA_DIST): Remove version.scm.in.
* Makefile.in: Regenerate.
This commit is contained in:
Jim Blandy 1999-09-11 15:05:25 +00:00
parent 227a851cb3
commit 4d31f0da8f
4 changed files with 47 additions and 33 deletions

View file

@ -31,12 +31,9 @@ ice9_sources = \
r4rs.scm readline.scm regex.scm runq.scm session.scm slib.scm \
streams.scm string-fun.scm syncase.scm tags.scm threads.scm
# These should be installed, but not distributed.
ice9_generated = version.scm
subpkgdatadir = $(pkgdatadir)/$(VERSION)/ice-9
subpkgdata_DATA = $(ice9_sources) $(ice9_generated)
subpkgdata_DATA = $(ice9_sources)
ETAGS_ARGS = $(subpkgdata_DATA)
## test.scm is not currently installed.
EXTRA_DIST = $(ice9_sources) test.scm version.scm.in
EXTRA_DIST = $(ice9_sources) test.scm

View file

@ -67,7 +67,6 @@ DLLTOOL = @DLLTOOL@
GUILE_LIBS = @GUILE_LIBS@
GUILE_MAJOR_VERSION = @GUILE_MAJOR_VERSION@
GUILE_MINOR_VERSION = @GUILE_MINOR_VERSION@
GUILE_STAMP = @GUILE_STAMP@
GUILE_VERSION = @GUILE_VERSION@
LD = @LD@
LIBLOBJS = @LIBLOBJS@
@ -97,14 +96,11 @@ AUTOMAKE_OPTIONS = foreign
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 readline.scm regex.scm runq.scm session.scm slib.scm streams.scm string-fun.scm syncase.scm tags.scm threads.scm
# These should be installed, but not distributed.
ice9_generated = version.scm
subpkgdatadir = $(pkgdatadir)/$(VERSION)/ice-9
subpkgdata_DATA = $(ice9_sources) $(ice9_generated)
subpkgdata_DATA = $(ice9_sources)
ETAGS_ARGS = $(subpkgdata_DATA)
EXTRA_DIST = $(ice9_sources) test.scm version.scm.in
EXTRA_DIST = $(ice9_sources) test.scm
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../libguile/scmconfig.h
CONFIG_CLEAN_FILES = version.scm

View file

@ -3059,30 +3059,51 @@
;;;
(define exit-hook (make-hook))
;;; Load readline code into root module if readline primitives are available.
;;;
;;; Ideally, we wouldn't do this until we were sure we were actually
;;; going to enter the repl, but autoloading individual functions is
;;; clumsy at the moment.
(if (and (memq 'readline *features*)
(isatty? (current-input-port)))
(begin
(define-module (guile) :use-module (ice-9 readline))
(define-module (guile-user) :use-module (ice-9 readline))))
;;; {Load debug extension code into user module if debug extensions present.}
;;;
;;; *fixme* This is a temporary solution.
;;;
(if (memq 'debug-extensions *features*)
(define-module (guile-user) :use-module (ice-9 debug)))
;;; {Load session support into user module if present.}
;;;
;;; *fixme* This is a temporary solution.
;;;
(if (%search-load-path "ice-9/session.scm")
(define-module (guile-user) :use-module (ice-9 session)))
;;; {Load thread code into user module if threads are present.}
;;;
;;; *fixme* This is a temporary solution.
;;;
(if (memq 'threads *features*)
(define-module (guile-user) :use-module (ice-9 threads)))
;;; {Load regexp code if regexp primitives are available.}
(if (memq 'regex *features*)
(define-module (guile-user) :use-module (ice-9 regex)))
(define-module (guile))
;;; {Check that the interpreter and scheme code match up.}
(let ((show-line
(lambda args
(with-output-to-port (current-error-port)
(lambda ()
(display (car (command-line)))
(display ": ")
(for-each (lambda (string) (display string))
args)
(newline))))))
(load-from-path "ice-9/version.scm")
(if (not (string=?
(libguile-config-stamp) ; from the interprpreter
(ice-9-config-stamp))) ; from the Scheme code
(begin
(show-line "warning: different versions of libguile and ice-9:")
(show-line "libguile: configured on " (libguile-config-stamp))
(show-line "ice-9: configured on " (ice-9-config-stamp)))))
(append! %load-path (cons "." ()))

View file