Clean up global variable names.

15 files changed, 236 insertions, 211 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b94f152..cd1914e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-10  Gabriel Dos Reis  <gdr@integrable-solutions.net>>
+
+	* config/open-axiom.m4: Clean up global variable names.
+	* configure.ac: Likewise.
+
 2014-02-03  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	* config/open-axiom.m4: Clean up global variable names.
diff --git a/Makefile.in b/Makefile.in
index 970cb9c5..5242fd31 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -375,12 +375,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-axiom_cflags = @axiom_cflags@
-axiom_eval_flags = @axiom_eval_flags@
-axiom_fasl_type = @axiom_fasl_type@
-axiom_lisp_flavor = @axiom_lisp_flavor@
-axiom_quiet_flags = @axiom_quiet_flags@
-axiom_use_x = @axiom_use_x@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -415,21 +409,27 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oa_c_runtime = @oa_c_runtime@
 oa_c_runtime_extra = @oa_c_runtime_extra@
+oa_cflags = @oa_cflags@
 oa_delay_ffi = @oa_delay_ffi@
 oa_editor = @oa_editor@
 oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
+oa_eval_flags = @oa_eval_flags@
+oa_fasl_type = @oa_fasl_type@
+oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
+oa_lisp_flavor = @oa_lisp_flavor@
 oa_optimize_options = @oa_optimize_options@
+oa_quiet_flags = @oa_quiet_flags@
 oa_shrlib_flags = @oa_shrlib_flags@
 oa_shrobj_flags = @oa_shrobj_flags@
 oa_standard_linking = @oa_standard_linking@
 oa_use_dynamic_lib = @oa_use_dynamic_lib@
 oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@
+oa_use_x = @oa_use_x@
 oldincludedir = @oldincludedir@
 open_axiom_installdir = @open_axiom_installdir@
-openaxiom_host_has_regex = @openaxiom_host_has_regex@
 pdfdir = @pdfdir@
 pointer_type = @pointer_type@
 prefix = @prefix@
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index e25b609a..87c8c5a4 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -1,6 +1,20 @@
+dnl ------------------------
+dnl -- OPENAXIOM_MAKEFILE --
+dnl ------------------------
 AC_DEFUN([OPENAXIOM_MAKEFILE],
 [AC_CONFIG_FILES([$1:config/var-def.mk:$1.in:config/setup-dep.mk])])
 
+dnl --------------------------------
+dnl -- OPENAXIOM_CANONICAL_SYSTEM --
+dnl --------------------------------
+AC_DEFUN([OPENAXIOM_CANONICAL_SYSTEM],[
+AC_CANONICAL_SYSTEM
+oa_targetdir=$top_builddir/$target
+oa_target_bindir=$oa_targetdir/bin
+oa_target_libdir=$oa_targetdir/lib
+oa_target_includedir=$oa_targetdir/include
+])
+
 dnl --------------------------------------
 dnl -- OPENAXIOM_STANDARD_INTEGER_TYPES --
 dnl --------------------------------------
@@ -44,21 +58,21 @@ if test x"$oa_include_gcl" != xyes; then
    case $AXIOM_LISP in
       *gcl*)
 	 AC_MSG_CHECKING([$AXIOM_LISP version])
-	 openaxiom_lisp_version=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"`
-	 AC_MSG_RESULT([$openaxiom_lisp_version])
-	 case $openaxiom_lisp_version in
+	 oa_lisp_version=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"`
+	 AC_MSG_RESULT([$oa_lisp_version])
+	 case $oa_lisp_version in
 	   *2.6.7*|*2.6.8*|*2.6.9*|*2.6.10*) ;;         # OK
 	   *)
-	     AC_MSG_WARN([$openaxiom_lisp_version is not supported by this version of OpenAxiom.])
+	     AC_MSG_WARN([$oa_lisp_version is not supported by this version of OpenAxiom.])
 	     ;;
 	 esac
 	 ;;
       # SBCL-1.0.29 has a nasty regression that prevents OpenAxiom build
       *sbcl*)
 	 AC_MSG_CHECKING([$AXIOM_LISP version])
-	 openaxiom_lisp_version=`$AXIOM_LISP --version`
-	 AC_MSG_RESULT([$openaxiom_lisp_version])
-	 case $openaxiom_lisp_version in
+	 oa_lisp_version=`$AXIOM_LISP --version`
+	 AC_MSG_RESULT([$oa_lisp_version])
+	 case $oa_lisp_version in
 	   *1.0.29)
 	      AC_MSG_ERROR([This version of SBCL has a bug that breaks OpenAxiom build.  Consider SBCL-1.0.30 or higher.])
 	      ;;
@@ -140,8 +154,8 @@ dnl Determine the flavor of the host Lisp system.
 AC_DEFUN([OPENAXIOM_LISP_FLAVOR],[
 OPENAXIOM_CHECK_GCL_INCLUSION
 
-axiom_lisp_flavor=unknown
-AC_SUBST(axiom_lisp_flavor)
+oa_lisp_flavor=unknown
+AC_SUBST(oa_lisp_flavor)
  
 ## Most Lisp systems don't use conventional methods for building programs.
 oa_standard_linking=no
@@ -151,18 +165,18 @@ AC_SUBST(oa_standard_linking)
 ##  ECL, GCL, SBCL, CLisp, and Clozure CL all exit at end of standard input.
 AC_MSG_CHECKING([which flavor of Lisp])
 if test x"$oa_include_gcl" = xyes; then
-   axiom_lisp_flavor=gcl
+   oa_lisp_flavor=gcl
 else
    case `echo '(lisp-implementation-type)' | $AXIOM_LISP` in
        *GCL*) 
-	   axiom_lisp_flavor=gcl
+	   oa_lisp_flavor=gcl
 	   ;;
        *"ECL"*) 
-	   axiom_lisp_flavor=ecl 
+	   oa_lisp_flavor=ecl 
 	   oa_standard_linking=yes
 	   ;;
        *"SBCL"*) 
-	   axiom_lisp_flavor=sbcl 
+	   oa_lisp_flavor=sbcl 
 	   ;;
        *"CLISP"*)
 	   ## Not all variants of CLisp have FFI support.  FFI is used
@@ -171,22 +185,22 @@ else
 	   then
 	     AC_MSG_ERROR([$AXIOM_LISP does not support Foreign Function Interface.  Please upgrade to a better version of CLisp or install SBCL.])
 	   fi
-	   axiom_lisp_flavor=clisp
+	   oa_lisp_flavor=clisp
 	   ;;
        *"Armed Bear Common Lisp"*) 
-	   axiom_lisp_flavor=abcl 
+	   oa_lisp_flavor=abcl 
 	   ;;
        *"Clozure Common Lisp"*)
-	   axiom_lisp_flavor=clozure
+	   oa_lisp_flavor=clozure
 	   ;;
    esac
 fi
