diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 18 |
4 files changed, 31 insertions, 27 deletions
@@ -1,5 +1,9 @@ 2009-05-13 Gabriel Dos Reis <gdr@cs.tamu.edu> + * configure.ac.pamphlet: Tidy. + +2009-05-13 Gabriel Dos Reis <gdr@cs.tamu.edu> + * configure.ac.pamphlet: Disable use of libtool to build shared libraries. * config: Update autotools to newer versions. @@ -12803,28 +12803,25 @@ $as_echo "$as_me: error: --with-lisp=$axiom_lisp conflicts with --enable-gcl" >& ;; *) ## As of this writting, the Lisp systems ECL, GCL, SBCL, and CLisp all - ## understands the command line option --help, though they do - ## behave very differently. Some of them just print out the - ## help information and exits. Others, such as GCL, think they - ## must enter a read-eval-print loop (which isn't very helpful). + ## exist at the end of standard input. { $as_echo "$as_me:$LINENO: checking which flavor of Lisp" >&5 $as_echo_n "checking which flavor of Lisp... " >&6; } - what=`echo '(quit)' | $axiom_lisp --help` + what=`echo '(lisp-implementation-type)' | $axiom_lisp` case $what in *GCL*) axiom_lisp_flavor=gcl ;; - *ecl*) + *"ECL"*) axiom_lisp_flavor=ecl oa_standard_linking=yes ;; - *sbcl*) + *"SBCL"*) axiom_lisp_flavor=sbcl ;; - *CLISP*) + *"CLISP"*) ## Not all variants of CLisp have FFI support. FFI is used ## internally used by OpenAxiom in essential way. - if ! $axiom_lisp -q -x '*features*' | grep ':FFI' 2>/dev/null + if ! $axiom_lisp -q -x '*features*' | grep ':FFI' > /dev/null then { { $as_echo "$as_me:$LINENO: error: $axiom_lisp does not support Foreign Function Interface. Please upgrade to a better version of CLisp or install SBCL." >&5 $as_echo "$as_me: error: $axiom_lisp does not support Foreign Function Interface. Please upgrade to a better version of CLisp or install SBCL." >&2;} @@ -12832,6 +12829,9 @@ $as_echo "$as_me: error: $axiom_lisp does not support Foreign Function Interface fi axiom_lisp_flavor=clisp ;; + *"Armed Bear Common Lisp"*) + axiom_lisp_flavor=abcl + ;; esac { $as_echo "$as_me:$LINENO: result: $axiom_lisp_flavor" >&5 $as_echo "$axiom_lisp_flavor" >&6; } diff --git a/configure.ac b/configure.ac index 53fe5b52..ae648fe3 100644 --- a/configure.ac +++ b/configure.ac @@ -230,32 +230,32 @@ case $axiom_include_gcl,$axiom_lisp in ;; *) ## As of this writting, the Lisp systems ECL, GCL, SBCL, and CLisp all - ## understands the command line option --help, though they do - ## behave very differently. Some of them just print out the - ## help information and exits. Others, such as GCL, think they - ## must enter a read-eval-print loop (which isn't very helpful). + ## exist at the end of standard input. AC_MSG_CHECKING([which flavor of Lisp]) - what=`echo '(quit)' | $axiom_lisp --help` + what=`echo '(lisp-implementation-type)' | $axiom_lisp` case $what in *GCL*) axiom_lisp_flavor=gcl ;; - *ecl*) + *"ECL"*) axiom_lisp_flavor=ecl oa_standard_linking=yes ;; - *sbcl*) + *"SBCL"*) axiom_lisp_flavor=sbcl ;; - *CLISP*) + *"CLISP"*) ## Not all variants of CLisp have FFI support. FFI is used ## internally used by OpenAxiom in essential way. - if ! $axiom_lisp -q -x '*features*' | grep ':FFI' 2>/dev/null + if ! $axiom_lisp -q -x '*features*' | grep ':FFI' > /dev/null then AC_MSG_ERROR([$axiom_lisp does not support Foreign Function Interface. Please upgrade to a better version of CLisp or install SBCL.]) fi axiom_lisp_flavor=clisp ;; + *"Armed Bear Common Lisp"*) + axiom_lisp_flavor=abcl + ;; esac AC_MSG_RESULT([$axiom_lisp_flavor]) esac diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 1069c09e..7a543893 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -885,32 +885,32 @@ case $axiom_include_gcl,$axiom_lisp in ;; *) ## As of this writting, the Lisp systems ECL, GCL, SBCL, and CLisp all - ## understands the command line option --help, though they do - ## behave very differently. Some of them just print out the - ## help information and exits. Others, such as GCL, think they - ## must enter a read-eval-print loop (which isn't very helpful). + ## exist at the end of standard input. AC_MSG_CHECKING([which flavor of Lisp]) - what=`echo '(quit)' | $axiom_lisp --help` + what=`echo '(lisp-implementation-type)' | $axiom_lisp` case $what in *GCL*) axiom_lisp_flavor=gcl ;; - *ecl*) + *"ECL"*) axiom_lisp_flavor=ecl oa_standard_linking=yes ;; - *sbcl*) + *"SBCL"*) axiom_lisp_flavor=sbcl ;; - *CLISP*) + *"CLISP"*) ## Not all variants of CLisp have FFI support. FFI is used ## internally used by OpenAxiom in essential way. - if ! $axiom_lisp -q -x '*features*' | grep ':FFI' 2>/dev/null + if ! $axiom_lisp -q -x '*features*' | grep ':FFI' > /dev/null then AC_MSG_ERROR([$axiom_lisp does not support Foreign Function Interface. Please upgrade to a better version of CLisp or install SBCL.]) fi axiom_lisp_flavor=clisp ;; + *"Armed Bear Common Lisp"*) + axiom_lisp_flavor=abcl + ;; esac AC_MSG_RESULT([$axiom_lisp_flavor]) esac |