diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | config/open-axiom.m4 | 21 | ||||
| -rwxr-xr-x | configure | 81 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 5 |
5 files changed, 68 insertions, 49 deletions
@@ -1,3 +1,11 @@ +2011-04-10 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * config/open-axiom.m4 (OPENAXIOM_HOST_LISP_CPU_PRECISION): + Special-case for detecting binary personality. + * configure.ac: ECL now provides (at last!) way to gather + information about binary personality. + + 2011-01-01 Gabriel Dos Reis <gdr@cs.tamu.edu> * configure.ac: Reject ECL on Mac OS X as it cannot give reliable diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index 00a222a2..ca3f7853 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -51,13 +51,6 @@ if test x"$oa_include_gcl" != xyes; then ;; esac ;; - # ECL does not provide useful information for detecting CPU precision - *ecl*) - case $target in - *darwin*) - AC_MSG_ERROR([We do not know how to extend this Lisp system with native libraries. Please consider SBCL or better]) - esac - ;; esac fi ]) @@ -443,8 +436,18 @@ dnl set the global variable openaxiom_host_lisp_precision. AC_DEFUN([OPENAXIOM_HOST_LISP_CPU_PRECISION], [ if test x"$oa_include_gcl" != xyes; then AC_MSG_CHECKING([CPU precision as seen by $AXIOM_LISP]) - case `echo '*features*' | $AXIOM_LISP` in - *X86-64*|*X86_64*|*WORD-SIZE=64*|*64-BIT-HOST*) + # Almost all Lisp systems we support put the relevant information + # on the *FEATURES* list. Except ECL. + case $axiom_lisp_flavor in + ecl) + features_expr='(progn (require :cmp) (eval (find-symbol "*COMPILER-FEATURES*" :c)))' + ;; + *) + features_expr='*features*' + ;; + esac + case `echo $features_expr | $AXIOM_LISP` in + *X86-64*|*X86_64*|*WORD-SIZE=64*|*64-BIT*) # PORTME: the pattern above covers only the supported free Lisps, i.e. # GCL, SBCL, CLisp, ECL and Clozure CL. openaxiom_host_lisp_precision=64 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for OpenAxiom 1.4.0-2011-03-21. +# Generated by GNU Autoconf 2.65 for OpenAxiom 1.4.0-2011-04-10. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.4.0-2011-03-21' -PACKAGE_STRING='OpenAxiom 1.4.0-2011-03-21' +PACKAGE_VERSION='1.4.0-2011-04-10' +PACKAGE_STRING='OpenAxiom 1.4.0-2011-04-10' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' PACKAGE_URL='' @@ -1491,7 +1491,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-2011-03-21 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.4.0-2011-04-10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1566,7 +1566,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2011-03-21:";; + short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2011-04-10:";; esac cat <<\_ACEOF @@ -1677,7 +1677,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.4.0-2011-03-21 +OpenAxiom configure 1.4.0-2011-04-10 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2569,7 +2569,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-2011-03-21, which was +It was created by OpenAxiom $as_me 1.4.0-2011-04-10, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -5468,7 +5468,7 @@ fi # Define the identity of the package. PACKAGE='openaxiom' - VERSION='1.4.0-2011-03-21' + VERSION='1.4.0-2011-04-10' cat >>confdefs.h <<_ACEOF @@ -5782,13 +5782,6 @@ $as_echo "$v" >&6; } ;; esac ;; - # ECL does not provide useful information for detecting CPU precision - *ecl*) - case $target in - *darwin*) - as_fn_error "We do not know how to extend this Lisp system with native libraries. Please consider SBCL or better" "$LINENO" 5 - esac - ;; esac fi @@ -5796,8 +5789,18 @@ fi if test x"$oa_include_gcl" != xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking CPU precision as seen by $AXIOM_LISP" >&5 $as_echo_n "checking CPU precision as seen by $AXIOM_LISP... " >&6; } - case `echo '*features*' | $AXIOM_LISP` in - *X86-64*|*X86_64*|*WORD-SIZE=64*|*64-BIT-HOST*) + # Almost all Lisp systems we support put the relevant information + # on the *FEATURES* list. Except ECL. + case $axiom_lisp_flavor in + ecl) + features_expr='(progn (require :cmp) (eval (find-symbol "*COMPILER-FEATURES*" :c)))' + ;; + *) + features_expr='*features*' + ;; + esac + case `echo $features_expr | $AXIOM_LISP` in + *X86-64*|*X86_64*|*WORD-SIZE=64*|*64-BIT*) # PORTME: the pattern above covers only the supported free Lisps, i.e. # GCL, SBCL, CLisp, ECL and Clozure CL. openaxiom_host_lisp_precision=64 @@ -8804,13 +8807,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:8807: $ac_compile\"" >&5) + (eval echo "\"\$as_me:8810: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:8810: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:8813: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:8813: output\"" >&5) + (eval echo "\"\$as_me:8816: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -10012,7 +10015,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 10015 "configure"' > conftest.$ac_ext + echo '#line 10018 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12106,11 +12109,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:12109: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12112: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12113: \$? = $ac_status" >&5 + echo "$as_me:12116: \$? = $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. @@ -12445,11 +12448,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:12448: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12451: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12452: \$? = $ac_status" >&5 + echo "$as_me:12455: \$? = $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. @@ -12550,11 +12553,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:12553: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12556: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12557: \$? = $ac_status" >&5 + echo "$as_me:12560: \$? = $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 @@ -12605,11 +12608,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:12608: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12611: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12612: \$? = $ac_status" >&5 + echo "$as_me:12615: \$? = $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 @@ -14972,7 +14975,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14975 "configure" +#line 14978 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15068,7 +15071,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15071 "configure" +#line 15074 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17024,11 +17027,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:17027: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17030: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17031: \$? = $ac_status" >&5 + echo "$as_me:17034: \$? = $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. @@ -17123,11 +17126,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:17126: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17129: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17130: \$? = $ac_status" >&5 + echo "$as_me:17133: \$? = $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 @@ -17175,11 +17178,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:17178: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17181: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17182: \$? = $ac_status" >&5 + echo "$as_me:17185: \$? = $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 @@ -21267,7 +21270,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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-2011-03-21, which was +This file was extended by OpenAxiom $as_me 1.4.0-2011-04-10, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21333,7 +21336,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OpenAxiom config.status 1.4.0-2011-03-21 +OpenAxiom config.status 1.4.0-2011-04-10 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 08ace0cc..5754d46e 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ dnl Makefiles for building OpenAxiom interpreter, compiler, libraries, and dnl auxiliary tools where appropriate. dnl -AC_INIT([OpenAxiom], [1.4.0-2011-03-21], +AC_INIT([OpenAxiom], [1.4.0-2011-04-10], [open-axiom-bugs@lists.sf.net]) dnl Most of the macros used in this configure.ac are defined in files diff --git a/src/ChangeLog b/src/ChangeLog index 599ca51a..0149510b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -40,6 +40,11 @@ 2011-03-17 Gabriel Dos Reis <gdr@cs.tamu.edu> + * utils/sexpr.H: Support more specialized s-expressions. + * utils/sexpr.cc: Likewise. + +2011-03-17 Gabriel Dos Reis <gdr@cs.tamu.edu> + * utils/storage.H: Rework. * utils/storage.cc: Likewise. |