-AC_MSG_RESULT([$axiom_lisp_flavor])
-AM_CONDITIONAL([OA_ECL_RT],[test $axiom_lisp_flavor = ecl])
+AC_MSG_RESULT([$oa_lisp_flavor])
+AM_CONDITIONAL([OA_ECL_RT],[test $oa_lisp_flavor = ecl])
 AM_CONDITIONAL([OA_STANDARD_LINKING],[test $oa_standard_linking = yes])
 
 AC_DEFINE_UNQUOTED([OPENAXIOM_BASE_RTS],
-                   [Runtime::${axiom_lisp_flavor}],
+                   [Runtime::${oa_lisp_flavor}],
                    [The kind of base runtime system for this build.])
 ])
 
@@ -197,7 +211,7 @@ dnl Check whether loading modules for dynamic FFI support
 dnl should be delayed to runtime.  This is needed for Lisp
 dnl systems that have trouble with DLLs.
 AC_DEFUN([OPENAXIOM_CHECK_DELAYED_FFI], [
-case ${axiom_lisp_flavor},$host in
+case ${oa_lisp_flavor},$host in
   sbcl,* | clozure,* | clisp,*) 
      oa_delay_ffi=yes
      ;;
@@ -262,10 +276,10 @@ if test x$GCC = xyes || test x$GXX = xyes; then
 fi
 ## Augment C and C++ compiler flags with ABI directives as appropriate
 ## before we proceed to infer other host datatype properties.
-if test -n "$openaxiom_host_lisp_precision"; then
+if test -n "$oa_host_lisp_precision"; then
    if test x$oa_gnu_compiler = xyes; then
-     CPPFLAGS="$CPPFLAGS -m$openaxiom_host_lisp_precision"
-     LDFLAGS="$LDFLAGS -m$openaxiom_host_lisp_precision"
+     CPPFLAGS="$CPPFLAGS -m$oa_host_lisp_precision"
+     LDFLAGS="$LDFLAGS -m$oa_host_lisp_precision"
    ## else, cross fingers and pray.
    fi
 fi
@@ -282,16 +296,16 @@ 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 $axiom_lisp_flavor,$oa_gnu_compiler in
+case $oa_lisp_flavor,$oa_gnu_compiler in
    gcl,yes)
-       axiom_cflags="-O2 -Wall -D_GNU_SOURCE"
+       oa_cflags="-O2 -Wall -D_GNU_SOURCE"
        ;;
    
    gcl,*)
        AC_MSG_ERROR([We need a GNU C compiler])
        ;;
 esac
-AC_SUBST(axiom_cflags)
+AC_SUBST(oa_cflags)
 ])
 
 dnl ---------------------------------
@@ -336,8 +350,8 @@ dnl Determine how to invoke the host Lisp system in batch mode.
 dnl We also take the opportunity to determine whether we can use
 dnl dynamically loaded modules.
 AC_DEFUN([OPENAXIOM_LISP_FLAGS],[
-AC_SUBST(axiom_quiet_flags)
-AC_SUBST(axiom_eval_flags)
+AC_SUBST(oa_quiet_flags)
+AC_SUBST(oa_eval_flags)
 
 ## Can we use dynamically linked libraries?  
 ## Tentatively answer `yes' -- this is modern time.
@@ -346,28 +360,28 @@ AC_SUBST(oa_use_dynamic_lib)
 
 ## How are we supposed to tell the Lisp system to eval an expression
 ## in batch mode?  What is the extension of a compiled Lisp file?
-case $axiom_lisp_flavor in
+case $oa_lisp_flavor in
     gcl) 
-       axiom_quiet_flags='-batch'
-       axiom_eval_flags='-eval'
+       oa_quiet_flags='-batch'
+       oa_eval_flags='-eval'
        oa_use_dynamic_lib=no  
        ;;
     ecl) 
-       axiom_quiet_flags=
-       axiom_eval_flags='-norc -eval'
+       oa_quiet_flags=
+       oa_eval_flags='-norc -eval'
        oa_use_dynamic_lib=no  
        ;;
     sbcl) 
-       axiom_quiet_flags='--noinform --noprint'
-       axiom_eval_flags='--no-sysinit --no-userinit --eval'
+       oa_quiet_flags='--noinform --noprint'
+       oa_eval_flags='--no-sysinit --no-userinit --eval'
        ;;
     clisp) 
-       axiom_quiet_flags='--quiet'
-       axiom_eval_flags='-norc -x'
+       oa_quiet_flags='--quiet'
+       oa_eval_flags='-norc -x'
        ;;
     clozure)
-       axiom_quiet_flags='--quiet --no-init'
-       axiom_eval_flags='--eval'
+       oa_quiet_flags='--quiet --no-init'
+       oa_eval_flags='--eval'
        ;;
     *) AC_MSG_ERROR([We do not know how to build OpenAxiom this $AXIOM_LISP]) ;;
 esac
@@ -379,28 +393,28 @@ dnl -- OPENAXIOM_FILE_EXTENSIONS --
 dnl -------------------------------
 dnl Compute various file extensions used by the build system.
 AC_DEFUN([OPENAXIOM_FILE_EXTENSIONS],[
-AC_SUBST(axiom_fasl_type)
+AC_SUBST(oa_fasl_type)
 AC_MSG_CHECKING([compiled Lisp file extension])
 if test x"$oa_include_gcl" = xyes; then
-   axiom_fasl_type=o
+   oa_fasl_type=o
 else
    ## We set the IFS to <space> as we don't want automatic
    ## replacement of <newline> by <space>.
    openaxiom_save_IFS=$IFS
    IFS=' '
-   axiom_fasl_type=`$AXIOM_LISP $axiom_quiet_flags $axiom_eval_flags '(progn (format t "axiom_fasl_type=~a" (pathname-type (compile-file-pathname "foo.lisp"))) (quit))'`
+   oa_fasl_type=`$AXIOM_LISP $oa_quiet_flags $oa_eval_flags '(progn (format t "oa_fasl_type=~a" (pathname-type (compile-file-pathname "foo.lisp"))) (quit))'`
 
    ## Now pull out the fasl type.  ECL has the habit of spitting noise
    ## about internal loading.  Therefore, we must look only for a line that
-   ## begins with axiom_fasl_type.
-   axiom_fasl_type=`echo $axiom_fasl_type | grep '^axiom_fasl_type'`
+   ## begins with oa_fasl_type.
+   oa_fasl_type=`echo $oa_fasl_type | grep '^oa_fasl_type'`
    IFS=$openaxiom_save_IFS
-   axiom_fasl_type=`echo $axiom_fasl_type | sed -e 's/axiom_fasl_type=//'`
-   if test -z "$axiom_fasl_type"; then
+   oa_fasl_type=`echo $oa_fasl_type | sed -e 's/oa_fasl_type=//'`
+   if test -z "$oa_fasl_type"; then
        AC_MSG_ERROR([Could not determine extension for compiled Lisp files])
    fi
 fi
-AC_MSG_RESULT([$axiom_fasl_type])
+AC_MSG_RESULT([$oa_fasl_type])
 
 ## What is the extension of object and executable files on this platform?
 AC_OBJEXT
@@ -422,7 +436,7 @@ AC_SUBST(double_type)
 AC_SUBST(string_type)
 AC_SUBST(pointer_type)
 
-case $axiom_lisp_flavor in
+case $oa_lisp_flavor in
    gcl)
       void_type='void'
       char_type='char'
@@ -430,7 +444,7 @@ case $axiom_lisp_flavor in
       float_type='float'
       double_type='double'
       string_type='string'
-      case $openaxiom_host_lisp_precision,$openaxiom_gcl_version in
+      case $oa_host_lisp_precision,$openaxiom_gcl_version in
          64,*2.6.7*|64,*2.6.8*) pointer_type='(signed-integer 64)' ;;
          *) pointer_type='fixnum' ;;
       esac
