From 0c807cce60341e98126b4d834e6fbda97b216af6 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Wed, 15 Aug 2007 23:25:03 +0000 Subject: * configure.ac.pamphlet: Check GCL tarball dependency. * configure.in: Regenerate. --- ChangeLog | 5 +++++ configure | 17 ++++++++++++++++- configure.ac | 13 ++++++++++++- configure.ac.pamphlet | 13 ++++++++++++- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58b01759..4d6f61be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-08-15 Gabriel Dos Reis + + * configure.ac.pamphlet: Check GCL tarball dependency. + * configure.in: Regenerate. + 2007-08-10 Gabriel Dos Reis * Makefile.pamphlet (install): Ensure $(bindir) exists before diff --git a/configure b/configure index ce097b2a..d0a6f7fd 100755 --- a/configure +++ b/configure @@ -20540,8 +20540,16 @@ echo "$as_me: error: erroneous value for --enable-gcl" >&2;} fi fi -## We need to build our own GCL is none is avalaible +## 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 @@ -20602,6 +20610,13 @@ echo "$as_me: error: --disable-gcl specified but no GCL image found" >&2;} ## No Lisp image was specified and none was available from ## the build environment; build GCL from OpenAxiom source. + ## User may explicilty specify --enable-gcl, but may be missing + ## the dependency tarball. + if test ! -d ${srcdir}/gcl; then + { { echo "$as_me:$LINENO: error: The OpenAxiom dependency tarball is missing; please get it from our website." >&5 +echo "$as_me: error: The OpenAxiom dependency tarball is missing; please get it from our website." >&2;} + { (exit 1); exit 1; }; } + fi AXIOM_LISP='$(axiom_build_bindir)/gcl' axiom_all_prerequisites="$axiom_all_prerequisites all-gcl" axiom_include_gcl=yes diff --git a/configure.ac b/configure.ac index e8dafa87..6c13ed26 100644 --- a/configure.ac +++ b/configure.ac @@ -132,8 +132,14 @@ if test -z $axiom_lisp; then *) AC_MSG_ERROR([erroneous value for --enable-gcl]) ;; esac]) fi -## We need to build our own GCL is none is avalaible +## 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 + 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 @@ -153,6 +159,11 @@ case $axiom_include_gcl,$axiom_lisp in ## No Lisp image was specified and none was available from ## the build environment; build GCL from OpenAxiom source. + ## User may explicilty specify --enable-gcl, but may be missing + ## the dependency tarball. + if test ! -d ${srcdir}/gcl; then + AC_MSG_ERROR([The OpenAxiom dependency tarball is missing; please get it from our website.]) + fi AXIOM_LISP='$(axiom_build_bindir)/gcl' axiom_all_prerequisites="$axiom_all_prerequisites all-gcl" axiom_include_gcl=yes diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index b17e3cd3..61011e4b 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -753,8 +753,14 @@ 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}: <>= -## We need to build our own GCL is none is avalaible +## 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 + 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 @@ -782,6 +788,11 @@ case $axiom_include_gcl,$axiom_lisp in ## No Lisp image was specified and none was available from ## the build environment; build GCL from OpenAxiom source. + ## User may explicilty specify --enable-gcl, but may be missing + ## the dependency tarball. + if test ! -d ${srcdir}/gcl; then + AC_MSG_ERROR([The OpenAxiom dependency tarball is missing; please get it from our website.]) + fi AXIOM_LISP='$(axiom_build_bindir)/gcl' axiom_all_prerequisites="$axiom_all_prerequisites all-gcl" axiom_include_gcl=yes -- cgit v1.2.3