Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Sat, 24 Nov 2018 22:30:53 +0000 (15:30 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Sat, 24 Nov 2018 22:30:53 +0000 (15:30 -0700)
41 files changed:
1  2 
dist/make-src-files
dist/shared.sh
doc/configure.ac
doc/mit-scheme-pucked.1
doc/ref-manual/scheme.texinfo
doc/user-manual/user.texinfo
src/Makefile.in
src/blowfish/Makefile.am
src/blowfish/blowfish.texi
src/blowfish/compile.sh
src/blowfish/configure.ac
src/configure.ac
src/edwin/Makefile.am
src/edwin/configure.ac
src/edwin/edwin.pkg
src/edwin/edwin.sf
src/edwin/make.scm
src/gdbm/Makefile.am
src/gdbm/compile.sh
src/gdbm/configure.ac
src/gdbm/gdbm.texi
src/imail/Makefile.am
src/imail/configure.ac
src/mcrypt/Makefile.am
src/mcrypt/compile.sh
src/mcrypt/configure.ac
src/mcrypt/mcrypt.pkg
src/microcode/configure.ac
src/microcode/mit_scheme_native_code.m4
src/pgsql/Makefile.am
src/pgsql/compile.sh
src/pgsql/configure.ac
src/runtime/mit-macros.scm
src/runtime/runtime.pkg
src/runtime/version.scm
src/x11-screen/Makefile.am
src/x11-screen/configure.ac
src/x11-screen/make.scm
src/x11-screen/x11-screen.pkg
src/x11/Makefile.am
src/x11/configure.ac

Simple merge
diff --cc dist/shared.sh
index 0ed9d674e186ee8e00b610b06ac5c5cc5321ad30,d1e5a6d1531730f1e74b9b7c06d469402801b346..e4f719f08df892ada5bc8b1f12441d2fa8d57041
@@@ -100,9 -100,7 +100,9 @@@ LIARC_OUT=${OUTPUT_DIR}/liar
  NATIVE_OUT=${OUTPUT_DIR}/native
  MACOSX_OUT=${OUTPUT_DIR}/macosx
  
- PLUGINS="blowfish gdbm mcrypt edwin imail x11 x11-screen"
- PLUGINS="$PLUGINS berkeley-db pgsql"
- PLUGINS="$PLUGINS cairo gl glib gtk gtk-screen pango planetarium devops"
+ PLUGINS=(blowfish gdbm mcrypt edwin imail x11 x11-screen)
++PLUGINS=($PLUGINS berkeley-db pgsql)
++PLUGINS=($PLUGINS cairo gl glib gtk gtk-screen pango planetarium devops)
  
  notify ()
  {
index 8d7e0f41fd858b9208f4d5b17e9c44d0f665ff7a,a269e46217ab3ff7cea0a89fd8d954fc9cf11473..c9cd49b0392b7d364d174fc2f276623d8f70f8b8
@@@ -1,9 -1,9 +1,9 @@@
  dnl Process this file with autoconf to produce a configure script.
  
 -AC_INIT([MIT/GNU Scheme documentation],
 +AC_INIT([MIT/GNU Scheme Pucked documentation],
-       [9.2.19],
+       [10.1.2],
 -      [bug-mit-scheme@gnu.org],
 -      [mit-scheme-doc])
 +      [matt@birchwood-abbey.net],
 +      [mit-scheme-pucked-doc])
  AC_CONFIG_SRCDIR([ref-manual/scheme.texinfo])
  
  AC_COPYRIGHT(
@@@ -43,32 -43,41 +43,36 @@@ PROJECT=mit-scheme-pucke
  TARGETS=
  INST_TARGETS=
  
 -AC_ARG_ENABLE([html],
 -    [AC_HELP_STRING([--enable-html],
 -        [generate HTML documentation [[yes]]])])
 -: ${enable_html=yes}
 -if test x"${enable_html}" = xno; then
 -    htmldir=
 -elif test x"${enable_html}" != xyes; then
 -    htmldir=${enable_html}
 -fi
 -test x"${htmldir}" = x || TARGETS="${TARGETS} \$(TARGET_ROOT)/index.html"
 -test x"${htmldir}" = x || INST_TARGETS="${INST_TARGETS} install-html"
 +# Install docs in subdirectories by medium, in anticipation of dozens
 +# of little plugin manuals.
 +docdir='$(datarootdir)/doc/$(PROJECT)'
 +htmldir='$(docdir)/html'
 +pdfdir='$(docdir)/pdf'
 +psdir='$(docdir)/ps'
  
  AC_ARG_ENABLE([pdf],
-       [AC_HELP_STRING([--enable-pdf], [generate PDF documentation])])
- if test "${enable_pdf}" = "no"; then
+     [AC_HELP_STRING([--enable-pdf],
+       [generate PDF documentation [[yes]]])])
+ : ${enable_pdf=yes}
+ if test x"${enable_pdf}" = xno; then
      pdfdir=
- elif test "${enable_pdf:-yes}" != "yes"; then
-     pdfdir="${enable_pdf}"
+ elif test x"${enable_pdf}" != xyes; then
+     pdfdir=${enable_pdf}
  fi
- test "${pdfdir}" = "" || TARGETS="${TARGETS} \$(TARGET_ROOT).pdf"
- test "${pdfdir}" = "" || INST_TARGETS="${INST_TARGETS} install-pdf"
+ test x"${pdfdir}" = x || TARGETS="${TARGETS} \$(TARGET_ROOT).pdf"
+ test x"${pdfdir}" = x || INST_TARGETS="${INST_TARGETS} install-pdf"
  
  AC_ARG_ENABLE([ps],
-       [AC_HELP_STRING([--enable-ps], [generate Postscript documentation])])
- if test "${enable_ps:-no}" = "no"; then
+     [AC_HELP_STRING([--enable-ps],
+       [generate Postscript documentation [[no]]])])
+ : ${enable_pdf=no}
+ if test x"${enable_ps}" = xno; then
      psdir=
- elif test "${enable_ps}" != "yes"; then
-     psdir="${enable_ps}"
+ elif test x"${enable_ps}" != xyes; then
+     psdir=${enable_ps}
  fi
- test "${psdir}" = "" || TARGETS="${TARGETS} \$(TARGET_ROOT).ps"
- test "${psdir}" = "" || INST_TARGETS="${INST_TARGETS} install-ps"
+ test x"${psdir}" = x || TARGETS="${TARGETS} \$(TARGET_ROOT).ps"
+ test x"${psdir}" = x || INST_TARGETS="${INST_TARGETS} install-ps"
  
  AC_SUBST([PROJECT])
  AC_SUBST([TARGETS])
index 8778c4cde420a48db805e56c0c540f14da877fb5,9daf5c5454719a24d32d83716e80ad3b034a6cf6..fd386962c5afd9335902560764e4f989e5c8ae1d
@@@ -1,10 -1,10 +1,10 @@@
- .TH "mit-scheme-pucked" "1" "9.2" "Friar Puck and The MIT/GNU Scheme Team" ""
 -.TH "mit-scheme" "1" "10.1.2" "MIT/GNU Scheme Team" ""
++.TH "mit-scheme-pucked" "1" "10.1.2" "Friar Puck and The MIT/GNU Scheme Team" ""
  .SH "NAME"
  .LP
 -mit-scheme - The MIT/GNU Scheme development environment
 +mit-scheme-pucked - Friar Puck's MIT/GNU Scheme development environment
  .SH "SYNOPSIS"
  .LP 
 -.B mit-scheme
 +.B mit-scheme-pucked
  .RI [ OPTIONS ]
  .br 
  .SH "DESCRIPTION"
index a62029f9b4389e4fe50abf13fe141c66d3e297b8,e060a982881d25165d80c9d4cca6fd9e968ea243..19b9ebf60b60157f4d571444eda396a62dfa1283
@@@ -1,11 -1,10 +1,11 @@@
  \input texinfo @c -*-texinfo-*-
  @comment %**start of header
 -@setfilename mit-scheme-ref
 +@setfilename reference
 +@comment From automake's version.texi someday:
  @set EDITION 1.106
 -@set VERSION 10.1.2
 -@set UPDATED 2017-02-15
 -@settitle MIT/GNU Scheme @value{VERSION}
 +@set UPDATED 19 May 2018
- @set SCMVERS 9.2.15
++@set SCMVERS 10.1.2
 +@settitle MIT/GNU Scheme Pucked Reference Manual
  @comment %**end of header
  @setchapternewpage odd
  @finalout
index 797a74effbe55cecce230aa4d8d80737516df801,712883ddb10bbb9bac8937bfe3f3b37655f37272..16b488726ecf9eaa474e08a10179d719399607e4
@@@ -1,11 -1,10 +1,11 @@@
  \input texinfo @c -*-texinfo-*-
  @comment %**start of header
 -@setfilename mit-scheme-user
 +@setfilename user
 +@comment From automake's version.texi someday:
- @set EDITION 1.0
+ @set EDITION 1.95
 -@set VERSION 10.1.2
 -@set UPDATED 2015-11-25
 -@settitle MIT/GNU Scheme @value{VERSION}
 +@set UPDATED 5 June 2018
- @set SCMVERS 9.2.15
++@set SCMVERS 10.1.2
 +@settitle MIT/GNU Scheme Pucked User Manual
  @comment %**end of header
  @setchapternewpage odd
  @finalout
@@@ -110,21 -114,279 +110,274 @@@ list of user-visible changes is provide
  The primary distribution site for this software is
  
  @example
 -@uref{http://www.gnu.org/software/mit-scheme/}
 +@uref{https://birchwood-abbey.net/~puck/Scheme/}
  @end example
  
 -@noindent
 -Although our software is distributed from other sites and in other
 -media, the complete distribution and the most recent release is always
 -available at our site.
 -
  @cindex bugs, reporting
  @cindex reporting bugs
 -To report bugs, use the bug-reporting tool at
 +To report bugs, send email to
  
  @example
 -@uref{http://savannah.gnu.org/projects/mit-scheme/}
 +@uref{puck@@birchwood-abbey.net}
  @end example
  
 -@noindent
  Please include the output of the @code{identify-world} procedure
 -(@pxref{Basics of Starting Scheme}), so we know what version of the
 -system you are using.
 +(@pxref{Basics of Starting Scheme}), so Puck knows what versions you
 +are using.
  
+ @node Installation
+ @chapter Installation
+ This chapter describes how to install MIT/GNU Scheme.  The release is
+ supported under various unix and Windows operating systems.  Read the
+ section detailing the installation for the operating system that you are
+ using.
+ @menu
+ * Unix Installation::
+ * Windows Installation::
+ * Portable C Installation::
+ @end menu
+ @node Unix Installation
+ @section Unix Installation
+ We will use as an example the installation for GNU/Linux.  The
+ installation for other unix systems is similar.  There are several
+ references to @var{ARCH} below; these refer to the computer
+ architecture that Scheme is compiled for: either @samp{i386}
+ @samp{x86-64}, or @samp{svm1}.
+ MIT/GNU Scheme is distributed as a compressed `tar' file.  The tar
+ file contains both source and binary files; the binary files are
+ pre-compiled Scheme code for a particular computer architecture.  The
+ source files are C programs that need to be compiled.
+ @heading Requirements
+ At a minimum, you will need a C compiler (e.g. @samp{gcc}) and a
+ @samp{make} program, and a ``curses'' library.  For example, here are
+ the packages that must be installed on some popular systems:
+ @itemize @bullet
+ @item
+ Debian-like systems: @code{gcc} @code{make} @code{libncurses-dev}
+ @item
+ CentOS-like systems: @code{gcc} @code{make} @code{ncurses-devel}
+ @item
+ macOS systems: @code{Xcode}
+ @end itemize
+ Additionally, if you want support for X11 graphics, you'll need:
+ @itemize @bullet
+ @item
+ Debian-like systems: @code{libx11-dev}
+ @item
+ CentOS-like systems: @code{libX11-devel}
+ @item
+ macOS systems: @code{XQuartz} (from @url{https://www.xquartz.org/})
+ @end itemize
+ @heading Steps
+ In order to install the software, it's necessary to configure and
+ compile the C code, then to install the combined C and Scheme
+ binaries, with the following steps.
+ @enumerate
+ @item
+ Unpack the tar file,
+ @file{mit-scheme-@var{VERSION}-@var{ARCH}.tar.gz}, into the directory
+ @file{mit-scheme-@var{VERSION}}.  For example,
+ @example
+ tar xzf mit-scheme-@var{VERSION}-i386.tar.gz
+ @end example
+ will create a new directory @file{mit-scheme-@var{VERSION}}.
+ @item
+ Move into the @file{src} subdirectory of the new directory:
+ @example
+ cd mit-scheme-@var{VERSION}/src
+ @end example
+ @item
+ Configure the software:
+ @example
+ ./configure
+ @end example
+ By default, the software will be installed in @file{/usr/local}, in
+ the subdirectories @file{bin} and @file{lib}.  If you want it
+ installed somewhere else, for example @file{/opt/mit-scheme}, pass the
+ @option{--prefix} option to the configure script, as in
+ @kbd{./configure --prefix=/opt/mit-scheme}.
+ The configure script accepts all the normal arguments for such
+ scripts, and additionally accepts some that are specific to MIT/GNU
+ Scheme.  To see all the possible arguments and their meanings, run the
+ command @kbd{./configure --help}.  However, do not specify the
+ following options, which are all preconfigured to the right values;
+ doing so will probably cause the build to fail:
+ @example
+ --enable-native-code
+ --enable-host-scheme-test
+ --enable-cross-compiling
+ --with-compiler-target
+ --with-default-target
+ --with-scheme-build
+ @end example
+ @item
+ Build the software:
+ @example
+ make
+ @end example
+ @item
+ Install the software:
+ @example
+ make install
+ @end example
+ Depending on configuration options and file-system permissions, you
+ may need super-user privileges to do the installation steps.
+ @item
+ Build the documentation:
+ @example
+ cd ../doc
+ ./configure
+ make
+ @end example
+ @item
+ Install the documentation:
+ @example
+ make install-info install-html install-pdf
+ @end example
+ Depending on configuration options and file-system permissions, you
+ may need super-user privileges to do the installation step.
+ @end enumerate
+ @heading Plugins
+ After you have installed Scheme you may want to install several
+ @dfn{plugins}.  Scheme no longer uses dynamically loaded microcode
+ modules installed with Scheme.  The micromodules have been converted
+ into plugins: new subsystems that use the C/FFI to dynamically load
+ the same code.  Instead you configure, build, and install additional
+ plugins after installing the core system.
+ By default, the following plugins are built and installed:
+ @file{edwin}, @file{imail}, @file{x11}, and @file{x11-screen}.  (The
+ latter two only if X11 libraries are installed on your system.)  To
+ get all of the functionality previously available in version 9.2 you
+ will need to build and install the remaining plugins included in the
+ @file{src} subdirectory: @file{blowfish}, @file{gdbm}, @file{mcrypt},
+ and @file{pgsql}.  These plugins are all configured, built, and
+ installed in the GNU standard way.  See the @file{README} file in each
+ plugin's source directory for complete details.
+ @heading Cleanup
+ After installing Scheme and your desired plugins, you can delete the
+ source directory:
+ @example
+ cd ../..
+ rm -rf mit-scheme-@var{VERSION}
+ @end example
+ @node Windows Installation
+ @section Windows Installation
+ This section describes how to install MIT/GNU Scheme on Windows 2000,
+ Windows XP, Windows Vista, or Windows 7.
+ MIT/GNU Scheme is distributed as a self-installing executable.
+ Installation of the software is straightforward.  Simply execute the
+ downloaded file and answer the installer's questions.  The installer
+ will allow you to choose the directory in which MIT/GNU Scheme is
+ to be installed, and the name of the folder in which the shortcuts are
+ to be placed.
+ To uninstall the software, open up the @code{Control Panel}, run
+ @samp{Add/Remove Programs}, and double-click on @samp{MIT/GNU Scheme}.
+ @node Portable C Installation
+ @section Portable C Installation
+ This section describes how to generate binaries from the portable C
+ distribution. These binaries should run with little or no trouble on most
+ modern architectures and operating systems.  It will probably require
+ tweaking for systems that haven't been tested.
+ When built this way, the system runs slower than when it is built
+ using the native-code compiler. For this reason, you will usually want
+ to use native-code binaries when running on a 32-bit Intel
+ architecture machine.  However, the portable-code binaries can address
+ larger amounts of virtual memory than the native-code binaries, so it
+ is reasonable (and supported) to use both kinds on the same machine.
+ @enumerate
+ @item
+ Unpack the tar file,
+ @file{mit-scheme-c-@var{VERSION}.tar.gz}, into the directory
+ @file{mit-scheme-c-@var{VERSION}}.  For example,
+ @example
+ tar xzf mit-scheme-c-@var{VERSION}.tar.gz
+ @end example
+ will create a new directory @file{mit-scheme-c-@var{VERSION}}.
+ @item
+ Move into the new directory:
+ @example
+ cd mit-scheme-c-@var{VERSION}/src
+ @end example
+ @item
+ Build the program:
+ @example
+ ./etc/make-liarc.sh
+ @end example
+ This will take a long time; on fairly fast machines with lots of RAM
+ it takes about an hour.  On older machines it will take longer or fail
+ altogether, at which point you should ask for help.  Note that you can
+ pass configure options to the script.
+ @example
+ ./etc/make-liarc.sh --help
+ ./etc/make-liarc.sh --prefix=/usr
+ @end example
+ @item
+ Install the program:
+ @example
+ make install
+ @end example
+ Depending on configuration options and file-system permissions, you
+ may need super-user privileges to do the installation step.
+ @end enumerate
++>>>>>>> aafa6ac04e1b39110227242465d9dc1b8ef2e85b
  @node Running Scheme
  @chapter Running Scheme
  
diff --cc src/Makefile.in
index 1343eb2da64d15e91d94c330927b3ad059e1dc85,3d68d8a168a478dd4136b52f142ff71cdc2a3f59..74212d59a97979b558f35afc022bc5ba400b2986
@@@ -64,10 -63,10 +63,11 @@@ mkinstalldirs = $(SHELL) $(top_srcdir)/
  LIARC_BOOT_BUNDLES = compiler cref sf star-parser
  LIARC_BUNDLES = $(LIARC_BOOT_BUNDLES) ffi sos ssp xml
  
- SUBDIRS = $(INSTALLED_SUBDIRS) 6001 win32 xdoc
- INSTALLED_SUBDIRS = microcode runtime $(LIARC_BUNDLES)
+ SUBDIRS = $(INSTALLED_SUBDIRS) win32 xdoc
+ INSTALLED_SUBDIRS = microcode runtime $(OPTION_SUBDIRS) $(LIARC_BUNDLES)
+ OPTION_SUBDIRS = @OPTION_SUBDIRS@
  
 +PROJECT = @PROJECT@
  MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
  AUXDIR_NAME = @AUXDIR_NAME@
  AUXDIR = @AUXDIR@
@@@ -672,52 -539,75 +540,88 @@@ cross-host: compile-ss
  cross-host: compile-star-parser
  cross-host: compile-win32
  cross-host: compile-xml
- cross-host: microcode/scheme
- cross-host: syntax-compiler
- cross-host: syntax-runtime
+       echo "done" > stamp_$@
  
  .PHONY: cross-target
- cross-target: cross-host
- @IF_CROSS@cross-target: cross-end
+ cross-target: stamp_cross-finished lib/runtime.com lib/all.com
  
- .PHONY: cross-end
- cross-end: cross-host
-       (echo '(let ((env (->environment (quote (RUNTIME)))))' && \
+ stamp_cross-finished: stamp_cross-host microcode/scheme
+       (echo '(let ((env (->environment (quote (runtime)))))' && \
         echo '  (load "../compiler/base/crsend" env)' && \
-        echo '  ((access FINISH-CROSS-COMPILATION:FILES env) ".."))') \
-       | (cd runtime && ../microcode/scheme --batch-mode --library ../lib \
-                                            $(TOOL_TOOLCHAIN_HEAP) \
-                                            --fasl make.bin)
-       (echo '(let ((env (->environment (quote (RUNTIME)))))' && \
+        echo '  ((access finish-cross-compilation:files env) ".."))') \
+       | (cd runtime && ../run-build --batch-mode --fasl make.bin)
+       (echo '(let ((env (->environment (quote (runtime)))))' && \
         echo '  (load "../compiler/base/crsend" env)' && \
-        echo '  ((access FINISH-CROSS-COMPILATION:INFO-FILES env) ".."))') \
-        | (cd runtime && ../microcode/scheme --batch-mode --library ../lib \
-                                             $(TOOL_TOOLCHAIN_HEAP) \
-                                             --fasl make.com)
- # **** Legacy serialized targets ****
+        echo '  ((access finish-cross-compilation:info-files env) ".."))') \
+        | (cd runtime && ../run-build --batch-mode --fasl make.com)
+       echo "done" > $@
  
- all-liarc:
-       @$(top_srcdir)/etc/c-compile.sh "$(MIT_SCHEME_EXE)" --batch-mode
-       $(MAKE) compile-liarc-bundles build-bands
+ ################
+ # Miscellany
+ ################
  
- macosx-app: stamp_macosx-app
+ .PHONY: check
+ check:
+       ./run-build --batch-mode --load ../tests/check.scm --eval '(%exit)'
  
- stamp_macosx-app: all
+ .PHONY: macosx-app
+ macosx-app:
        etc/macosx/make-app.sh
-       echo "done" > $@
  
- .PHONY: debian-clean
debian-clean:
-       rm -f $(DESTDIR)$(AUXDIR)/plugins.scm
+ .PHONY: mostlyclean clean distclean maintainer-clean c-clean
mostlyclean clean distclean maintainer-clean c-clean:
+       $(top_srcdir)/Clean.sh $@ $(SUBDIRS) $(OPTION_SUBDIRS)
  
- compile-microcode:
-       (cd microcode && $(MAKE) all)
+ .PHONY: clean-boot-root
+ clean-boot-root:
+       rm -rf boot-root
+       rm -f stamp_*
  
- stamp_install-microcode: compile-microcode
-       (cd microcode; $(MAKE) install)
-       echo "done" > $@
+ .PHONY: tags TAGS
+ tags TAGS:
+       $(top_srcdir)/Tags.sh $(SUBDIRS)
+ .PHONY: subdir-list
+ subdir-list:
+       @for D in $(SUBDIRS); do echo $$D; done
+ .PHONY: install
+ install: install-standard @INSTALL_LIARC_BUNDLES@
  
 -      $(INSTALL_DATA) $(top_srcdir)/etc/optiondb.scm $(DESTDIR)$(AUXDIR)/.
 -      $(INSTALL_DATA) $(top_srcdir)/etc/plugins.scm $(DESTDIR)$(AUXDIR)/.
+ .PHONY: install-standard
+ install-standard: install-auxdir-top
+       @+$(MAKE_IN_SUBDIRS) install $(INSTALLED_SUBDIRS)
+ .PHONY: install-auxdir-top
+ install-auxdir-top:
+       $(mkinstalldirs) $(DESTDIR)$(AUXDIR)
++      @if ! test -e $(DESTDIR)$(AUXDIR)/optiondb.scm; then \
++          $(INSTALL_DATA) $(top_srcdir)/etc/optiondb.scm \
++                          $(DESTDIR)$(AUXDIR)/.; \
++       else echo "$(DESTDIR)$(AUXDIR)/optiondb.scm already exists"; fi
+       $(INSTALL_DATA) lib/*.com $(DESTDIR)$(AUXDIR)/.
++      @if ! test -e $(DESTDIR)$(AUXDIR)/plugins.scm ]; then \
++          $(INSTALL_DATA) $(top_srcdir)/etc/plugins.scm \
++                          $(DESTDIR)$(AUXDIR)/.; \
++       else echo "$(DESTDIR)$(AUXDIR)/plugins.scm already exists"; fi
++      $(INSTALL_DATA) lib/*.com $(DESTDIR)$(AUXDIR)/.
++      ( echo "(update-plugin-indices"; \
++        echo " \"$(PROJECT)\""; \
++        echo " \"$(DESTDIR)$(infodir)\""; \
++        echo " \"$(DESTDIR)$(AUXDIR)\""; \
++        echo " \"$(DESTDIR)$(docdir)\")" \
++      ) | $(top_srcdir)/microcode/scheme --batch-mode --library lib
+ ################
+ # Legacy
+ ################
+ .PHONY: all-liarc
+ all-liarc:
+       @$(top_srcdir)/etc/c-compile.sh "$(MIT_SCHEME_EXE)" --batch-mode --no-init-file
+       $(MAKE) compile-liarc-bundles build-bands
+ .PHONY: build-bands
  build-bands:
        @$(top_srcdir)/etc/build-bands.sh
  
index 4b998498ae69778cb0461310d8a5ffa4f7192366,04ae7aef607f96eaef2f0dfedc0ad7a88f3c2483..13d76995436eb02c8d4d19db76093a98ebfe4e3a
@@@ -97,9 -93,9 +96,9 @@@ EXTRA_DIST += make.scm optiondb.scm tag
  
  install-data-hook:
        ( echo '(add-plugin "blowfish" "@MIT_SCHEME_PROJECT@"'; \
 -        echo '            ""'; \
 +        echo '            "$(DESTDIR)$(infodir)"'; \
          echo '            "$(DESTDIR)$(scmlibdir)"'; \
-         echo '            "$(DESTDIR)$(scmdocdir)")' ) \
+         echo '            "")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
  
  install-html: install-html-am
          echo '            "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
  
- install-info-am:
- uninstall-info-am:
  uninstall-hook:
        ( echo '(remove-plugin "blowfish" "@MIT_SCHEME_PROJECT@"'; \
 -        echo '               ""'; \
 +        echo '               "$(DESTDIR)$(infodir)"'; \
          echo '               "$(DESTDIR)$(scmlibdir)"'; \
          echo '               "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
index d07179d8674e49723c49a8adb06679dc72aaf77b,5d4454b6e896cf706b9d2bb7dde9bee077bf7819..0cf0becd36297149f5863f52fda535b3e5c9ab4a
@@@ -1,31 -1,13 +1,31 @@@
  \input texinfo @c -*-texinfo-*-
  @comment %**start of header
 -@setfilename mit-scheme-blowfish.info
 +@setfilename blowfish.info
  @include version.texi
- @set SCMVERS 9.2.15
+ @set SCMVERS 10.1.2
 -@settitle MIT/GNU Scheme Blowfish Plugin Manual
 +@settitle Blowfish Plugin Manual
  @comment %**end of header
  
 +@ifhtml
 +@macro bref {name}
 +@ref{\name\,,@code{\name\}}
 +@end macro
 +@end ifhtml
 +@ifinfo
 +@macro bref {name}
 +\name\
 +@end macro
 +@end ifinfo
 +@ifnothtml
 +@ifnotinfo
 +@macro bref {name}
 +@code{\name\}
 +@end macro
 +@end ifnotinfo
 +@end ifnothtml
 +
  @copying
 -This manual documents MIT/GNU Scheme Blowfish @value{VERSION}.
 +This manual documents MIT/GNU Scheme Pucked Blowfish @value{VERSION}.
  
  Copyright @copyright{} 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993,
      1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
Simple merge
index 6dea4b8392541a808bd45ae8a08141feed2baebb,b1d1d9de15b2740d593a0ae18a4129768f7656b8..b497f3541bcc4eeca3296d7976260ca89ccc6714
@@@ -138,23 -122,30 +138,30 @@@ if test "${with_openssl}" != no; the
      fi
  fi
  
 -MIT_SCHEME_PROJECT=mit-scheme
 +MIT_SCHEME_PROJECT=mit-scheme-pucked
- : ${MIT_SCHEME_EXE=mit-scheme}
- MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
-                        echo "          (directory-pathname" ;\
-                        echo "           (system-library-pathname" ;\
-                        echo '            "mit-scheme.h"))))' ) \
-                      | ${MIT_SCHEME_EXE} --batch-mode`
- cc_type=`echo "(display microcode-id/compiled-code-type)" \
-        | ${MIT_SCHEME_EXE} --batch-mode`
- os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
-          | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_PKD="blowfish-${os_suffix}.pkd"
+ : ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+ if test x"${MIT_SCHEME_LIBDIR}" = x; then
+     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
+     MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                              echo "          (directory-pathname" ;\
+                              echo "           (system-library-pathname" ;\
+                              echo '            "mit-scheme.h"))))' ) \
+                            | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+     MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_CC_TYPE}" = x; then
+     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ MIT_SCHEME_PKD="blowfish-${MIT_SCHEME_OS_SUFFIX}.pkd"
  
  for f in blowfish; do
      MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
index 9d5cd1269a7bbe95ed8ba2019d57d2a91c849879,abcc2b015bd62714b0168000a7ef8131c76474d6..20377a7a4938311f11c77687f5d3146a4667a2cc
@@@ -1,15 -1,8 +1,15 @@@
  dnl Process this file with autoconf to produce a configure script.
  
 -AC_INIT([MIT/GNU Scheme], [10.1.2], [bug-mit-scheme@gnu.org], [mit-scheme])
 +AC_INIT([MIT/GNU Scheme Pucked],
-       [9.2.19],
++      [10.1.2],
 +      [matt@birchwood-abbey.net],
 +      [mit-scheme-pucked])
  AC_CONFIG_SRCDIR([microcode/boot.c])
  AC_CONFIG_AUX_DIR([microcode])
 +# Would set m4 macro dir, but only works if automake or libtools in use.
 +# Instead we include directly.
 +# AC_CONFIG_MACRO_DIR([microcode])
 +m4_include([microcode/mit_scheme_native_code.m4])
  AC_PROG_MAKE_SET
  
  AC_COPYRIGHT(
      IF_LIARC=
      ;;
  svm1)
-     ALL_TARGET=all-native
-     INSTALL_COM='$(INSTALL_DATA)'
-     INSTALL_LIARC_BUNDLES=
      IF_SVM=
      ;;
- *)
-     ALL_TARGET=all-native
-     INSTALL_COM='$(INSTALL_DATA)'
-     INSTALL_LIARC_BUNDLES=
-     ;;
  esac
  
 -AUXDIR_NAME=mit-scheme-${mit_scheme_native_code}
+ MIT_SCHEME_COMPILER_TARGET([${with_compiler_target}])
+ if test x"${mit_scheme_compiler_target}" = xsvm1; then
+     IF_SVM_COMPILER=
+ else
+     IF_SVM_COMPILER='#!svm compiler: '
+ fi
 +PROJECT=${PACKAGE_TARNAME}
 +AUXDIR_NAME=${PACKAGE_TARNAME}
  AUXDIR='$(libdir)'/${AUXDIR_NAME}
+ MIT_SCHEME_LIBDIR=${AUXDIR}/
+ MIT_SCHEME_INCLUDEDIR=`pwd`/lib/
+ MIT_SCHEME_OS_SUFFIX=unx
+ MIT_SCHEME_CC_TYPE=${mit_scheme_native_code}
  
  # Please keep the following messages synchronized with the messages in
  # these files:
@@@ -197,20 -280,107 +288,109 @@@ if test x"${enable_x11}" = x && test x"
      fi
  fi
  
- AC_SUBST([DEFAULT_TARGET])
+ if test x"${enable_x11}" = xyes && test x"${enable_edwin}" = xyes; then
+     enable_x11_screen=yes
+ else
+     enable_x11_screen=no
+ fi
+ OPTION_SUBDIRS=
+ AC_MSG_CHECKING([configuring blowfish plugin])
+ if test x"${enable_blowfish}" = xyes; then
+     OPTION_SUBDIRS="${OPTION_SUBDIRS} blowfish"
+     IF_BLOWFISH=
+     AC_MSG_RESULT([yes])
+ else
+     IF_BLOWFISH="#!blowfish: "
+     AC_MSG_RESULT([no])
+ fi
+ AC_MSG_CHECKING([configuring edwin plugin])
+ if test x"${enable_edwin}" = xyes; then
+     OPTION_SUBDIRS="${OPTION_SUBDIRS} edwin"
+     IF_EDWIN=
+     AC_MSG_RESULT([yes])
+ else
+     IF_EDWIN="#!edwin: "
+     AC_MSG_RESULT([no])
+ fi
+ AC_MSG_CHECKING([configuring gdbm plugin])
+ if test x"${enable_gdbm}" = xyes; then
+     OPTION_SUBDIRS="${OPTION_SUBDIRS} gdbm"
+     IF_GDBM=
+     AC_MSG_RESULT([yes])
+ else
+     IF_GDBM="#!gdbm: "
+     AC_MSG_RESULT([no])
+ fi
+ AC_MSG_CHECKING([configuring imail plugin])
+ if test x"${enable_imail}" = xyes; then
+     OPTION_SUBDIRS="${OPTION_SUBDIRS} imail"
+     IF_IMAIL=
+     AC_MSG_RESULT([yes])
+ else
+     IF_IMAIL="#!imail: "
+     AC_MSG_RESULT([no])
+ fi
+ AC_MSG_CHECKING([configuring mcrypt plugin])
+ if test x"${enable_mcrypt}" = xyes; then
+     OPTION_SUBDIRS="${OPTION_SUBDIRS} mcrypt"
+     IF_MCRYPT=
+     AC_MSG_RESULT([yes])
+ else
+     IF_MCRYPT="#!mcrypt: "
+     AC_MSG_RESULT([no])
+ fi
+ AC_MSG_CHECKING([configuring pgsql plugin])
+ if test x"${enable_pgsql}" = xyes; then
+     OPTION_SUBDIRS="${OPTION_SUBDIRS} pgsql"
+     IF_PGSQL=
+     AC_MSG_RESULT([yes])
+ else
+     IF_PGSQL="#!pgsql: "
+     AC_MSG_RESULT([no])
+ fi
+ AC_MSG_CHECKING([configuring x11 plugin])
+ if test x"${enable_x11}" = xyes; then
+     OPTION_SUBDIRS="${OPTION_SUBDIRS} x11"
+     IF_X11=
+     AC_MSG_RESULT([yes])
+ else
+     IF_X11="#!x11: "
+     AC_MSG_RESULT([no])
+ fi
+ AC_MSG_CHECKING([configuring x11-screen plugin])
+ if test x"${enable_x11_screen}" = xyes; then
+     OPTION_SUBDIRS="${OPTION_SUBDIRS} x11-screen"
+     IF_X11_SCREEN=
+     AC_MSG_RESULT([yes])
+ else
+     IF_X11_SCREEN="#!x11-screen: "
+     AC_MSG_RESULT([no])
++>>>>>>> aafa6ac04e1b39110227242465d9dc1b8ef2e85b
+ fi
  AC_SUBST([ALL_TARGET])
- AC_SUBST([INSTALL_COM])
- AC_SUBST([INSTALL_LIARC_BUNDLES])
- AC_SUBST([MIT_SCHEME_EXE])
- AC_SUBST([AUXDIR_NAME])
  AC_SUBST([AUXDIR])
+ AC_SUBST([AUXDIR_NAME])
+ AC_SUBST([DEFAULT_TARGET])
+ AC_SUBST([HOST_COMPILER_HEAP])
+ AC_SUBST([IF_BLOWFISH])
  AC_SUBST([IF_CROSS])
- AC_SUBST([IF_DEBUG_TOOLCHAIN])
+ AC_SUBST([IF_EDWIN])
+ AC_SUBST([IF_GDBM])
+ AC_SUBST([IF_IMAIL])
  AC_SUBST([IF_LIARC])
- AC_SUBST([IF_NOT_DEBUG_TOOLCHAIN])
+ AC_SUBST([IF_MCRYPT])
+ AC_SUBST([IF_PGSQL])
  AC_SUBST([IF_SVM])
- AC_SUBST([TOOL_TOOLCHAIN_HEAP])
+ AC_SUBST([IF_SVM_COMPILER])
+ AC_SUBST([IF_X11])
+ AC_SUBST([IF_X11_SCREEN])
+ AC_SUBST([INSTALL_COM])
+ AC_SUBST([INSTALL_LIARC_BUNDLES])
+ AC_SUBST([MIT_SCHEME_EXE])
+ AC_SUBST([OPTION_SUBDIRS])
 +AC_SUBST([PROJECT])
  
  AC_PROG_INSTALL
  AC_PROG_LN_S
index 7e86f0ee48483fda2268f1293c2d3bc3e519482d,67fed9061cb7dfe13df0254475dda6d00d37b197..46d755621224b9131e19ab0a4900ce1c172bbf56
@@@ -28,11 -28,7 +28,8 @@@ MIT_SCHEME_EXE = @MIT_SCHEME_TOOLCHAIN_
  scmlibdir = @MIT_SCHEME_LIBDIR@
  scmlib_subdir = $(scmlibdir)edwin
  scmdocdir = $(datarootdir)/doc/@MIT_SCHEME_PROJECT@
 +#scminfodir = $(scmdocdir)/info
  
- sources =@MIT_SCHEME_SOURCES@
- binaries =@MIT_SCHEME_BINARIES@
  scmlib_sub_DATA = $(sources)
  scmlib_sub_DATA += $(binaries)
  scmlib_sub_DATA += loadef.scm edwin.bld
index a30abf1ab9d21aaf13d9e108852f518161b86810,bad9afe12ca3e8ca23c17111b1924d5d12955947..29482bfb3cfcdcb2516abed4006a94766b3ce942
@@@ -46,24 -34,20 +46,20 @@@ AM_INIT_AUTOMAK
  
  AC_PROG_INSTALL
  
 -MIT_SCHEME_PROJECT=mit-scheme
 +MIT_SCHEME_PROJECT=mit-scheme-pucked
- : ${MIT_SCHEME_EXE=mit-scheme}
- MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_SOURCES=`./sources.sh scm`
- MIT_SCHEME_BINARIES=`./sources.sh com`
- # Install plugin docs in Scheme's docdir subdirectories.
- htmldir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/html'
- pdfdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)/pdf'
+ : ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+ if test x"${MIT_SCHEME_LIBDIR}" = x; then
+     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+     MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
  
  AC_SUBST([MIT_SCHEME_PROJECT])