@@ -484,7 +498,7 @@ dnl ---------------------------------------
 dnl -- OPENAXIOM_HOST_LISP_CPU_PRECISION --
 dnl ---------------------------------------
 dnl Determine the register precision as seen by the host Lisp system, and
-dnl set the global variable openaxiom_host_lisp_precision.
+dnl set the global variable oa_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])
@@ -494,15 +508,15 @@ if test x"$oa_include_gcl" != xyes; then
      *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
+	oa_host_lisp_precision=64
 	;;
      *)
 	# assume everything else is 32-bit
 	# FIXME: this is bold assumption.
-	openaxiom_host_lisp_precision=32
+	oa_host_lisp_precision=32
 	;;
    esac
-   AC_MSG_RESULT([$openaxiom_host_lisp_precision])
+   AC_MSG_RESULT([$oa_host_lisp_precision])
 fi
 ])
 
@@ -517,13 +531,13 @@ OPENAXIOM_STANDARD_INTEGER_TYPES
 AC_CHECK_SIZEOF([void*])
 if test x"$oa_include_gcl" = xyes; then
    ## PORTME: does GCL really care about system where CHAR_BITS is not 8?
-   openaxiom_host_lisp_precision=`expr "$ac_cv_sizeof_voidp * 8"`
+   oa_host_lisp_precision=`expr "$ac_cv_sizeof_voidp * 8"`
 fi
 
 ## Now that we have full knowledge of the host Lisp to use, tell
 ## the rest of the runtime about the host natural integer precision.
 AC_DEFINE_UNQUOTED([OPENAXIOM_HOST_LISP_PRECISION],
-                   [$openaxiom_host_lisp_precision],
+                   [$oa_host_lisp_precision],
                    [The width of the host Lisp and CPU registers.])
 ])
 
@@ -657,7 +671,7 @@ AC_ARG_ENABLE([threads], [  --enable-threads   turn on threads support],
 # GNU compilers want hints about multithreading.
 case $oa_gnu_compiler,$oa_enable_threads in
    yes,yes)
-     axiom_cflags="$axiom_cflags -pthread"
+     oa_cflags="$oa_cflags -pthread"
 esac
 AC_SUBST(oa_enable_threads)
 
@@ -690,7 +704,7 @@ AC_ARG_ENABLE([checking], [  --enable-checking  turn runtime checking on],
                   *) AC_MSG_ERROR([erroneous value for --enable-checking]) ;;
                esac])
 if test x"$oa_enable_checking" = xyes; then
-   case $axiom_lisp_flavor in
+   case $oa_lisp_flavor in
      gcl) # GCL-2.6.x does not understand debug.
         oa_optimize_options="$oa_optimize_options safety" 
         ;;
@@ -735,17 +749,17 @@ AC_DEFUN([OPENAXIOM_CHECK_SOCKETS],[
 case $host in
     *mingw*)
 	AC_CHECK_HEADERS([winsock2.h],
-	                [axiom_host_has_socket=yes],
+	                [oa_host_has_socket=yes],
 			[])
 	oa_c_runtime_extra="-lwsock32"
 	;;
     *)
         AC_CHECK_HEADERS([sys/socket.h], 
-                         [axiom_host_has_socket=yes],
+                         [oa_host_has_socket=yes],
 		         [])
 	;;
 esac
-if test x$axiom_host_has_socket != xyes; then \
+if test x$oa_host_has_socket != xyes; then \
     AC_MSG_ERROR([OpenAxiom needs suport for sockets.])
 fi
 ## solaris-based systems tend to hide the socket library.
@@ -943,16 +957,16 @@ X_PRE_LIBS="-lXpm $X_PRE_LIBS"
 AC_SUBST(X_PRE_LIBS)
 
 ## If the system supports X11, then build graphics
-axiom_use_x=no
+oa_use_x=no
 if test x"$no_x" = xyes; then
     AC_MSG_NOTICE([The Graphics component is disabled.])
 else
     AC_CHECK_HEADERS([X11/xpm.h],[],
       [AC_MSG_ERROR([The header <X11/xpm.h> could not be found.  Install Xpm development package and re-start the configuration process.])])
-    axiom_use_x=yes
+    oa_use_x=yes
     oa_c_runtime="$oa_c_runtime graphics"
 fi
-AC_SUBST(axiom_use_x)
+AC_SUBST(oa_use_x)
 ])
 
 dnl ------------------------
@@ -993,11 +1007,11 @@ dnl See \File{src/hyper/Makefile} for more details.  Note that is we don't
 dnl build the HyperDoc component, the compilation of algebra files are
 dnl drawn in [[Unexpected HT command]] noise.
 AC_DEFUN([OPENAXIOM_CHECK_BROWSER_SUPPORT],[
-openaxiom_host_has_regex=
+oa_host_has_regex=
 AC_CHECK_HEADER([regex.h], 
-		[openaxiom_host_has_regex=yes],
-		[openaxiom_host_has_regex=no])
-AC_SUBST(openaxiom_host_has_regex)
+		[oa_host_has_regex=yes],
+		[oa_host_has_regex=no])
+AC_SUBST(oa_host_has_regex)
 ])
 
 dnl ------------------------------
diff --git a/config/var-def.mk b/config/var-def.mk
index be1ef880..e4b90354 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -139,8 +139,8 @@ STAMP = echo timestamp >
 ## -- OpenAxiom variables --
 ## -------------------------
 
-quiet_flags = @axiom_quiet_flags@
-eval_flags = @axiom_eval_flags@
+quiet_flags = @oa_quiet_flags@
+eval_flags = @oa_eval_flags@
 oa_standard_linking = @oa_standard_linking@
 
 
