* lisp/core.lisp.in (|$ExtraRuntimeLibraries|): Listify.

	(extra-runtime-libs): Tidy.
	* lisp/Makefile.in (edit): stringify $(oa_c_runtime_extra) elements.

8 files changed, 26 insertions, 23 deletions

diff --git a/INSTALL b/INSTALL
index 0c7c383f..efdcd2eb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,8 +3,8 @@ Requirements
 
 OpenAxiom currenly requires a Lisp system for its runtime support.
 OpenAxiom is known to build with the GNU Common Lisp (GCL versions 2.6.7
-or 2.6.8), Steel Bank Common Lisp (SBCL version 1.0.21.15 or higher),
-CLisp (version 2.44.x or higher), and ECL (version 0.9l or higher).  
+or 2.6.8), Steel Bank Common Lisp (SBCL version 1.0.22 or higher),
+CLisp (version 2.44.x or higher), and ECL (version 8.9.0-CVS or higher).  
 So, if you already have any of the above mentioned Lisp system, your
 are good to go.  Otherwise, you would need to download a dependency
 tarball from OpenAxiom's download web site.  See instructions below. 
diff --git a/configure b/configure
index eff36e78..73b23dfa 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2008-10-31.
+# Generated by GNU Autoconf 2.60 for OpenAxiom 1.3.0-2008-11-02.
 #
 # Report bugs to <open-axiom-bugs@lists.sf.net>.
 #
@@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='OpenAxiom'
 PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.3.0-2008-10-31'
-PACKAGE_STRING='OpenAxiom 1.3.0-2008-10-31'
+PACKAGE_VERSION='1.3.0-2008-11-02'
+PACKAGE_STRING='OpenAxiom 1.3.0-2008-11-02'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 
 ac_unique_file="src/Makefile.pamphlet"
@@ -1405,7 +1405,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenAxiom 1.3.0-2008-10-31 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.3.0-2008-11-02 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1475,7 +1475,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-10-31:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.3.0-2008-11-02:";;
    esac
   cat <<\_ACEOF
 
@@ -1579,7 +1579,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.3.0-2008-10-31
+OpenAxiom configure 1.3.0-2008-11-02
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1593,7 +1593,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenAxiom $as_me 1.3.0-2008-10-31, which was
+It was created by OpenAxiom $as_me 1.3.0-2008-11-02, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -26424,7 +26424,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenAxiom $as_me 1.3.0-2008-10-31, which was
+This file was extended by OpenAxiom $as_me 1.3.0-2008-11-02, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26473,7 +26473,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-OpenAxiom config.status 1.3.0-2008-10-31
+OpenAxiom config.status 1.3.0-2008-11-02
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 3de8f0bd..533e04a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2008-10-31], 
+AC_INIT([OpenAxiom], [1.3.0-2008-11-02], 
         [open-axiom-bugs@lists.sf.net])
 
 AC_CONFIG_AUX_DIR(config)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 794ec1c0..2581f937 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -1126,7 +1126,7 @@ information:
 <<Autoconf init>>=
 sinclude(config/open-axiom.m4)
 sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.3.0-2008-10-31], 
+AC_INIT([OpenAxiom], [1.3.0-2008-11-02], 
         [open-axiom-bugs@lists.sf.net])
 
 @
diff --git a/src/ChangeLog b/src/ChangeLog
index f30c7c60..815f7ec0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2008-11-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* lisp/core.lisp.in (|$ExtraRuntimeLibraries|): Listify.
+	(extra-runtime-libs): Tidy.
+	* lisp/Makefile.in (edit): stringify $(oa_c_runtime_extra) elements.
+
+2008-11-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* driver/utils.c (OPENAXIOM_DEFAULT_DRIVER): Can no longer be
 	openaxiom_unknown_driver. 
 	(openaxiom_preprocess_arguments): If a file is specified, then it
diff --git a/src/interp/types.boot b/src/interp/types.boot
index 00b55d64..66f3ce61 100644
--- a/src/interp/types.boot
+++ b/src/interp/types.boot
@@ -128,12 +128,8 @@ namespace BOOT
 %Env <=> %List                                 -- compiling env
 %Mode <=> %Symbol or %String or %List          -- type of forms
 %Code <=> %Form                                -- generated code
-)if %hasFeature KEYWORD::ECL
-%Triple <=> %List   -- ??? ECL has trouble with the spec below
-)else
 %Triple <=>                                    -- form + type + env
   cons(%Code,cons(%Mode,cons(%Env,null))) 
-)endif
 
 %Signature                      -- signature
   <=> %Symbol or cons
diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in
index 726a017f..c187df70 100644
--- a/src/lisp/Makefile.in
+++ b/src/lisp/Makefile.in
@@ -143,7 +143,7 @@ edit = sed \
 	-e 's|@target[@]|$(target)|g' \
 	-e 's|@SHREXT[@]|$(SHREXT)|g' \
 	-e 's|@LIBEXT[@]|$(LIBEXT)|g' \
-	-e 's|@oa_c_runtime_extra[@]|$(oa_c_runtime_extra)|g' \
+	-e 's|@oa_c_runtime_extra[@]|$(patsubst %,"%",$(oa_c_runtime_extra))|g' \
 	-e 's|@oa_standard_linking[@]|$(oa_standard_linking)|g' \
 	-e 's|@void_type[@]|$(void_type)|g' \
 	-e 's|@char_type[@]|$(char_type)|g' \
diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in
index d19e1e5a..af3f27d0 100644
--- a/src/lisp/core.lisp.in
+++ b/src/lisp/core.lisp.in
@@ -189,14 +189,15 @@
 
 ;; C runtime needed by the target system; e.g. -lm or -lwinsock
 (defconstant |$ExtraRuntimeLibraries|
-  "@oa_c_runtime_extra@")
+  '(@oa_c_runtime_extra@))
 
 (defun extra-runtime-libs nil
   (if (boot-completed-p)
-      (list (concatenate 'string "-L" (|systemLibraryDirectory|))
-	    (concatenate 'string "-l" |$CoreLibName|)
-	    |$ExtraRuntimeLibraries|)
-    (list |$ExtraRuntimeLibraries|)))
+      (append
+       (list (concatenate 'string "-L" (|systemLibraryDirectory|))
+	     (concatenate 'string "-l" |$CoreLibName|))
+       |$ExtraRuntimeLibraries|)
+    |$ExtraRuntimeLibraries|))
 
 
 #+:clisp