diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | configure | 22 | ||||
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 22 |
4 files changed, 59 insertions, 9 deletions
@@ -1,5 +1,12 @@ 2007-09-04 Gabriel Dos Reis <gdr@cs.tamu.edu> + * configure.ac.pamphlet: Ignore any existing GCL that is not + either 2.6.7 or 2.6.8. + * configure.ac: Regenerate. + * configure: Likewise. + +2007-09-04 Gabriel Dos Reis <gdr@cs.tamu.edu> + * config/setup-dep.mk ($(top_srcdir)/configure.ac): Robustify regeneration from pamphlet. ($(srcdir)/Makefile.in): Likewise. @@ -20546,7 +20546,8 @@ echo "$as_me: error: erroneous value for --enable-gcl" >&2;} fi fi -## We need to build our own GCL if none is avalaible +## We need to build our own GCL if none is avalaible, or the existing +## one is too old. if test -z $axiom_lisp; then # Extract the first word of "gcl", so it can be a program name with args. set dummy gcl; ac_word=$2 @@ -20591,9 +20592,24 @@ fi ## 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 -n "$AXIOM_LISP"; then + { echo "$as_me:$LINENO: checking $AXIOM_LISP version" >&5 +echo $ECHO_N "checking $AXIOM_LISP version... $ECHO_C" >&6; } + v=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"` + { echo "$as_me:$LINENO: result: $v" >&5 +echo "${ECHO_T}$v" >&6; } + case $v in + *2.6.7*|*2.6.8*) ;; # OK + *) + { echo "$as_me:$LINENO: WARNING: $v is not supported by this version of OpenAxiom. $AXIOM_LISP will be ignored." >&5 +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 - { { echo "$as_me:$LINENO: error: OpenAxiom needs GCL. Either separately build one, or get the dependency tarball from OpenAxiom website." >&5 -echo "$as_me: error: OpenAxiom needs GCL. Either separately build one, or get the dependency tarball from OpenAxiom website." >&2;} + { { echo "$as_me:$LINENO: error: OpenAxiom requires GCL-2.6.7 or GCL-2.6.8. Either separately build one, or get the dependency tarball from OpenAxiom download website." >&5 +echo "$as_me: error: OpenAxiom requires GCL-2.6.7 or GCL-2.6.8. Either separately build one, or get the dependency tarball from OpenAxiom download website." >&2;} { (exit 1); exit 1; }; } fi diff --git a/configure.ac b/configure.ac index de723096..60bd3b49 100644 --- a/configure.ac +++ b/configure.ac @@ -138,14 +138,27 @@ 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 +## We need to build our own GCL if none is avalaible, or the existing +## one is too old. if test -z $axiom_lisp; then AC_PATH_PROG([AXIOM_LISP], [gcl]) ## 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 -n "$AXIOM_LISP"; 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 needs GCL. Either separately build one, or get the dependency tarball from OpenAxiom website.]) + AC_MSG_ERROR([OpenAxiom requires GCL-2.6.7 or GCL-2.6.8. Either separately build one, or get the dependency tarball from OpenAxiom download website.]) fi axiom_lisp=$AXIOM_LISP diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index ec693209..e8301d74 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -766,18 +766,32 @@ fi Do we need to build our own version of \Tool{GCL}? The answer is yes, if \begin{itemize} \item the option \verb!--with-lisp! is not specified, and -\item no \Tool{GCL} image is available in the build environment. + no \Tool{GCL} image is available in the build environment; or +\item we found a \Tool{GCL} image, but it is too old for OpenAxiom. \end{itemize} -Consequently, we need to check for \Tool{GCL}: +Consequently, we need to check for \Tool{GCL} and its version: <<find lisp>>= -## We need to build our own GCL if none is avalaible +## We need to build our own GCL if none is avalaible, or the existing +## one is too old. if test -z $axiom_lisp; then AC_PATH_PROG([AXIOM_LISP], [gcl]) ## 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 -n "$AXIOM_LISP"; 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 needs GCL. Either separately build one, or get the dependency tarball from OpenAxiom website.]) + AC_MSG_ERROR([OpenAxiom requires GCL-2.6.7 or GCL-2.6.8. Either separately build one, or get the dependency tarball from OpenAxiom download website.]) fi axiom_lisp=$AXIOM_LISP |