@@ -159,8 +159,8 @@ oa_src_algdir = $(oa_src_srcdir)/algebra
 oa_src_texdir =  $(oa_src_datadir)/tex
 
 ## Where tools for the build machine are built
-axiom_top_builddir = $(top_builddir)/build
-oa_builddir = $(axiom_top_builddir)/$(build)
+oa_top_builddir = $(top_builddir)/build
+oa_builddir = $(oa_top_builddir)/$(build)
 oa_build_bindir = $(oa_builddir)/bin
 oa_build_libdir = $(oa_builddir)/lib
 oa_build_mandir = $(oa_builddir)/man
@@ -200,7 +200,7 @@ oa_enable_lisp_profiling = \
 
 oa_enable_threads = @oa_enable_threads@
 
-axiom_use_x = @axiom_use_x@
+oa_use_x = @oa_use_x@
 AXIOM_X11_CFLAGS = @X_CFLAGS@ 
 AXIOM_X11_LDFLAGS = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
 
@@ -219,12 +219,12 @@ oa_hammer = $(top_builddir)/src/utils/hammer$(EXEEXT)
 
 AXIOM_LISP = @AXIOM_LISP@
 # Extension of the output file name returned by compile-file
-FASLEXT = @axiom_fasl_type@
+FASLEXT = @oa_fasl_type@
 
 # Extension of compiled FASLs appropriate for linking into executable
 # programs.  For most Lisp systems, it is the same as FASLEXT because
 # they build programs by dumping images.
-ifeq (@axiom_lisp_flavor@,ecl)
+ifeq (@oa_lisp_flavor@,ecl)
 LNKEXT = $(OBJEXT)
 else
 LNKEXT = $(FASLEXT)
diff --git a/configure b/configure
index f7398aa6..3c1f1544 100755
--- a/configure
+++ b/configure
@@ -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-02-02.
+# Generated by GNU Autoconf 2.69 for OpenAxiom 1.5.0-2014-02-10.
 #
 # 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-02-02'
-PACKAGE_STRING='OpenAxiom 1.5.0-2014-02-02'
+PACKAGE_VERSION='1.5.0-2014-02-10'
+PACKAGE_STRING='OpenAxiom 1.5.0-2014-02-10'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 PACKAGE_URL=''
 
@@ -648,10 +648,10 @@ OA_BUILD_GUI_FALSE
 OA_BUILD_GUI_TRUE
 OA_BUILD_GRAPHICS_FALSE
 OA_BUILD_GRAPHICS_TRUE
-openaxiom_host_has_regex
+oa_host_has_regex
 OA_QT_QMAKE
 OA_QT_MOC
-axiom_use_x
+oa_use_x
 X_CLFAGS
 X_EXTRA_LIBS
 X_LIBS
@@ -671,10 +671,10 @@ oa_enable_checking
 oa_enable_profiling
 oa_keep_files
 oa_enable_threads
-axiom_fasl_type
+oa_fasl_type
 oa_use_dynamic_lib
-axiom_eval_flags
-axiom_quiet_flags
+oa_eval_flags
+oa_quiet_flags
 MAKE
 MKTEMP
 TOUCH
@@ -712,7 +712,7 @@ OA_BUILD_GCL_FALSE
 OA_BUILD_GCL_TRUE
 CXXCPP
 CPP
-axiom_cflags
+oa_cflags
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
@@ -742,7 +742,7 @@ OA_STANDARD_LINKING_TRUE
 OA_ECL_RT_FALSE
 OA_ECL_RT_TRUE
 oa_standard_linking
-axiom_lisp_flavor
+oa_lisp_flavor
 AXIOM_LISP
 OA_WINDOWS_POWERSHELL
 open_axiom_installdir
@@ -1398,7 +1398,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-02-02 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.5.0-2014-02-10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1473,7 +1473,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2014-02-02:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2014-02-10:";;
    esac
   cat <<\_ACEOF
 
@@ -1590,7 +1590,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.5.0-2014-02-02
+OpenAxiom configure 1.5.0-2014-02-10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2591,7 +2591,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-02-02, which was
+It was created by OpenAxiom $as_me 1.5.0-2014-02-10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3086,6 +3086,12 @@ test -n "$target_alias" &&
   program_prefix=${target_alias}-
 
 
+oa_targetdir=$top_builddir/$target
+oa_target_bindir=$oa_targetdir/bin
+oa_target_libdir=$oa_targetdir/lib
+oa_target_includedir=$oa_targetdir/include
+
+
 am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
@@ -3572,7 +3578,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openaxiom'
- VERSION='1.5.0-2014-02-02'
+ VERSION='1.5.0-2014-02-10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3933,7 +3939,7 @@ case $oa_include_gcl,$AXIOM_LISP in
 esac
 
 
-axiom_lisp_flavor=unknown
+oa_lisp_flavor=unknown
 
 
 ## Most Lisp systems don't use conventional methods for building programs.
@@ -3945,18 +3951,18 @@ oa_standard_linking=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which flavor of Lisp" >&5
 $as_echo_n "checking which flavor of Lisp... " >&6; }
 if test x"$oa_include_gcl" = xyes; then
-   axiom_lisp_flavor=gcl
+   oa_lisp_flavor=gcl
 else
    case `echo '(lisp-implementation-type)' | $AXIOM_LISP` in
        *GCL*)
-	   axiom_lisp_flavor=gcl
+	   oa_lisp_flavor=gcl
 	   ;;
        *"ECL"*)
-	   axiom_lisp_flavor=ecl
+	   oa_lisp_flavor=ecl
 	   oa_standard_linking=yes
 	   ;;
        *"SBCL"*)
-	   axiom_lisp_flavor=sbcl
+	   oa_lisp_flavor=sbcl
 	   ;;
        *"CLISP"*)
 	   ## Not all variants of CLisp have FFI support.  FFI is used
@@ -3965,19 +3971,19 @@ else
 	   then
 	     as_fn_error $? "$AXIOM_LISP does not support Foreign Function Interface.  Please upgrade to a better version of CLisp or install SBCL." "$LINENO" 5
 	   fi
-	   axiom_lisp_flavor=clisp
+	   oa_lisp_flavor=clisp
 	   ;;
        *"Armed Bear Common Lisp"*)
-	   axiom_lisp_flavor=abcl
+	   oa_lisp_flavor=abcl
 	   ;;
        *"Clozure Common Lisp"*)
-	   axiom_lisp_flavor=clozure
+	   oa_lisp_flavor=clozure
 	   ;;
    esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $axiom_lisp_flavor" >&5
-$as_echo "$axiom_lisp_flavor" >&6; }
- if test $axiom_lisp_flavor = ecl; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $oa_lisp_flavor" >&5
+$as_echo "$oa_lisp_flavor" >&6; }
+ if test $oa_lisp_flavor = ecl; then
   OA_ECL_RT_TRUE=
   OA_ECL_RT_FALSE='#'
 else
