diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | config/var-def.mk | 2 | ||||
| -rwxr-xr-x | configure | 82 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 22 |
5 files changed, 95 insertions, 33 deletions
@@ -0,0 +1,4 @@ +2010-02-06 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * configure.ac.pamphlet: Add support for --enable-threads. + diff --git a/config/var-def.mk b/config/var-def.mk index a4dc07e8..cd5041a9 100644 --- a/config/var-def.mk +++ b/config/var-def.mk @@ -207,6 +207,8 @@ oa_enable_profiling = @oa_enable_profiling@ oa_enable_lisp_profiling = \ $(call oa_yesno_to_lisp_boolean,$(oa_enable_profiling)) +oa_enable_threads = @oa_enable_threads@ + axiom_use_x = @axiom_use_x@ AXIOM_X11_CFLAGS = @X_CFLAGS@ AXIOM_X11_LDFLAGS = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-01-30. +# Generated by GNU Autoconf 2.63 for OpenAxiom 1.4.0-2010-02-06. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.4.0-2010-01-30' -PACKAGE_STRING='OpenAxiom 1.4.0-2010-01-30' +PACKAGE_VERSION='1.4.0-2010-02-06' +PACKAGE_STRING='OpenAxiom 1.4.0-2010-02-06' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -813,6 +813,7 @@ oa_enable_profiling axiom_optimize_options axiom_enable_checking axiom_all_prerequisites +oa_enable_threads axiom_fasl_type oa_use_dynamic_lib axiom_eval_flags @@ -939,6 +940,7 @@ with_gnu_ld enable_libtool_lock with_lisp enable_gcl +enable_threads enable_checking enable_profiling with_x @@ -1509,7 +1511,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-2010-01-30 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.4.0-2010-02-06 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1579,7 +1581,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-01-30:";; + short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-02-06:";; esac cat <<\_ACEOF @@ -1593,6 +1595,7 @@ Optional Features: optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) --enable-gcl build GCL from OpenAxiom source + --enable-threads turn on threads support --enable-checking turn runtime checking on --enable-profiling turn profiling on @@ -1685,7 +1688,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.4.0-2010-01-30 +OpenAxiom configure 1.4.0-2010-02-06 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1699,7 +1702,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-2010-01-30, which was +It was created by OpenAxiom $as_me 1.4.0-2010-02-06, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -5079,13 +5082,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:5082: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5085: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5085: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5088: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5088: output\"" >&5) + (eval echo "\"\$as_me:5091: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6287,7 +6290,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6290 "configure"' > conftest.$ac_ext + echo '#line 6293 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8558,11 +8561,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:8561: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8564: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8565: \$? = $ac_status" >&5 + echo "$as_me:8568: \$? = $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. @@ -8897,11 +8900,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:8900: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8903: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8904: \$? = $ac_status" >&5 + echo "$as_me:8907: \$? = $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. @@ -9002,11 +9005,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:9005: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9008: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9009: \$? = $ac_status" >&5 + echo "$as_me:9012: \$? = $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 @@ -9057,11 +9060,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:9060: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9063: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9064: \$? = $ac_status" >&5 + echo "$as_me:9067: \$? = $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 @@ -11857,7 +11860,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11860 "configure" +#line 11863 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11953,7 +11956,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11956 "configure" +#line 11959 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13973,11 +13976,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:13976: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13979: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13980: \$? = $ac_status" >&5 + echo "$as_me:13983: \$? = $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. @@ -14072,11 +14075,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:14075: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14078: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14079: \$? = $ac_status" >&5 + echo "$as_me:14082: \$? = $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 @@ -14124,11 +14127,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:14127: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14130: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14131: \$? = $ac_status" >&5 + echo "$as_me:14134: \$? = $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 @@ -16176,6 +16179,27 @@ $as_echo "$axiom_fasl_type" >&6; } fi +## Does it make sense to pretend that we support multithreading? +oa_enable_threads=no +# Check whether --enable-threads was given. +if test "${enable_threads+set}" = set; then + enableval=$enable_threads; case $enableval in + yes|no) oa_enable_threads=$enableval ;; + *) { { $as_echo "$as_me:$LINENO: error: erroneous value for --enable-threads" >&5 +$as_echo "$as_me: error: erroneous value for --enable-threads" >&2;} + { (exit 1); exit 1; }; } ;; + esac +fi + + +# GNU compiler wants to have a hint about multithreading. +case $GCC,$oa_enable_threads in + yes,yes) + axiom_cflags="$axiom_cflags -pthread" +esac + + + axiom_optimize_options=speed ## Shall we proclaim safety? @@ -21124,7 +21148,7 @@ exec 6>&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-2010-01-30, which was +This file was extended by OpenAxiom $as_me 1.4.0-2010-02-06, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21187,7 +21211,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -OpenAxiom config.status 1.4.0-2010-01-30 +OpenAxiom config.status 1.4.0-2010-02-06 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 4874103d..57d5ca28 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.4.0-2010-01-30], +AC_INIT([OpenAxiom], [1.4.0-2010-02-06], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) @@ -351,6 +351,22 @@ if test -z $axiom_fasl_type; then fi AC_SUBST(axiom_fasl_type) +## Does it make sense to pretend that we support multithreading? +oa_enable_threads=no +AC_ARG_ENABLE([threads], [ --enable-threads turn on threads support], + [case $enableval in + yes|no) oa_enable_threads=$enableval ;; + *) AC_MSG_ERROR([erroneous value for --enable-threads]) ;; + esac]) + +# GNU compiler wants to have a hint about multithreading. +case $GCC,$oa_enable_threads in + yes,yes) + axiom_cflags="$axiom_cflags -pthread" +esac + +AC_SUBST(oa_enable_threads) + AC_SUBST(axiom_all_prerequisites) axiom_optimize_options=speed ## Shall we proclaim safety? diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 34570158..610be798 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -478,8 +478,8 @@ AC_SUBST(openaxiom_host_has_regex) \subsubsection{Runtime checking} -\Tool{OpenAxiom}'s Lisp runtime platform may instructed to perform -runtime checking. This may be useful when chasing Heinsenbugs. +\Tool{OpenAxiom}'s Lisp runtime platform may be instructed to perform +runtime checks. This may be useful when chasing Heinsenbugs. It probably should be the default mode on development or experimental branches. <<runtime checking>>= @@ -645,6 +645,22 @@ axiom_all_prerequisites= <<lisp options>> <<compiled lisp extension>> +## Does it make sense to pretend that we support multithreading? +oa_enable_threads=no +AC_ARG_ENABLE([threads], [ --enable-threads turn on threads support], + [case $enableval in + yes|no) oa_enable_threads=$enableval ;; + *) AC_MSG_ERROR([erroneous value for --enable-threads]) ;; + esac]) + +# GNU compiler wants to have a hint about multithreading. +case $GCC,$oa_enable_threads in + yes,yes) + axiom_cflags="$axiom_cflags -pthread" +esac + +AC_SUBST(oa_enable_threads) + AC_SUBST(axiom_all_prerequisites) @ @@ -1167,7 +1183,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.4.0-2010-01-30], +AC_INIT([OpenAxiom], [1.4.0-2010-02-06], [open-axiom-bugs@lists.sf.net]) @ |