aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--INSTALL27
-rwxr-xr-xconfigure145
-rw-r--r--configure.ac47
-rw-r--r--configure.ac.pamphlet47
-rw-r--r--src/ChangeLog6
-rw-r--r--src/interp/c-doc.boot6
7 files changed, 148 insertions, 135 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bf9bf91..bd379578 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-24 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * configure.ac.pamphlet: Reject SBCL-1.0.29 as too buggy to build
+ OpenAxiom.
+
2009-07-04 Alfredo Portes <doyenatccny@gmail.com>
* contrib/texmacs: New.
diff --git a/INSTALL b/INSTALL
index b6ea0ff1..7ab9d234 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,11 +3,12 @@ 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.22 or higher),
-CLisp (version 2.44.x or higher), and ECL (version 0.9l or higher).
-So, if you already have any of the above mentioned Lisp systems, your
-are good to go. Otherwise, you would need to download a dependency
-tarball from OpenAxiom's download web site. See instructions below.
+or 2.6.8), Steel Bank Common Lisp (SBCL version 1.0.22 or higher,
+except 1.0.29), CLisp (version 2.44.x or higher), and ECL (version
+0.9l or higher). So, if you already have any of the above mentioned
+Lisp systems, your are good to go. Otherwise, you would need to
+download a dependency tarball from OpenAxiom's download web site. See
+instructions below.
OpenAxiom needs `noweb' for extracting its source codes. If you don't
have running `noweb' utilities, you would need to either download the
@@ -31,11 +32,11 @@ If any of GCL or noweb is missing from your build environment, then
you need to either separately install them, or download the dependency
tarball
- open-axiom-1.2.x-dep.tar.bz2
+ open-axiom-1.3.x-dep.tar.bz2
from the SourceForge download site
-http://voxel.dl.sourceforge.net/sourceforge/open-axiom/open-axiom-1.2.x-dep.tar.bz2
+http://voxel.dl.sourceforge.net/sourceforge/open-axiom/open-axiom-1.3.x-dep.tar.bz2
Please, notice that GCL and noweb are needed only to *build*
OpenAxiom. If you plan to build OpenAxiom often, then it probably is
@@ -50,17 +51,17 @@ environment, then you should add the option --enable-gcl to the
configure command line. In short, add --enable-gcl if you
specifically insist on GCL as the base Lisp runtime system.
-1.a. Download the dependency tarball open-axiom-1.2.x-dep.tar.bz2
+1.a. Download the dependency tarball open-axiom-1.3.x-dep.tar.bz2
1.b. Decompress the dependency tarball
- tar jxfv open-axiom-1.2.x-dep.tar.bz2
+ tar jxfv open-axiom-1.3.x-dep.tar.bz2
That should decompress the dependency tarball in a directory
-named open-axiom-1.2.x. Rename it to open-axiom-1.3.0, e.g.:
+named open-axiom-1.3.x. Rename it to open-axiom-1.3.0, e.g.:
- mv open-axiom-1.2.x open-axiom-1.3.0
+ mv open-axiom-1.3.x open-axiom-1.3.0
2. Building OpenAxiom
------------------
@@ -132,8 +133,8 @@ users probably don't.
2.e. Have more coffee
-It can take from 25min to 2 hours to build, depending on the
-compute power of the build machine.
+It can take from 25min to more than 2 hours to build, depending on the
+compute power of the build machine and the base Lisp system.
3. Installing OpenAxiom
--------------------
diff --git a/configure b/configure
index 45aed5a8..0e9db2b9 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.63 for OpenAxiom 1.4.0-2009-07-16.
+# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2009-07-24.
#
# Report bugs to <open-axiom-bugs@lists.sf.net>.
#
@@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='OpenAxiom'
PACKAGE_TARNAME='openaxiom'
-PACKAGE_VERSION='1.4.0-2009-07-16'
-PACKAGE_STRING='OpenAxiom 1.4.0-2009-07-16'
+PACKAGE_VERSION='1.4.0-2009-07-24'
+PACKAGE_STRING='OpenAxiom 1.4.0-2009-07-24'
PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
ac_unique_file="src/Makefile.pamphlet"
@@ -827,7 +827,6 @@ NOWEAVE
NOTANGLE
MAKEINDEX
LATEX
-PATCH
HOST_AWK
AWK
MKTEMP
@@ -1502,7 +1501,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.4.0-2009-07-16 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.4.0-2009-07-24 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1572,7 +1571,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2009-07-16:";;
+ short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2009-07-24:";;
esac
cat <<\_ACEOF
@@ -1675,7 +1674,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenAxiom configure 1.4.0-2009-07-16
+OpenAxiom configure 1.4.0-2009-07-24
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1689,7 +1688,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.4.0-2009-07-16, which was
+It was created by OpenAxiom $as_me 1.4.0-2009-07-24, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -3737,13 +3736,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:3740: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:3739: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:3743: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:3742: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:3746: output\"" >&5)
+ (eval echo "\"\$as_me:3745: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -4946,7 +4945,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4949 "configure"' > conftest.$ac_ext
+ echo '#line 4948 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7094,11 +7093,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7097: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7101: \$? = $ac_status" >&5
+ echo "$as_me:7100: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7433,11 +7432,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7436: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7435: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7440: \$? = $ac_status" >&5
+ echo "$as_me:7439: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7538,11 +7537,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7541: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7540: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7545: \$? = $ac_status" >&5
+ echo "$as_me:7544: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7593,11 +7592,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7596: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7595: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7600: \$? = $ac_status" >&5
+ echo "$as_me:7599: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10393,7 +10392,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10396 "configure"
+#line 10395 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10489,7 +10488,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10492 "configure"
+#line 10491 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12390,51 +12389,6 @@ fi
done
-for ac_prog in gpatch patch
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PATCH+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$PATCH"; then
- ac_cv_prog_PATCH="$PATCH" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PATCH="$ac_prog"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-PATCH=$ac_cv_prog_PATCH
-if test -n "$PATCH"; then
- { $as_echo "$as_me:$LINENO: result: $PATCH" >&5
-$as_echo "$PATCH" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$PATCH" && break
-done
-test -n "$PATCH" || PATCH="{ { $as_echo "$as_me:$LINENO: error: OpenAxiom needs a patch program" >&5
-$as_echo "$as_me: error: OpenAxiom needs a patch program" >&2;}
- { (exit 1); exit 1; }; }"
-
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -12698,8 +12652,7 @@ $as_echo "$as_me: error: erroneous value for --enable-gcl" >&2;}
fi
fi
-## We need to build our own GCL if none is avalaible, or the existing
-## one is too old.
+## We need to build our own GCL if none is avalaible.
if test -z $axiom_lisp; then
for ac_prog in gcl sbcl clisp
do
@@ -12746,21 +12699,6 @@ done
## A lisp may not be available AND the GCL source may also
## be missing. Instruct user to either build one or get
## the dependencies from our website.
- if test x$AXIOM_LISP = xgcl; then
- { $as_echo "$as_me:$LINENO: checking $AXIOM_LISP version" >&5
-$as_echo_n "checking $AXIOM_LISP version... " >&6; }
- v=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"`
- { $as_echo "$as_me:$LINENO: result: $v" >&5
-$as_echo "$v" >&6; }
- case $v in
- *2.6.7*|*2.6.8*) ;; # OK
- *)
- { $as_echo "$as_me:$LINENO: WARNING: $v is not supported by this version of OpenAxiom. $AXIOM_LISP will be ignored." >&5
-$as_echo "$as_me: WARNING: $v is not supported by this version of OpenAxiom. $AXIOM_LISP will be ignored." >&2;}
- AXIOM_LISP=
- ;;
- esac
- fi
if test -z $AXIOM_LISP && test ! -d ${srcdir}/gcl; then
{ { $as_echo "$as_me:$LINENO: error: OpenAxiom requires a Lisp system. Either separately build one (GCL-2.6.7, GCL-2.6.8, SBCL, CLisp), or get the dependency tarball from OpenAxiom download website." >&5
$as_echo "$as_me: error: OpenAxiom requires a Lisp system. Either separately build one (GCL-2.6.7, GCL-2.6.8, SBCL, CLisp), or get the dependency tarball from OpenAxiom download website." >&2;}
@@ -12773,6 +12711,41 @@ else
:
fi
+
+## Some Lisp systems are just too buggy to use.
+case $AXIOM_LISP in
+ *gcl*)
+ { $as_echo "$as_me:$LINENO: checking $AXIOM_LISP version" >&5
+$as_echo_n "checking $AXIOM_LISP version... " >&6; }
+ v=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"`
+ { $as_echo "$as_me:$LINENO: result: $v" >&5
+$as_echo "$v" >&6; }
+ case $v in
+ *2.6.7*|*2.6.8*) ;; # OK
+ *)
+ { $as_echo "$as_me:$LINENO: WARNING: $v is not supported by this version of OpenAxiom. $AXIOM_LISP will be ignored." >&5
+$as_echo "$as_me: WARNING: $v is not supported by this version of OpenAxiom. $AXIOM_LISP will be ignored." >&2;}
+ AXIOM_LISP=
+ ;;
+ esac
+ ;;
+ # SBCL-1.0.29 has a nasty regression that prevents OpenAxiom build
+ *sbcl*)
+ { $as_echo "$as_me:$LINENO: checking $AXIOM_LISP version" >&5
+$as_echo_n "checking $AXIOM_LISP version... " >&6; }
+ v=`$AXIOM_LISP --version`
+ { $as_echo "$as_me:$LINENO: result: $v" >&5
+$as_echo "$v" >&6; }
+ case $v in
+ *1.0.29)
+ { { $as_echo "$as_me:$LINENO: error: This version of SBCL has a bug that breaks OpenAxiom build. Consider SBCL-1.0.30 or higher." >&5
+$as_echo "$as_me: error: This version of SBCL has a bug that breaks OpenAxiom build. Consider SBCL-1.0.30 or higher." >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ esac
+ ;;
+esac
+
## Coherence check for GCL inclusion.
case $axiom_include_gcl,$axiom_lisp in
,|no,|yes*)
@@ -17704,7 +17677,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.4.0-2009-07-16, which was
+This file was extended by OpenAxiom $as_me 1.4.0-2009-07-24, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17767,7 +17740,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-OpenAxiom config.status 1.4.0-2009-07-16
+OpenAxiom config.status 1.4.0-2009-07-24
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 124272ba..67059c42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2009-07-16],
+AC_INIT([OpenAxiom], [1.4.0-2009-07-24],
[open-axiom-bugs@lists.sf.net])
AC_CONFIG_AUX_DIR(config)
@@ -123,8 +123,6 @@ AC_CHECK_PROGS([MKTEMP], [mktemp])
AC_PROG_AWK
AC_PATH_PROGS([HOST_AWK],[awk nawk gawk mawk])
-AC_CHECK_PROGS([PATCH], [gpatch patch],
- [AC_MSG_ERROR([OpenAxiom needs a patch program])])
AC_CHECK_PROG([AR], [ar], [ar], [AC_MSG_ERROR([program 'ar' is missing])])
@@ -174,25 +172,12 @@ if test -z $axiom_lisp; then
*) AC_MSG_ERROR([erroneous value for --enable-gcl]) ;;
esac])
fi
-## We need to build our own GCL if none is avalaible, or the existing
-## one is too old.
+## We need to build our own GCL if none is avalaible.
if test -z $axiom_lisp; then
AC_CHECK_PROGS([AXIOM_LISP], [gcl sbcl clisp])
## A lisp may not be available AND the GCL source may also
## be missing. Instruct user to either build one or get
## the dependencies from our website.
- if test x$AXIOM_LISP = xgcl; then
- AC_MSG_CHECKING([$AXIOM_LISP version])
- v=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"`
- AC_MSG_RESULT([$v])
- case $v in
- *2.6.7*|*2.6.8*) ;; # OK
- *)
- AC_MSG_WARN([$v is not supported by this version of OpenAxiom. $AXIOM_LISP will be ignored.])
- AXIOM_LISP=
- ;;
- esac
- fi
if test -z $AXIOM_LISP && test ! -d ${srcdir}/gcl; then
AC_MSG_ERROR([OpenAxiom requires a Lisp system. Either separately build one (GCL-2.6.7, GCL-2.6.8, SBCL, CLisp), or get the dependency tarball from OpenAxiom download website.])
fi
@@ -203,6 +188,34 @@ else
AC_SUBST(AXIOM_LISP)
:
fi
+
+## Some Lisp systems are just too buggy to use.
+case $AXIOM_LISP in
+ *gcl*)
+ AC_MSG_CHECKING([$AXIOM_LISP version])
+ v=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"`
+ AC_MSG_RESULT([$v])
+ case $v in
+ *2.6.7*|*2.6.8*) ;; # OK
+ *)
+ AC_MSG_WARN([$v is not supported by this version of OpenAxiom. $AXIOM_LISP will be ignored.])
+ AXIOM_LISP=
+ ;;
+ esac
+ ;;
+ # SBCL-1.0.29 has a nasty regression that prevents OpenAxiom build
+ *sbcl*)
+ AC_MSG_CHECKING([$AXIOM_LISP version])
+ v=`$AXIOM_LISP --version`
+ AC_MSG_RESULT([$v])
+ case $v in
+ *1.0.29)
+ AC_MSG_ERROR([This version of SBCL has a bug that breaks OpenAxiom build. Consider SBCL-1.0.30 or higher.])
+ ;;
+ esac
+ ;;
+esac
+
## Coherence check for GCL inclusion.
case $axiom_include_gcl,$axiom_lisp in
,|no,|yes*)
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index ea4cce67..6f2dce46 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -731,8 +731,6 @@ and the host machine (though that may change in the future).
AC_PROG_AWK
AC_PATH_PROGS([HOST_AWK],[awk nawk gawk mawk])
-AC_CHECK_PROGS([PATCH], [gpatch patch],
- [AC_MSG_ERROR([OpenAxiom needs a patch program])])
@
\paragraph{Binary utils.}
@@ -831,25 +829,12 @@ Do we need to build our own version of \Tool{GCL}? The answer is yes, if
\end{itemize}
Consequently, we need to check for \Tool{GCL} and its version:
<<find lisp>>=
-## We need to build our own GCL if none is avalaible, or the existing
-## one is too old.
+## We need to build our own GCL if none is avalaible.
if test -z $axiom_lisp; then
AC_CHECK_PROGS([AXIOM_LISP], [gcl sbcl clisp])
## A lisp may not be available AND the GCL source may also
## be missing. Instruct user to either build one or get
## the dependencies from our website.
- if test x$AXIOM_LISP = xgcl; then
- AC_MSG_CHECKING([$AXIOM_LISP version])
- v=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"`
- AC_MSG_RESULT([$v])
- case $v in
- *2.6.7*|*2.6.8*) ;; # OK
- *)
- AC_MSG_WARN([$v is not supported by this version of OpenAxiom. $AXIOM_LISP will be ignored.])
- AXIOM_LISP=
- ;;
- esac
- fi
if test -z $AXIOM_LISP && test ! -d ${srcdir}/gcl; then
AC_MSG_ERROR([OpenAxiom requires a Lisp system. Either separately build one (GCL-2.6.7, GCL-2.6.8, SBCL, CLisp), or get the dependency tarball from OpenAxiom download website.])
fi
@@ -860,6 +845,34 @@ else
AC_SUBST(AXIOM_LISP)
:
fi
+
+## Some Lisp systems are just too buggy to use.
+case $AXIOM_LISP in
+ *gcl*)
+ AC_MSG_CHECKING([$AXIOM_LISP version])
+ v=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"`
+ AC_MSG_RESULT([$v])
+ case $v in
+ *2.6.7*|*2.6.8*) ;; # OK
+ *)
+ AC_MSG_WARN([$v is not supported by this version of OpenAxiom. $AXIOM_LISP will be ignored.])
+ AXIOM_LISP=
+ ;;
+ esac
+ ;;
+ # SBCL-1.0.29 has a nasty regression that prevents OpenAxiom build
+ *sbcl*)
+ AC_MSG_CHECKING([$AXIOM_LISP version])
+ v=`$AXIOM_LISP --version`
+ AC_MSG_RESULT([$v])
+ case $v in
+ *1.0.29)
+ AC_MSG_ERROR([This version of SBCL has a bug that breaks OpenAxiom build. Consider SBCL-1.0.30 or higher.])
+ ;;
+ esac
+ ;;
+esac
+
@
We may be presented with incoherent options if
@@ -1141,7 +1154,7 @@ information:
<<Autoconf init>>=
sinclude(config/open-axiom.m4)
sinclude(config/aclocal.m4)
-AC_INIT([OpenAxiom], [1.4.0-2009-07-16],
+AC_INIT([OpenAxiom], [1.4.0-2009-07-24],
[open-axiom-bugs@lists.sf.net])
@
diff --git a/src/ChangeLog b/src/ChangeLog
index 5146627c..ca318df2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-24 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ Fix SF/2798962
+ * interp/c-doc.boot (checkDecorate): Don't insert formatting
+ braces in Spad mode.
+
2009-07-16 Gabriel Dos Reis <gdr@cs.tamu.edu>
* algebra/odeef.spad.pamphlet (ElementaryFunctionODESolver): Tidy.
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index ce5958d2..7355d14f 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -1,6 +1,6 @@
-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
-- All rights reserved.
--- Copyright (C) 2007-2008, Gabriel Dos Reis.
+-- Copyright (C) 2007-2009, Gabriel Dos Reis.
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -806,7 +806,9 @@ checkDecorate u ==
acc
x = char '_$ or x = '"$" => ['"\$",:acc]
x = char '_% or x = '"%" => ['"\%",:acc]
- x = char '_, or x = '"," => ['",{}",:acc]
+ x = char '_, or x = '"," =>
+ spadflag => ['",",:acc]
+ ['",{}",:acc]
x = '"\spad" => ['"\spad",:acc]
STRINGP x and DIGITP x.0 => [x,:acc]
not spadflag and
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 05:02:50 +0000