Clean up global variable names.

1 files changed, 89 insertions, 83 deletions

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\\"