diff options
| -rw-r--r-- | config/open-axiom.m4 | 24 | ||||
| -rwxr-xr-x | configure | 44 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 39 insertions, 31 deletions
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index 02dccbb9..676bf2bf 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -284,17 +284,21 @@ OPENAXIOM_LISP_FLAVOR OPENAXIOM_REJECT_ROTTED_LISP OPENAXIOM_HOST_LISP_CPU_PRECISION OPENAXIOM_CHECK_DELAYED_FFI -## Are we using compilers from GNU? -oa_gnu_compiler=no +## Where are the compilers coming from? GNU? Clang? +oa_cxx_compiler_lineage=unknown AC_PROG_CC AC_PROG_CXX([g++ clang++ icpc icc CC xlC c++]) if test x$GCC = xyes || test x$GXX = xyes; then - oa_gnu_compiler=yes + oa_cxx_compiler_lineage=gnu +else + case `$CXX -v` in + *clang*) oa_cxx_compiler_lineage=clang ;; + esac fi ## Augment C and C++ compiler flags with ABI directives as appropriate ## before we proceed to infer other host datatype properties. if test -n "$oa_host_lisp_precision"; then - if test x$oa_gnu_compiler = xyes; then + if test $oa_cxx_compiler_lineage = gnu; then CPPFLAGS="$CPPFLAGS -m$oa_host_lisp_precision" LDFLAGS="$LDFLAGS -m$oa_host_lisp_precision" ## else, cross fingers and pray. @@ -314,8 +318,8 @@ dnl GCL assumes that the C compiler is from GNU. AC_DEFUN([OPENAXIOM_SATISFY_GCL_NEEDS],[ ## If we are using GCL as the base runtime system, then we do really need ## a C compiler from GNU. Well, at least for the moment. -case $oa_lisp_flavor,$oa_gnu_compiler in - gcl,yes) +case $oa_lisp_flavor,$oa_cxx_compiler_lineage in + gcl,gnu) oa_cflags="-O2 -Wall -D_GNU_SOURCE" ;; @@ -687,8 +691,8 @@ AC_ARG_ENABLE([threads], [ --enable-threads turn on threads support], *) AC_MSG_ERROR([erroneous value for --enable-threads]) ;; esac]) # GNU compilers want hints about multithreading. -case $oa_gnu_compiler,$oa_enable_threads in - yes,yes) +case $oa_cxx_compiler_lineage,$oa_enable_threads in + gnu,yes) oa_cflags="$oa_cflags -pthread" esac AC_SUBST(oa_enable_threads) @@ -1134,8 +1138,8 @@ dnl -------------------------- AC_DEFUN([OPENAXIOM_CHECK_MISC],[ OPENAXIOM_ALIGNMENT_OPERATOR OPENAXIOM_ALIGNAS_SPECIFIER -case $oa_gnu_compiler in - yes) +case $oa_cxx_compiler_lineage in + gnu|clang) CFLAGS="$CFLAGS -O2 -Wall" CXXFLAGS="$CXXFLAGS -O2 -Wall" ;; @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenAxiom 1.5.0-2014-08-26. +# Generated by GNU Autoconf 2.69 for OpenAxiom 1.5.0-2014-11-20. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.5.0-2014-08-26' -PACKAGE_STRING='OpenAxiom 1.5.0-2014-08-26' +PACKAGE_VERSION='1.5.0-2014-11-20' +PACKAGE_STRING='OpenAxiom 1.5.0-2014-11-20' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' PACKAGE_URL='' @@ -1420,7 +1420,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.5.0-2014-08-26 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.5.0-2014-11-20 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1495,7 +1495,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2014-08-26:";; + short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2014-11-20:";; esac cat <<\_ACEOF @@ -1612,7 +1612,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.5.0-2014-08-26 +OpenAxiom configure 1.5.0-2014-11-20 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2429,7 +2429,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.5.0-2014-08-26, which was +It was created by OpenAxiom $as_me 1.5.0-2014-11-20, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3448,7 +3448,7 @@ fi # Define the identity of the package. PACKAGE='openaxiom' - VERSION='1.5.0-2014-08-26' + VERSION='1.5.0-2014-11-20' cat >>confdefs.h <<_ACEOF @@ -3953,8 +3953,8 @@ case ${oa_lisp_flavor},$host in esac -## Are we using compilers from GNU? -oa_gnu_compiler=no +## Where are the compilers coming from? GNU? Clang? +oa_cxx_compiler_lineage=unknown ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5317,12 +5317,16 @@ fi if test x$GCC = xyes || test x$GXX = xyes; then - oa_gnu_compiler=yes + oa_cxx_compiler_lineage=gnu +else + case `$CXX -v` in + *clang*) oa_cxx_compiler_lineage=clang ;; + esac fi ## Augment C and C++ compiler flags with ABI directives as appropriate ## before we proceed to infer other host datatype properties. if test -n "$oa_host_lisp_precision"; then - if test x$oa_gnu_compiler = xyes; then + if test $oa_cxx_compiler_lineage = gnu; then CPPFLAGS="$CPPFLAGS -m$oa_host_lisp_precision" LDFLAGS="$LDFLAGS -m$oa_host_lisp_precision" ## else, cross fingers and pray. @@ -5331,8 +5335,8 @@ fi ## If we are using GCL as the base runtime system, then we do really need ## a C compiler from GNU. Well, at least for the moment. -case $oa_lisp_flavor,$oa_gnu_compiler in - gcl,yes) +case $oa_lisp_flavor,$oa_cxx_compiler_lineage in + gcl,gnu) oa_cflags="-O2 -Wall -D_GNU_SOURCE" ;; @@ -17252,8 +17256,8 @@ if test "${enable_threads+set}" = set; then : fi # GNU compilers want hints about multithreading. -case $oa_gnu_compiler,$oa_enable_threads in - yes,yes) +case $oa_cxx_compiler_lineage,$oa_enable_threads in + gnu,yes) oa_cflags="$oa_cflags -pthread" esac @@ -19524,8 +19528,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $oa_alignas" >&5 $as_echo "$oa_alignas" >&6; } -case $oa_gnu_compiler in - yes) +case $oa_cxx_compiler_lineage in + gnu|clang) CFLAGS="$CFLAGS -O2 -Wall" CXXFLAGS="$CXXFLAGS -O2 -Wall" ;; @@ -20156,7 +20160,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.5.0-2014-08-26, which was +This file was extended by OpenAxiom $as_me 1.5.0-2014-11-20, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20226,7 +20230,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.5.0-2014-08-26 +OpenAxiom config.status 1.5.0-2014-11-20 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d29db945..ffbbe5a9 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.5.0-2014-08-26], +AC_INIT([OpenAxiom], [1.5.0-2014-11-20], [open-axiom-bugs@lists.sf.net]) dnl Most of the macros used in this configure.ac are defined in files |