@@ -3996,7 +4002,7 @@ fi
 
 
 cat >>confdefs.h <<_ACEOF
-#define OPENAXIOM_BASE_RTS Runtime::${axiom_lisp_flavor}
+#define OPENAXIOM_BASE_RTS Runtime::${oa_lisp_flavor}
 _ACEOF
 
 
@@ -4006,14 +4012,14 @@ if test x"$oa_include_gcl" != xyes; then
       *gcl*)
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $AXIOM_LISP version" >&5
 $as_echo_n "checking $AXIOM_LISP version... " >&6; }
-	 openaxiom_lisp_version=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"`
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $openaxiom_lisp_version" >&5
-$as_echo "$openaxiom_lisp_version" >&6; }
-	 case $openaxiom_lisp_version in
+	 oa_lisp_version=`$AXIOM_LISP -batch -eval "(format t \"~S\" (lisp-implementation-version))"`
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $oa_lisp_version" >&5
+$as_echo "$oa_lisp_version" >&6; }
+	 case $oa_lisp_version in
 	   *2.6.7*|*2.6.8*|*2.6.9*|*2.6.10*) ;;         # OK
 	   *)
-	     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $openaxiom_lisp_version is not supported by this version of OpenAxiom." >&5
-$as_echo "$as_me: WARNING: $openaxiom_lisp_version is not supported by this version of OpenAxiom." >&2;}
+	     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $oa_lisp_version is not supported by this version of OpenAxiom." >&5
+$as_echo "$as_me: WARNING: $oa_lisp_version is not supported by this version of OpenAxiom." >&2;}
 	     ;;
 	 esac
 	 ;;
@@ -4021,10 +4027,10 @@ $as_echo "$as_me: WARNING: $openaxiom_lisp_version is not supported by this vers
       *sbcl*)
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $AXIOM_LISP version" >&5
 $as_echo_n "checking $AXIOM_LISP version... " >&6; }
-	 openaxiom_lisp_version=`$AXIOM_LISP --version`
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $openaxiom_lisp_version" >&5
-$as_echo "$openaxiom_lisp_version" >&6; }
-	 case $openaxiom_lisp_version in
+	 oa_lisp_version=`$AXIOM_LISP --version`
+	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $oa_lisp_version" >&5
+$as_echo "$oa_lisp_version" >&6; }
+	 case $oa_lisp_version in
 	   *1.0.29)
 	      as_fn_error $? "This version of SBCL has a bug that breaks OpenAxiom build.  Consider SBCL-1.0.30 or higher." "$LINENO" 5
 	      ;;
@@ -4043,20 +4049,20 @@ $as_echo_n "checking CPU precision as seen by $AXIOM_LISP... " >&6; }
      *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
+	oa_host_lisp_precision=64
 	;;
      *)
 	# assume everything else is 32-bit
 	# FIXME: this is bold assumption.
-	openaxiom_host_lisp_precision=32
+	oa_host_lisp_precision=32
 	;;
    esac
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $openaxiom_host_lisp_precision" >&5
-$as_echo "$openaxiom_host_lisp_precision" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $oa_host_lisp_precision" >&5
+$as_echo "$oa_host_lisp_precision" >&6; }
 fi
 
 
-case ${axiom_lisp_flavor},$host in
+case ${oa_lisp_flavor},$host in
   sbcl,* | clozure,* | clisp,*)
      oa_delay_ffi=yes
      ;;
@@ -5434,19 +5440,19 @@ if test x$GCC = xyes || test x$GXX = xyes; then
 fi
 ## Augment C and C++ compiler flags with ABI directives as appropriate
 ## before we proceed to infer other host datatype properties.
-if test -n "$openaxiom_host_lisp_precision"; then
+if test -n "$oa_host_lisp_precision"; then
    if test x$oa_gnu_compiler = xyes; then
-     CPPFLAGS="$CPPFLAGS -m$openaxiom_host_lisp_precision"
-     LDFLAGS="$LDFLAGS -m$openaxiom_host_lisp_precision"
+     CPPFLAGS="$CPPFLAGS -m$oa_host_lisp_precision"
+     LDFLAGS="$LDFLAGS -m$oa_host_lisp_precision"
    ## else, cross fingers and pray.
    fi
 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 $axiom_lisp_flavor,$oa_gnu_compiler in
+case $oa_lisp_flavor,$oa_gnu_compiler in
    gcl,yes)
-       axiom_cflags="-O2 -Wall -D_GNU_SOURCE"
+       oa_cflags="-O2 -Wall -D_GNU_SOURCE"
        ;;
 
    gcl,*)
@@ -6795,14 +6801,14 @@ _ACEOF
 
 if test x"$oa_include_gcl" = xyes; then
    ## PORTME: does GCL really care about system where CHAR_BITS is not 8?
-   openaxiom_host_lisp_precision=`expr "$ac_cv_sizeof_voidp * 8"`
+   oa_host_lisp_precision=`expr "$ac_cv_sizeof_voidp * 8"`
 fi
 
 ## Now that we have full knowledge of the host Lisp to use, tell
 ## the rest of the runtime about the host natural integer precision.
 
 cat >>confdefs.h <<_ACEOF
-#define OPENAXIOM_HOST_LISP_PRECISION $openaxiom_host_lisp_precision
+#define OPENAXIOM_HOST_LISP_PRECISION $oa_host_lisp_precision
 _ACEOF
 
 
@@ -17702,28 +17708,28 @@ oa_use_dynamic_lib=yes
 
 ## How are we supposed to tell the Lisp system to eval an expression
 ## in batch mode?  What is the extension of a compiled Lisp file?
-case $axiom_lisp_flavor in
+case $oa_lisp_flavor in
     gcl)
-       axiom_quiet_flags='-batch'
-       axiom_eval_flags='-eval'
+       oa_quiet_flags='-batch'
+       oa_eval_flags='-eval'
        oa_use_dynamic_lib=no
        ;;
     ecl)
-       axiom_quiet_flags=
-       axiom_eval_flags='-norc -eval'
+       oa_quiet_flags=
+       oa_eval_flags='-norc -eval'
        oa_use_dynamic_lib=no
        ;;
     sbcl)
-       axiom_quiet_flags='--noinform --noprint'
-       axiom_eval_flags='--no-sysinit --no-userinit --eval'
+       oa_quiet_flags='--noinform --noprint'
+       oa_eval_flags='--no-sysinit --no-userinit --eval'
        ;;
     clisp)
-       axiom_quiet_flags='--quiet'
-       axiom_eval_flags='-norc -x'
+       oa_quiet_flags='--quiet'
+       oa_eval_flags='-norc -x'
        ;;
     clozure)
