diff options
author | dos-reis <gdr@axiomatics.org> | 2010-11-01 13:30:38 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2010-11-01 13:30:38 +0000 |
commit | b3814555b86a821ab7778c7d7fa596e1da7d30e1 (patch) | |
tree | da7d7e8292a89a2742c81b66b28db26f1a005531 | |
parent | 1e1dca45d4d088f9a8f9da4971593540e7b75d7f (diff) | |
download | open-axiom-b3814555b86a821ab7778c7d7fa596e1da7d30e1.tar.gz |
* config/open-axiom.m4 (OPENAXIOM_GCL_HACKS): Remove. No longer
necesary with newer GCL-2.6.8pre.
* configure.ac: Dont' call it.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | config/open-axiom.m4 | 21 | ||||
-rwxr-xr-x | configure | 74 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/lisp/Makefile.in | 1 |
6 files changed, 41 insertions, 69 deletions
@@ -1,3 +1,9 @@ +2010-11-01 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * config/open-axiom.m4 (OPENAXIOM_GCL_HACKS): Remove. No longer + necesary with newer GCL-2.6.8pre. + * configure.ac: Dont' call it. + 2010-08-26 Gabriel Dos Reis <gdr@cs.tamu.edu> * config/open-axiom.m4 (OPENAXIOM_BUILD_TOOLS): Check for ln -s diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index fac0f7d0..137ebeb5 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -226,27 +226,6 @@ AC_PROG_CPP OPENAXIOM_CPPFLAGS_FOR_VENDOR_LOCK_INS ]) -dnl ------------------------- -dnl -- OPENAXIOM_GCL_HACKS -- -dnl ------------------------- -dnl Some auxiliary programs generated by GCL need to be at the -dnl right place when compiling under mingw32. -AC_DEFUN([OPENAXIOM_GCL_HACKS],[ -## The following is a horrible hack to arrange for GCL to successfully -## rebuild symbol tables with "rsym" on Windows platform. It should -## go away as soon as GCL upstream is fixed. -AC_SUBST(axiom_gcl_rsym_hack) -case $axiom_lisp_flavor,$target in - gcl,*mingw*) - axiom_gcl_rsym_hack='d=`echo "(format nil \"~a\" si::*system-directory*)" | $(AXIOM_LISP) | grep "/gcl.*/" | sed -e "s,\",,g"`; cp $$d/rsym$(EXEEXT) .' - ;; - *) - ## Breath. - axiom_gcl_rsym_hack=':' - ;; -esac -]) - dnl --------------------------------- dnl -- OPENAXIOM_SATISFY_GCL_NEEDS -- dnl --------------------------------- @@ -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-2010-10-27. +# Generated by GNU Autoconf 2.65 for OpenAxiom 1.4.0-2010-11-01. # # 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-2010-10-27' -PACKAGE_STRING='OpenAxiom 1.4.0-2010-10-27' +PACKAGE_VERSION='1.4.0-2010-11-01' +PACKAGE_STRING='OpenAxiom 1.4.0-2010-11-01' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' PACKAGE_URL='' @@ -815,7 +815,6 @@ oa_shrobj_flags oa_use_libtool_for_shared_lib EGREP GREP -axiom_gcl_rsym_hack CPP axiom_cflags ac_ct_CXX @@ -1456,7 +1455,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-10-27 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.4.0-2010-11-01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1526,7 +1525,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-10-27:";; + short | recursive ) echo "Configuration of OpenAxiom 1.4.0-2010-11-01:";; esac cat <<\_ACEOF @@ -1634,7 +1633,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.4.0-2010-10-27 +OpenAxiom configure 1.4.0-2010-11-01 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2526,7 +2525,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-10-27, which was +It was created by OpenAxiom $as_me 1.4.0-2010-11-01, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -4486,21 +4485,6 @@ esac -## The following is a horrible hack to arrange for GCL to successfully -## rebuild symbol tables with "rsym" on Windows platform. It should -## go away as soon as GCL upstream is fixed. - -case $axiom_lisp_flavor,$target in - gcl,*mingw*) - axiom_gcl_rsym_hack='d=`echo "(format nil \"~a\" si::*system-directory*)" | $(AXIOM_LISP) | grep "/gcl.*/" | sed -e "s,\",,g"`; cp $$d/rsym$(EXEEXT) .' - ;; - *) - ## Breath. - axiom_gcl_rsym_hack=':' - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } @@ -5700,13 +5684,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:5703: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5687: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5706: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5690: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5709: output\"" >&5) + (eval echo "\"\$as_me:5693: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6908,7 +6892,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6911 "configure"' > conftest.$ac_ext + echo '#line 6895 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8870,11 +8854,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:8873: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8857: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8877: \$? = $ac_status" >&5 + echo "$as_me:8861: \$? = $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. @@ -9209,11 +9193,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:9212: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9196: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9216: \$? = $ac_status" >&5 + echo "$as_me:9200: \$? = $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. @@ -9314,11 +9298,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:9317: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9301: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9321: \$? = $ac_status" >&5 + echo "$as_me:9305: \$? = $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 @@ -9369,11 +9353,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:9372: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9356: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9376: \$? = $ac_status" >&5 + echo "$as_me:9360: \$? = $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 @@ -11736,7 +11720,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11739 "configure" +#line 11723 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11832,7 +11816,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11835 "configure" +#line 11819 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13788,11 +13772,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:13791: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13775: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13795: \$? = $ac_status" >&5 + echo "$as_me:13779: \$? = $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. @@ -13887,11 +13871,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:13890: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13874: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13894: \$? = $ac_status" >&5 + echo "$as_me:13878: \$? = $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 @@ -13939,11 +13923,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:13942: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13926: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13946: \$? = $ac_status" >&5 + echo "$as_me:13930: \$? = $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 @@ -17817,7 +17801,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-2010-10-27, which was +This file was extended by OpenAxiom $as_me 1.4.0-2010-11-01, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17883,7 +17867,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-2010-10-27 +OpenAxiom config.status 1.4.0-2010-11-01 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4be6472e..33199f2a 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,7 @@ dnl Most of the macros used in this configure.ac are defined in files dnl located in the subdirectory config/ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.4.0-2010-10-27], +AC_INIT([OpenAxiom], [1.4.0-2010-11-01], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) @@ -83,7 +83,6 @@ oa_all_prerequisites= AC_SUBST(oa_all_prerequisites) OPENAXIOM_HOST_COMPILERS -OPENAXIOM_GCL_HACKS OPENAXIOM_HOST_DATA_PROPERTIES OPENAXIOM_DYNAMIC_MODULE_SUPPORT diff --git a/src/ChangeLog b/src/ChangeLog index 2c86b8a1..964fb701 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-11-01 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * lisp/Makefile.in ($(OUT)/lisp$(EXEEXT)): Remove GCL-specific + hack for rsym. + 2010-10-28 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/c-util.boot: Cleanup. diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in index e4336f42..01a68f27 100644 --- a/src/lisp/Makefile.in +++ b/src/lisp/Makefile.in @@ -92,7 +92,6 @@ lisp_c_objects = \ $(OUT)/lisp$(EXEEXT): base-lisp$(EXEEXT) ifeq (@axiom_lisp_flavor@,gcl) - @axiom_gcl_rsym_hack@ echo '(let* ((sys-cc compiler::*cc*) ' \ ' (sys-ld compiler::*ld*) ' \ ' (compiler::*cc* (concatenate (quote string) ' \ |