diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | configure | 17 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 5 |
4 files changed, 22 insertions, 12 deletions
@@ -1,5 +1,12 @@ 2007-08-16 Gabriel Dos Reis <gdr@cs.tamu.edu> + * configure.ac.pamphlet: Check for executable gcl before + toplevel directory gcl. + * configure.ac: Regenerate. + * configure: Likewise. + +2007-08-16 Gabriel Dos Reis <gdr@cs.tamu.edu> + * TODO: Update 2007-08-16 Gabriel Dos Reis <gdr@cs.tamu.edu> @@ -20548,14 +20548,6 @@ fi fi ## We need to build our own GCL if none is avalaible if test -z $axiom_lisp; then - ## 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 ! -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;} - { (exit 1); exit 1; }; } - fi # Extract the first word of "gcl", so it can be a program name with args. set dummy gcl; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -20596,6 +20588,15 @@ echo "${ECHO_T}no" >&6; } 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 -z $AXIOM_LISP -a ! -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;} + { (exit 1); exit 1; }; } + fi + axiom_lisp=$AXIOM_LISP else ## Honor use of Lisp image specified on command line diff --git a/configure.ac b/configure.ac index 7ec29ebf..29bd9e59 100644 --- a/configure.ac +++ b/configure.ac @@ -140,13 +140,14 @@ if test -z $axiom_lisp; then fi ## We need to build our own GCL if none is avalaible 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 ! -d ${srcdir}/gcl; then + if test -z $AXIOM_LISP -a ! -d ${srcdir}/gcl; then AC_MSG_ERROR([OpenAxiom needs GCL. Either separately build one, or get the dependency tarball from OpenAxiom website.]) fi - AC_PATH_PROG([AXIOM_LISP], [gcl]) + axiom_lisp=$AXIOM_LISP else ## Honor use of Lisp image specified on command line diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 927e158d..15ce0c60 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -766,13 +766,14 @@ Consequently, we need to check for \Tool{GCL}: <<find lisp>>= ## We need to build our own GCL if none is avalaible 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 ! -d ${srcdir}/gcl; then + if test -z $AXIOM_LISP -a ! -d ${srcdir}/gcl; then AC_MSG_ERROR([OpenAxiom needs GCL. Either separately build one, or get the dependency tarball from OpenAxiom website.]) fi - AC_PATH_PROG([AXIOM_LISP], [gcl]) + axiom_lisp=$AXIOM_LISP else ## Honor use of Lisp image specified on command line |