-       axiom_quiet_flags='--quiet --no-init'
-       axiom_eval_flags='--eval'
+       oa_quiet_flags='--quiet --no-init'
+       oa_eval_flags='--eval'
        ;;
     *) as_fn_error $? "We do not know how to build OpenAxiom this $AXIOM_LISP" "$LINENO" 5 ;;
 esac
@@ -17733,26 +17739,26 @@ esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiled Lisp file extension" >&5
 $as_echo_n "checking compiled Lisp file extension... " >&6; }
 if test x"$oa_include_gcl" = xyes; then
-   axiom_fasl_type=o
+   oa_fasl_type=o
 else
    ## We set the IFS to <space> as we don't want automatic
    ## replacement of <newline> by <space>.
    openaxiom_save_IFS=$IFS
    IFS=' '
-   axiom_fasl_type=`$AXIOM_LISP $axiom_quiet_flags $axiom_eval_flags '(progn (format t "axiom_fasl_type=~a" (pathname-type (compile-file-pathname "foo.lisp"))) (quit))'`
+   oa_fasl_type=`$AXIOM_LISP $oa_quiet_flags $oa_eval_flags '(progn (format t "oa_fasl_type=~a" (pathname-type (compile-file-pathname "foo.lisp"))) (quit))'`
 
    ## Now pull out the fasl type.  ECL has the habit of spitting noise
    ## about internal loading.  Therefore, we must look only for a line that
-   ## begins with axiom_fasl_type.
-   axiom_fasl_type=`echo $axiom_fasl_type | grep '^axiom_fasl_type'`
+   ## begins with oa_fasl_type.
+   oa_fasl_type=`echo $oa_fasl_type | grep '^oa_fasl_type'`
    IFS=$openaxiom_save_IFS
-   axiom_fasl_type=`echo $axiom_fasl_type | sed -e 's/axiom_fasl_type=//'`
-   if test -z "$axiom_fasl_type"; then
+   oa_fasl_type=`echo $oa_fasl_type | sed -e 's/oa_fasl_type=//'`
+   if test -z "$oa_fasl_type"; then
        as_fn_error $? "Could not determine extension for compiled Lisp files" "$LINENO" 5
    fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $axiom_fasl_type" >&5
-$as_echo "$axiom_fasl_type" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $oa_fasl_type" >&5
+$as_echo "$oa_fasl_type" >&6; }
 
 ## What is the extension of object and executable files on this platform?
 
@@ -17777,7 +17783,7 @@ fi
 # GNU compilers want hints about multithreading.
 case $oa_gnu_compiler,$oa_enable_threads in
    yes,yes)
-     axiom_cflags="$axiom_cflags -pthread"
+     oa_cflags="$oa_cflags -pthread"
 esac
 
 
@@ -17818,7 +17824,7 @@ if test "${enable_checking+set}" = set; then :
 fi
 
 if test x"$oa_enable_checking" = xyes; then
-   case $axiom_lisp_flavor in
+   case $oa_lisp_flavor in
      gcl) # GCL-2.6.x does not understand debug.
         oa_optimize_options="$oa_optimize_options safety"
         ;;
@@ -18172,7 +18178,7 @@ if test "x$ac_cv_header_winsock2_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_WINSOCK2_H 1
 _ACEOF
- axiom_host_has_socket=yes
+ oa_host_has_socket=yes
 fi
 
 done
@@ -18187,14 +18193,14 @@ if test "x$ac_cv_header_sys_socket_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_SOCKET_H 1
 _ACEOF
- axiom_host_has_socket=yes
+ oa_host_has_socket=yes
 fi
 
 done
 
 	;;
 esac
-if test x$axiom_host_has_socket != xyes; then \
+if test x$oa_host_has_socket != xyes; then \
     as_fn_error $? "OpenAxiom needs suport for sockets." "$LINENO" 5
 fi
 ## solaris-based systems tend to hide the socket library.
@@ -19620,7 +19626,7 @@ X_PRE_LIBS="-lXpm $X_PRE_LIBS"
 
 
 ## If the system supports X11, then build graphics
-axiom_use_x=no
+oa_use_x=no
 if test x"$no_x" = xyes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: The Graphics component is disabled." >&5
 $as_echo "$as_me: The Graphics component is disabled." >&6;}
@@ -19639,7 +19645,7 @@ fi
 
 done
 
-    axiom_use_x=yes
+    oa_use_x=yes
     oa_c_runtime="$oa_c_runtime graphics"
 fi
 
@@ -19754,19 +19760,19 @@ _ACEOF
 
 
 
-openaxiom_host_has_regex=
+oa_host_has_regex=
 ac_fn_cxx_check_header_mongrel "$LINENO" "regex.h" "ac_cv_header_regex_h" "$ac_includes_default"
 if test "x$ac_cv_header_regex_h" = xyes; then :
-  openaxiom_host_has_regex=yes
+  oa_host_has_regex=yes
 else
-  openaxiom_host_has_regex=no
+  oa_host_has_regex=no
 fi
 
 
 
 
 
- if test x$axiom_use_x = xyes; then
+ if test x$oa_use_x = xyes; then
   OA_BUILD_GRAPHICS_TRUE=
   OA_BUILD_GRAPHICS_FALSE='#'
 else
@@ -19792,7 +19798,7 @@ fi
 
 
 
-case $axiom_lisp_flavor in
+case $oa_lisp_flavor in
    gcl)
       void_type='void'
       char_type='char'
@@ -19800,7 +19806,7 @@ case $axiom_lisp_flavor in
       float_type='float'
       double_type='double'
       string_type='string'
-      case $openaxiom_host_lisp_precision,$openaxiom_gcl_version in
+      case $oa_host_lisp_precision,$openaxiom_gcl_version in
          64,*2.6.7*|64,*2.6.8*) pointer_type='(signed-integer 64)' ;;
          *) pointer_type='fixnum' ;;
       esac
@@ -20662,7 +20668,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-02-02, which was
+This file was extended by OpenAxiom $as_me 1.5.0-2014-02-10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20728,7 +20734,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-02-02
+OpenAxiom config.status 1.5.0-2014-02-10
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index a14fac42..9b3ccd90 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-02-02], 
+AC_INIT([OpenAxiom], [1.5.0-2014-02-10], 
         [open-axiom-bugs@lists.sf.net])
 
 dnl Most of the macros used in this configure.ac are defined in files
@@ -44,7 +44,7 @@ AC_CONFIG_MACRO_DIR([config])
 dnl Put all configuration macros here
 AC_CONFIG_HEADERS([config/openaxiom-c-macros.h])
 
-AC_CANONICAL_SYSTEM
+OPENAXIOM_CANONICAL_SYSTEM
 
 dnl Page Automake
 AM_INIT_AUTOMAKE([foreign])
