diff options
author | dos-reis <gdr@axiomatics.org> | 2008-08-15 22:23:17 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2008-08-15 22:23:17 +0000 |
commit | 8c851d2dca0a8d98953b7a2fa4c6d642c98fc11f (patch) | |
tree | cb035c43dc248664d52c8a4f084b9400a9c1b3ca | |
parent | a2f39f13bed2d39accb83cbb7f9e3336b2c92c1c (diff) | |
download | open-axiom-8c851d2dca0a8d98953b7a2fa4c6d642c98fc11f.tar.gz |
* configure.ac.pamphlet (oa_standard_linking): New. AC-substitute.
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | configure | 54 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | configure.ac.pamphlet | 4 |
4 files changed, 42 insertions, 24 deletions
@@ -1,3 +1,7 @@ +2008-08-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * configure.ac.pamphlet (oa_standard_linking): New. AC-substitute. + 2008-08-13 Gabriel Dos Reis <gdr@cs.tamu.edu> * config/var-def.mk (LNKEXT): New. @@ -853,6 +853,7 @@ NOWEAVE AXIOM_LISP axiom_include_gcl axiom_lisp_flavor +oa_standard_linking axiom_gcl_rsym_hack axiom_quiet_flags axiom_eval_flags @@ -3798,7 +3799,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3801 "configure"' > conftest.$ac_ext + echo '#line 3802 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6943,11 +6944,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:6946: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6947: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6950: \$? = $ac_status" >&5 + echo "$as_me:6951: \$? = $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. @@ -7211,11 +7212,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:7214: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7215: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7218: \$? = $ac_status" >&5 + echo "$as_me:7219: \$? = $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. @@ -7315,11 +7316,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:7318: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7319: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7322: \$? = $ac_status" >&5 + echo "$as_me:7323: \$? = $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 @@ -9767,7 +9768,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9770 "configure" +#line 9771 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9867,7 +9868,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9870 "configure" +#line 9871 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12235,11 +12236,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:12238: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12239: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12242: \$? = $ac_status" >&5 + echo "$as_me:12243: \$? = $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. @@ -12339,11 +12340,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:12342: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12343: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12346: \$? = $ac_status" >&5 + echo "$as_me:12347: \$? = $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 @@ -13909,11 +13910,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:13912: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13913: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13916: \$? = $ac_status" >&5 + echo "$as_me:13917: \$? = $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. @@ -14013,11 +14014,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:14016: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14017: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14020: \$? = $ac_status" >&5 + echo "$as_me:14021: \$? = $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 @@ -16243,11 +16244,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:16246: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16247: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16250: \$? = $ac_status" >&5 + echo "$as_me:16251: \$? = $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. @@ -16511,11 +16512,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:16514: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16515: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16518: \$? = $ac_status" >&5 + echo "$as_me:16519: \$? = $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. @@ -16615,11 +16616,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:16618: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16619: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16622: \$? = $ac_status" >&5 + echo "$as_me:16623: \$? = $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 @@ -20874,6 +20875,8 @@ fi ## We will default to GCL later, if no lisp implementation is specified. axiom_lisp= axiom_lisp_flavor=unknown +# Most Lisp systems don't use conventional methods for building programs. +oa_standard_linking=no # Check whether --with-lisp was given. if test "${with_lisp+set}" = set; then @@ -21015,6 +21018,7 @@ echo $ECHO_N "checking which flavor of Lisp... $ECHO_C" >&6; } ;; *ecl*) axiom_lisp_flavor=ecl + oa_standard_linking=yes ;; *sbcl*) axiom_lisp_flavor=sbcl @@ -21038,6 +21042,7 @@ esac + cat >>confdefs.h <<_ACEOF #define OPENAXIOM_BASE_RTS openaxiom_${axiom_lisp_flavor}_runtime _ACEOF @@ -26470,6 +26475,7 @@ for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF axiom_include_gcl!$axiom_include_gcl$ac_delim axiom_lisp_flavor!$axiom_lisp_flavor$ac_delim +oa_standard_linking!$oa_standard_linking$ac_delim axiom_gcl_rsym_hack!$axiom_gcl_rsym_hack$ac_delim axiom_quiet_flags!$axiom_quiet_flags$ac_delim axiom_eval_flags!$axiom_eval_flags$ac_delim @@ -26505,7 +26511,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 22dac6e4..ef6b8fda 100644 --- a/configure.ac +++ b/configure.ac @@ -164,6 +164,8 @@ fi ## We will default to GCL later, if no lisp implementation is specified. axiom_lisp= axiom_lisp_flavor=unknown +# Most Lisp systems don't use conventional methods for building programs. +oa_standard_linking=no AC_ARG_WITH([lisp], [ --with-lisp=L use L as Lisp platform], [axiom_lisp=$withval]) ## If --enable-gcl is specified, we need to check for coonsistency @@ -243,6 +245,7 @@ case $axiom_include_gcl,$axiom_lisp in ;; *ecl*) axiom_lisp_flavor=ecl + oa_standard_linking=yes ;; *sbcl*) axiom_lisp_flavor=sbcl @@ -262,6 +265,7 @@ esac AC_SUBST(axiom_include_gcl) AC_SUBST(axiom_lisp_flavor) +AC_SUBST(oa_standard_linking) AC_DEFINE_UNQUOTED([OPENAXIOM_BASE_RTS], [openaxiom_${axiom_lisp_flavor}_runtime], [The kind of base runtime system for this build.]) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 000749ee..c611ef27 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -774,6 +774,8 @@ copy of \Tool{GCL} sources it keeps in the \File{gcl/} directory. ## We will default to GCL later, if no lisp implementation is specified. axiom_lisp= axiom_lisp_flavor=unknown +# Most Lisp systems don't use conventional methods for building programs. +oa_standard_linking=no AC_ARG_WITH([lisp], [ --with-lisp=L use L as Lisp platform], [axiom_lisp=$withval]) @ @@ -881,6 +883,7 @@ case $axiom_include_gcl,$axiom_lisp in ;; *ecl*) axiom_lisp_flavor=ecl + oa_standard_linking=yes ;; *sbcl*) axiom_lisp_flavor=sbcl @@ -900,6 +903,7 @@ esac AC_SUBST(axiom_include_gcl) AC_SUBST(axiom_lisp_flavor) +AC_SUBST(oa_standard_linking) AC_DEFINE_UNQUOTED([OPENAXIOM_BASE_RTS], [openaxiom_${axiom_lisp_flavor}_runtime], [The kind of base runtime system for this build.]) |