- AC_SUBST([MIT_SCHEME_SOURCES])
- AC_SUBST([MIT_SCHEME_BINARIES])
- AC_SUBST([MIT_SCHEME_EXE])
+ AC_SUBST([MIT_SCHEME_TOOLCHAIN_EXE])
  AC_SUBST([MIT_SCHEME_LIBDIR])
  AC_SUBST([MIT_SCHEME_OS_SUFFIX])
  AC_CONFIG_FILES([Makefile])
Simple merge
Simple merge
index 05e0d18ca60e3cdaa42dd0ff07ce8c049eb5c026,2a5c59ab8fa7d07a4f4127b81b5832951088b3a7..c06f1adcc945d0f905b92274663a5018b37fb2c7
@@@ -28,10 -28,7 +28,8 @@@ USA
  
  (declare (usual-integrations))
  
 +(load-option 'sos)
  (load-option 'xml)
- (load-option 'blowfish)
- (load-option 'gdbm)
  (with-loader-base-uri (system-library-uri "edwin/")
    (lambda ()
      (load-package-set "edwin"
index c1b1b3105b80cceb37ebc7f6029995f708eba9b0,ff6883c24df76a740136825f3921d2eef58fb371..b0ab3bf7654e5463be9d2cf97e7bdf3bede06d6b
@@@ -97,25 -93,21 +96,23 @@@ EXTRA_DIST += make.scm optiondb.scm tag
  
  install-data-hook:
        ( echo '(add-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \
 -        echo '            ""'; \
 +        echo '            "$(DESTDIR)$(infodir)"'; \
          echo '            "$(DESTDIR)$(scmlibdir)"'; \
-         echo '            "$(DESTDIR)$(scmdocdir)")' ) \
+         echo '            "")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
  
  install-html: install-html-am
        ( echo '(add-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \
 +        echo '            "$(DESTDIR)$(infodir)"'; \
 +        echo '            "$(DESTDIR)$(scmlibdir)"'; \
+         echo '            ""'; \
+         echo '            ""'; \
          echo '            "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
  
- install-info-am:
- uninstall-info-am:
  uninstall-hook:
        ( echo '(remove-plugin "gdbm" "@MIT_SCHEME_PROJECT@"'; \
 -        echo '               ""'; \
 +        echo '               "$(DESTDIR)$(infodir)"'; \
          echo '               "$(DESTDIR)$(scmlibdir)"'; \
          echo '               "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
Simple merge
index e1cbcaef95834f41d509886b680c18ec5a122a8e,c0c52744b2af78914dfa70f4233558ce395ad897..cd7fd419be79b522f4b7e875e0295dbefbfa459d
@@@ -89,23 -77,30 +89,30 @@@ AC_CHECK_HEADER([gdbm.h],[],
  
  LIBS="-lgdbm"
  
 -MIT_SCHEME_PROJECT=mit-scheme
 +MIT_SCHEME_PROJECT=mit-scheme-pucked
- : ${MIT_SCHEME_EXE=mit-scheme}
- MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
-                        echo "          (directory-pathname" ;\
-                        echo "           (system-library-pathname" ;\
-                        echo '            "mit-scheme.h"))))' ) \
-                      | ${MIT_SCHEME_EXE} --batch-mode`
- cc_type=`echo "(display microcode-id/compiled-code-type)" \
-        | ${MIT_SCHEME_EXE} --batch-mode`
- os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
-          | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_PKD="gdbm-${os_suffix}.pkd"
+ : ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+ if test x"${MIT_SCHEME_LIBDIR}" = x; then
+     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
+     MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                              echo "          (directory-pathname" ;\
+                              echo "           (system-library-pathname" ;\
+                              echo '            "mit-scheme.h"))))' ) \
+                            | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+     MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_CC_TYPE}" = x; then
+     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ MIT_SCHEME_PKD="gdbm-${MIT_SCHEME_OS_SUFFIX}.pkd"
  
  for f in gdbm; do
      MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
index 7eea530ceff453ae037669b0b8fbc19225d65a65,8d0dcd2ce0b9e973d1d1bb8d9658b01c35ddca91..3026f9fe1ece6f92bf7e6447372435d77f1d21e3
@@@ -1,9 -1,9 +1,9 @@@
  \input texinfo @c -*-texinfo-*-
  @comment %**start of header
 -@setfilename mit-scheme-gdbm.info
 +@setfilename gdbm.info
  @include version.texi
- @set SCMVERS 9.2.15
+ @set SCMVERS 10.1.2
 -@settitle MIT/GNU Scheme GDBM Plugin Manual
 +@settitle GDBM Plugin Manual
  @comment %**end of header
  
  @copying
index 6ac2bd1fcd5ab71d8d69ba496ba409012371e97a,e4b55cb57a45a09693f9e0598623c316689a2cf9..6d8d58efa7c92019bb9a35b380c0d59797896fac
@@@ -108,15 -101,4 +108,11 @@@ install-html: install-html-a
          echo '            "$(DESTDIR)$(scmdocdir)")' ) \
        | $(MIT_SCHEME_EXE) --batch-mode
  
- install-info-am:
- uninstall-info-am:
  uninstall-hook:
 +      ( echo '(remove-plugin "imail" "@MIT_SCHEME_PROJECT@"'; \
 +        echo '               "$(DESTDIR)$(infodir)"'; \
 +        echo '               "$(DESTDIR)$(scmlibdir)"'; \
 +        echo '               "$(DESTDIR)$(scmdocdir)")' ) \
 +      | $(MIT_SCHEME_EXE) --batch-mode
 +      [ -d "$(DESTDIR)$(scmlib_subdir)" ] \
 +      && rmdir "$(DESTDIR)$(scmlib_subdir)"
index 74857e703d1a1cc34aa4591de5d107e5f35e5d80,953f84086b4b6af9c9687f3ed5394c19012c76de..78d26a9cbf7f7c224d390dd2ad0d2eae5e99a8d3
@@@ -46,16 -34,23 +46,23 @@@ AM_INIT_AUTOMAK
  
  AC_PROG_INSTALL
  
 -MIT_SCHEME_PROJECT=mit-scheme
 +MIT_SCHEME_PROJECT=mit-scheme-pucked
- : ${MIT_SCHEME_EXE=mit-scheme}
- MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
-                     | ${MIT_SCHEME_EXE} --batch-mode`
+ : ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+ if test x"${MIT_SCHEME_LIBDIR}" = x; then
+     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+     MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ # Install plugin docs in Scheme's docdir.
+ docdir='$(datarootdir)/doc/$(MIT_SCHEME_PROJECT)'
  
  AC_SUBST([MIT_SCHEME_PROJECT])
- AC_SUBST([MIT_SCHEME_EXE])
+ AC_SUBST([MIT_SCHEME_TOOLCHAIN_EXE])
  AC_SUBST([MIT_SCHEME_LIBDIR])
  AC_SUBST([MIT_SCHEME_OS_SUFFIX])
  AC_CONFIG_FILES([Makefile])
Simple merge
Simple merge
index 97812103183e00040459efb1764abedf58965c03,ba906f69516c086597e3aaeb8a1b60b797b8b39a..1ad68068012aea20cc41469eda2e18c844644d93
@@@ -123,23 -107,30 +123,30 @@@ MCRYPT_LIBS=`libmcrypt-config --libs
  CFLAGS="${MCRYPT_CFLAGS} ${CFLAGS}"
  LIBS="${LIBS} ${MCRYPT_LIBS}"
  
 -MIT_SCHEME_PROJECT=mit-scheme
 +MIT_SCHEME_PROJECT=mit-scheme-pucked
- : ${MIT_SCHEME_EXE=mit-scheme}
- MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
-                        echo "          (directory-pathname" ;\
-                        echo "           (system-library-pathname" ;\
-                        echo '            "mit-scheme.h"))))' ) \
-                      | ${MIT_SCHEME_EXE} --batch-mode`
- cc_type=`echo "(display microcode-id/compiled-code-type)" \
-        | ${MIT_SCHEME_EXE} --batch-mode`
- os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
-          | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_PKD="mcrypt-${os_suffix}.pkd"
+ : ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+ if test x"${MIT_SCHEME_LIBDIR}" = x; then
+     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
+     MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                              echo "          (directory-pathname" ;\
+                              echo "           (system-library-pathname" ;\
+                              echo '            "mit-scheme.h"))))' ) \
+                            | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+     MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_CC_TYPE}" = x; then
+     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ MIT_SCHEME_PKD="mcrypt-${MIT_SCHEME_OS_SUFFIX}.pkd"
  
  for f in mcrypt; do
      MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
Simple merge
index 388081b7426f0d48c4211c79b1a8b20db397ec8c,076a2a31b32e71cafe0b01b54257213066df6219..1384c49bdc871a921a0087a0bd4c25c81c7a0d70
  CCLD=${CC}
  
  MIT_SCHEME_NATIVE_CODE([${enable_native_code}],[${host_cpu}])
+ MIT_SCHEME_COMPILER_TARGET([${with_compiler_target}])
  
 -AUXDIR_NAME=mit-scheme-${mit_scheme_native_code}
 -EXE_NAME=mit-scheme-${mit_scheme_native_code}
 +AUXDIR_NAME=mit-scheme-pucked
 +EXE_NAME=mit-scheme-pucked
  
  dnl Add OS-dependent customizations.  This must happen before checking
  dnl any headers or library routines, because it may add CFLAGS or
Simple merge
Simple merge
index cbc56c3e84ef5f0c541287596a456e1eaa712365,a315aacee9826548859e3b69499961e1ab36685e..d34eccad8ba1acd747e5086a2a372d6569ea2865
  AC_DEFINE([HAVE_LIBPQ_FE_H], [1],
          [Define to 1 if you have the <libpq-fe.h> header file.])
  
 -MIT_SCHEME_PROJECT=mit-scheme
 +MIT_SCHEME_PROJECT=mit-scheme-pucked
- : ${MIT_SCHEME_EXE=mit-scheme}
- MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
-                        echo "          (directory-pathname" ;\
-                        echo "           (system-library-pathname" ;\
-                        echo '            "mit-scheme.h"))))' ) \
-                      | ${MIT_SCHEME_EXE} --batch-mode`
- cc_type=`echo "(display microcode-id/compiled-code-type)" \
-        | ${MIT_SCHEME_EXE} --batch-mode`
- os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
-          | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_PKD="pgsql-${os_suffix}.pkd"
+ : ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+ if test x"${MIT_SCHEME_LIBDIR}" = x; then
+     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
+     MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                              echo "          (directory-pathname" ;\
+                              echo "           (system-library-pathname" ;\
+                              echo '            "mit-scheme.h"))))' ) \
+                            | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+     MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_CC_TYPE}" = x; then
+     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ MIT_SCHEME_PKD="pgsql-${MIT_SCHEME_OS_SUFFIX}.pkd"
  
  for f in pgsql; do
      MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
Simple merge
Simple merge
index e0781103538e2024731e4c92e2d9c2a9c894cfe7,08ae7b0743242db2c3f58f95888e5dc31c6f30be..2286263ea1ea7675805ad68af53f4612a376d2fe
@@@ -39,10 -39,10 +39,10 @@@ USA
         (let ((now last-copyright-year)
               (then 1986))
           (iota (+ (- now then) 1) then)))
-    (add-subsystem-identification! "Release" '(9 2 19))
 -   (add-subsystem-identification! "Release" '(10 1 90))
++   (add-subsystem-identification! "Release" '(10 1 2))
     (snarf-microcode-version!)
     (add-event-receiver! event:after-restore snarf-microcode-version!)
 -   (add-subsystem-identification! "Runtime" '(15 7))))
 +   (add-subsystem-identification! "Runtime" '(15 8))))
  
  (define (snarf-microcode-version!)
    (add-subsystem-identification! "Microcode"
index 6b5697e2cdeb66ab43c4488bf3bc20b7d496b9cf,46e168813724d4d07b478562567e32ec31880ad0..73a360de9c0269f01060c88163f65e2755c3de21
@@@ -56,21 -55,11 +56,21 @@@ TAGS_DEPENDENCIES = $(sources
  
  EXTRA_DIST += $(sources) compile.sh x11-screen.pkg
  EXTRA_DIST += x11-screen-check.sh x11-screen-test.scm
- EXTRA_DIST += make.scm optiondb.scm debian
 -EXTRA_DIST += make.scm optiondb.scm compile.scm
++EXTRA_DIST += make.scm optiondb.scm compile.scm debian
  
  install-data-hook:
 +      ( echo '(add-plugin "x11-screen" "@MIT_SCHEME_PROJECT@"'; \
 +        echo '            "$(DESTDIR)$(infodir)"'; \
 +        echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +        echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +      | $(MIT_SCHEME_EXE) --batch-mode
  
  install-html: install-html-am
 +      ( echo '(add-plugin "x11-screen" "@MIT_SCHEME_PROJECT@"'; \
 +        echo '            "$(DESTDIR)$(infodir)"'; \
 +        echo '            "$(DESTDIR)$(scmlibdir)"'; \
 +        echo '            "$(DESTDIR)$(scmdocdir)")' ) \
 +      | $(MIT_SCHEME_EXE) --batch-mode
  
  install-info-am:
  
index c9803aaf0a4564553b4f585341269e572a7fbaee,19386b2ac3284a70744f2eb8800dac25e345dfd0..b213fbfc27576b96a5f95afba2b1909cc1d1415d
@@@ -46,18 -34,23 +46,23 @@@ AM_INIT_AUTOMAK
  
  AC_PROG_INSTALL
  
 -MIT_SCHEME_PROJECT=mit-scheme
 +MIT_SCHEME_PROJECT=mit-scheme-pucked
- : ${MIT_SCHEME_EXE=mit-scheme}
- MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
+ : ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+ if test x"${MIT_SCHEME_LIBDIR}" = x; then
+     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+     MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_CC_TYPE}" = x; then
+     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
  
- cc_type=`echo "(display microcode-id/compiled-code-type)" \
-        | ${MIT_SCHEME_EXE} --batch-mode`
- os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
-          | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_PKD="x11-screen-${os_suffix}.pkd"
+ MIT_SCHEME_PKD="x11-screen-${MIT_SCHEME_OS_SUFFIX}.pkd"
  
  for f in x11-screen x11-key x11-command; do
      MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
Simple merge
Simple merge
Simple merge
index 4ba1760638e81efa9ccd5b2453105b28f75d5590,78033369e664b0f2c423ceae0e35b6d46a88206e..c39406aff39c0ab7f19cfb073f056ec166e7e9dd
@@@ -109,23 -99,30 +111,30 @@@ if test "${no_x}" != yes; the
      fi
  fi
  
 -MIT_SCHEME_PROJECT=mit-scheme
 +MIT_SCHEME_PROJECT=mit-scheme-pucked
- : ${MIT_SCHEME_EXE=mit-scheme}
- MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
-                    echo "          (system-library-directory-pathname)))" ) \
-                  | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
-                        echo "          (directory-pathname" ;\
-                        echo "           (system-library-pathname" ;\
-                        echo '            "mit-scheme.h"))))' ) \
-                      | ${MIT_SCHEME_EXE} --batch-mode`
- cc_type=`echo "(display microcode-id/compiled-code-type)" \
-        | ${MIT_SCHEME_EXE} --batch-mode`
- os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
-          | ${MIT_SCHEME_EXE} --batch-mode`
- MIT_SCHEME_PKD="x11-${os_suffix}.pkd"
+ : ${MIT_SCHEME_TOOLCHAIN_EXE=mit-scheme}
+ if test x"${MIT_SCHEME_LIBDIR}" = x; then
+     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
+                        echo "          (system-library-directory-pathname)))" ) \
+                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
+     MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                              echo "          (directory-pathname" ;\
+                              echo "           (system-library-pathname" ;\
+                              echo '            "mit-scheme.h"))))' ) \
+                            | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+     MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                           | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ if test x"${MIT_SCHEME_CC_TYPE}" = x; then
+     MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \
+                         | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+ fi
+ MIT_SCHEME_PKD="x11-${MIT_SCHEME_OS_SUFFIX}.pkd"
  
  for f in x11 x11-base x11-color x11-graphics x11-terminal x11-device; do
      MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"