@@ -101,7 +101,7 @@ OPENAXIOM_CHECK_CORE_SUPPORT
 OPENAXIOM_CHECK_IO
 AM_CONDITIONAL([OA_BUILD_SMAN], [test $oa_use_sman = 1])
 OPENAXIOM_CHECK_GRAPHICS
-AM_CONDITIONAL([OA_BUILD_GRAPHICS], [test x$axiom_use_x = xyes])
+AM_CONDITIONAL([OA_BUILD_GRAPHICS], [test x$oa_use_x = xyes])
 AM_CONDITIONAL([OA_BUILD_GUI], [test x$oa_has_qt = xyes])
 
 OPENAXIOM_FFI_TYPE_TABLE
diff --git a/src/Makefile.in b/src/Makefile.in
index 7890895f..aef3e9df 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -305,12 +305,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-axiom_cflags = @axiom_cflags@
-axiom_eval_flags = @axiom_eval_flags@
-axiom_fasl_type = @axiom_fasl_type@
-axiom_lisp_flavor = @axiom_lisp_flavor@
-axiom_quiet_flags = @axiom_quiet_flags@
-axiom_use_x = @axiom_use_x@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -345,21 +339,27 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oa_c_runtime = @oa_c_runtime@
 oa_c_runtime_extra = @oa_c_runtime_extra@
+oa_cflags = @oa_cflags@
 oa_delay_ffi = @oa_delay_ffi@
 oa_editor = @oa_editor@
 oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
+oa_eval_flags = @oa_eval_flags@
+oa_fasl_type = @oa_fasl_type@
+oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
+oa_lisp_flavor = @oa_lisp_flavor@
 oa_optimize_options = @oa_optimize_options@
+oa_quiet_flags = @oa_quiet_flags@
 oa_shrlib_flags = @oa_shrlib_flags@
 oa_shrobj_flags = @oa_shrobj_flags@
 oa_standard_linking = @oa_standard_linking@
 oa_use_dynamic_lib = @oa_use_dynamic_lib@
 oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@
+oa_use_x = @oa_use_x@
 oldincludedir = @oldincludedir@
 open_axiom_installdir = @open_axiom_installdir@
-openaxiom_host_has_regex = @openaxiom_host_has_regex@
 pdfdir = @pdfdir@
 pointer_type = @pointer_type@
 prefix = @prefix@
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am
index d994e5c6..7cbdb34b 100644
--- a/src/algebra/Makefile.am
+++ b/src/algebra/Makefile.am
@@ -97,7 +97,7 @@ INPUT=../input
 STAMP = echo timestamp >
 
 # Extension of the output file name returned by compile-file
-FASLEXT = @axiom_fasl_type@
+FASLEXT = @oa_fasl_type@
 
 oa_hammer = $(top_builddir)/src/utils/hammer$(EXEEXT)
 
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index ea649ae8..5cff1dbd 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -490,12 +490,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-axiom_cflags = @axiom_cflags@
-axiom_eval_flags = @axiom_eval_flags@
-axiom_fasl_type = @axiom_fasl_type@
-axiom_lisp_flavor = @axiom_lisp_flavor@
-axiom_quiet_flags = @axiom_quiet_flags@
-axiom_use_x = @axiom_use_x@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -530,21 +524,27 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oa_c_runtime = @oa_c_runtime@
 oa_c_runtime_extra = @oa_c_runtime_extra@
+oa_cflags = @oa_cflags@
 oa_delay_ffi = @oa_delay_ffi@
 oa_editor = @oa_editor@
 oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
+oa_eval_flags = @oa_eval_flags@
+oa_fasl_type = @oa_fasl_type@
+oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
+oa_lisp_flavor = @oa_lisp_flavor@
 oa_optimize_options = @oa_optimize_options@
+oa_quiet_flags = @oa_quiet_flags@
 oa_shrlib_flags = @oa_shrlib_flags@
 oa_shrobj_flags = @oa_shrobj_flags@
 oa_standard_linking = @oa_standard_linking@
 oa_use_dynamic_lib = @oa_use_dynamic_lib@
 oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@
+oa_use_x = @oa_use_x@
 oldincludedir = @oldincludedir@
 open_axiom_installdir = @open_axiom_installdir@
-openaxiom_host_has_regex = @openaxiom_host_has_regex@
 pdfdir = @pdfdir@
 pointer_type = @pointer_type@
 prefix = @prefix@
@@ -586,7 +586,7 @@ INPUT = ../input
 STAMP = echo timestamp >
 
 # Extension of the output file name returned by compile-file
-FASLEXT = @axiom_fasl_type@
+FASLEXT = @oa_fasl_type@
 oa_hammer = $(top_builddir)/src/utils/hammer$(EXEEXT)
 
 # Name of the driver to launch the compiler
diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in
index 8900e7ff..b1634221 100644
--- a/src/boot/Makefile.in
+++ b/src/boot/Makefile.in
@@ -58,7 +58,7 @@ boot_clisp = $(boot_SOURCES:.boot=.clisp)
 boot_objects = $(boot_SOURCES:.boot=.$(LNKEXT))
 
 oa_target_bootdir = $(oa_targetdir)/boot
-ifeq (@axiom_lisp_flavor@,ecl)
+ifeq (@oa_lisp_flavor@,ecl)
 oa_boot_linkset = $(oa_target_bootdir)/linkset
 else
 oa_boot_linkset = 
diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in
index c53ed2f0..ea9d1971 100644
--- a/src/hyper/Makefile.in
+++ b/src/hyper/Makefile.in
@@ -29,13 +29,13 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-openaxiom_host_has_regex = @openaxiom_host_has_regex@
+oa_host_has_regex = @oa_host_has_regex@
 
 bin_PROGRAMS = htadd$(EXEEXT) ex2ht$(EXEEXT)
-ifeq ($(strip $(openaxiom_host_has_regex)),yes)
+ifeq ($(strip $(oa_host_has_regex)),yes)
 bin_PROGRAMS += hthits$(EXEEXT) htsearch$(EXEEXT)
 endif
-ifeq ($(strip $(axiom_use_x)),yes)
+ifeq ($(strip $(oa_use_x)),yes)
 bin_PROGRAMS += hypertex$(EXEEXT) spadbuf$(EXEEXT)
 endif
 
diff --git a/src/io/Makefile.in b/src/io/Makefile.in
index 2d530552..86e59519 100644
--- a/src/io/Makefile.in
+++ b/src/io/Makefile.in
@@ -302,12 +302,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-axiom_cflags = @axiom_cflags@
-axiom_eval_flags = @axiom_eval_flags@
-axiom_fasl_type = @axiom_fasl_type@
-axiom_lisp_flavor = @axiom_lisp_flavor@
-axiom_quiet_flags = @axiom_quiet_flags@
-axiom_use_x = @axiom_use_x@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -342,21 +336,27 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oa_c_runtime = @oa_c_runtime@
 oa_c_runtime_extra = @oa_c_runtime_extra@
+oa_cflags = @oa_cflags@
 oa_delay_ffi = @oa_delay_ffi@
 oa_editor = @oa_editor@
 oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
+oa_eval_flags = @oa_eval_flags@
+oa_fasl_type = @oa_fasl_type@
+oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
+oa_lisp_flavor = @oa_lisp_flavor@
 oa_optimize_options = @oa_optimize_options@
+oa_quiet_flags = @oa_quiet_flags@
 oa_shrlib_flags = @oa_shrlib_flags@
 oa_shrobj_flags = @oa_shrobj_flags@
 oa_standard_linking = @oa_standard_linking@
 oa_use_dynamic_lib = @oa_use_dynamic_lib@
 oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@
+oa_use_x = @oa_use_x@
 oldincludedir = @oldincludedir@
 open_axiom_installdir = @open_axiom_installdir@
-openaxiom_host_has_regex = @openaxiom_host_has_regex@
 pdfdir = @pdfdir@
 pointer_type = @pointer_type@
 prefix = @prefix@
diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in
index 7c23016c..1cba7ca2 100644
--- a/src/lisp/Makefile.in
+++ b/src/lisp/Makefile.in
@@ -57,7 +57,7 @@ fasl_ext = $(if $(findstring mingw, $(target)),.lisp,.$(FASLEXT))
 FASLS = $(patsubst %,"%", $(addsuffix $(fasl_ext),core))
 
 
-ifeq (@axiom_lisp_flavor@,ecl)
+ifeq (@oa_lisp_flavor@,ecl)
 base_lisp_objects = ("core.$(LNKEXT)")
 oa_base_lisp_linkset = $(oa_target_lispdir)/linkset
 else
@@ -95,7 +95,7 @@ lisp_c_objects = \
 ## therefore forcing us to use brittle tricks to guess what the linker is.
 
 $(OUT)/lisp$(EXEEXT): base-lisp$(EXEEXT)
-ifeq (@axiom_lisp_flavor@,gcl)
+ifeq (@oa_lisp_flavor@,gcl)
 	echo '(let* ((sys-cc compiler::*cc*) ' \
 	     '       (sys-ld compiler::*ld*) ' \
 	     '      (compiler::*cc* (concatenate (quote string) ' \
@@ -176,7 +176,7 @@ core.lisp: $(srcdir)/core.lisp.in
 	$(top_srcdir)/config/move-if-change $@.tmp $@
 
 core.$(FASLEXT): core.lisp
-ifeq (@axiom_lisp_flavor@,ecl)
+ifeq (@oa_lisp_flavor@,ecl)
 	$(AXIOM_LISP) $(quiet_flags) \
 		$(eval_flags) '(require (quote cmp))' \
 		$(eval_flags) '(compile-file "$<" :system-p t)' \
diff --git a/src/rt/Makefile.in b/src/rt/Makefile.in
index 3444a079..30730d5e 100644
--- a/src/rt/Makefile.in
+++ b/src/rt/Makefile.in
@@ -302,12 +302,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-axiom_cflags = @axiom_cflags@
-axiom_eval_flags = @axiom_eval_flags@
-axiom_fasl_type = @axiom_fasl_type@
-axiom_lisp_flavor = @axiom_lisp_flavor@
-axiom_quiet_flags = @axiom_quiet_flags@
-axiom_use_x = @axiom_use_x@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -342,21 +336,27 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oa_c_runtime = @oa_c_runtime@
 oa_c_runtime_extra = @oa_c_runtime_extra@
+oa_cflags = @oa_cflags@
 oa_delay_ffi = @oa_delay_ffi@
 oa_editor = @oa_editor@
 oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
+oa_eval_flags = @oa_eval_flags@
+oa_fasl_type = @oa_fasl_type@
+oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
+oa_lisp_flavor = @oa_lisp_flavor@
 oa_optimize_options = @oa_optimize_options@
+oa_quiet_flags = @oa_quiet_flags@
 oa_shrlib_flags = @oa_shrlib_flags@
 oa_shrobj_flags = @oa_shrobj_flags@
 oa_standard_linking = @oa_standard_linking@
 oa_use_dynamic_lib = @oa_use_dynamic_lib@
 oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@
+oa_use_x = @oa_use_x@
 oldincludedir = @oldincludedir@
 open_axiom_installdir = @open_axiom_installdir@
-openaxiom_host_has_regex = @openaxiom_host_has_regex@
 pdfdir = @pdfdir@
 pointer_type = @pointer_type@
 prefix = @prefix@
diff --git a/src/syntax/Makefile.in b/src/syntax/Makefile.in
index 4476a92d..601fefed 100644
--- a/src/syntax/Makefile.in
+++ b/src/syntax/Makefile.in
@@ -302,12 +302,6 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
-axiom_cflags = @axiom_cflags@
-axiom_eval_flags = @axiom_eval_flags@
-axiom_fasl_type = @axiom_fasl_type@
-axiom_lisp_flavor = @axiom_lisp_flavor@
-axiom_quiet_flags = @axiom_quiet_flags@
-axiom_use_x = @axiom_use_x@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -342,21 +336,27 @@ mandir = @mandir@
 mkdir_p = @mkdir_p@
 oa_c_runtime = @oa_c_runtime@
 oa_c_runtime_extra = @oa_c_runtime_extra@
+oa_cflags = @oa_cflags@
 oa_delay_ffi = @oa_delay_ffi@
 oa_editor = @oa_editor@
 oa_enable_checking = @oa_enable_checking@
 oa_enable_profiling = @oa_enable_profiling@
 oa_enable_threads = @oa_enable_threads@
+oa_eval_flags = @oa_eval_flags@
+oa_fasl_type = @oa_fasl_type@
+oa_host_has_regex = @oa_host_has_regex@
 oa_keep_files = @oa_keep_files@
+oa_lisp_flavor = @oa_lisp_flavor@
 oa_optimize_options = @oa_optimize_options@
+oa_quiet_flags = @oa_quiet_flags@
 oa_shrlib_flags = @oa_shrlib_flags@
 oa_shrobj_flags = @oa_shrobj_flags@
 oa_standard_linking = @oa_standard_linking@
 oa_use_dynamic_lib = @oa_use_dynamic_lib@
 oa_use_libtool_for_shared_lib = @oa_use_libtool_for_shared_lib@
+oa_use_x = @oa_use_x@
 oldincludedir = @oldincludedir@
 open_axiom_installdir = @open_axiom_installdir@
-openaxiom_host_has_regex = @openaxiom_host_has_regex@
 pdfdir = @pdfdir@
 pointer_type = @pointer_type@
 prefix = @prefix@