FASLEXT is now AC_SUBST

11 files changed, 50 insertions, 38 deletions

diff --git a/Makefile.in b/Makefile.in
index 0f4a0b0e..32037532 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -304,6 +304,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FASLEXT = @FASLEXT@
 FGREP = @FGREP@
 
 # Configure options to GCL.
@@ -418,7 +419,6 @@ 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@
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 05439e1b..79b7f00d 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -211,6 +211,7 @@ else
 fi
 AC_MSG_RESULT([$oa_lisp_flavor])
 AM_CONDITIONAL([OA_ECL_RT],[test $oa_lisp_flavor = ecl])
+AM_CONDITIONAL([OA_GCL_RT],[test $oa_lisp_flavor = gcl])
 AM_CONDITIONAL([OA_STANDARD_LINKING],[test $oa_standard_linking = yes])
 
 AC_DEFINE_UNQUOTED([OPENAXIOM_BASE_RTS],
@@ -407,7 +408,12 @@ dnl -- OPENAXIOM_FILE_EXTENSIONS --
 dnl -------------------------------
 dnl Compute various file extensions used by the build system.
 AC_DEFUN([OPENAXIOM_FILE_EXTENSIONS],[
-AC_SUBST(oa_fasl_type)
+# What is the extension of object and executable files on this platform?
+AC_OBJEXT
+AC_DEFINE_UNQUOTED([OPENAXIOM_EXEEXT], ["$ac_cv_exeext"], 
+                   [Extension of executable file.])
+
+oa_fasl_type=
 AC_MSG_CHECKING([compiled Lisp file extension])
 if test x"$oa_include_gcl" = xyes; then
    oa_fasl_type=o
@@ -429,11 +435,7 @@ else
    fi
 fi
 AC_MSG_RESULT([$oa_fasl_type])
-
-## What is the extension of object and executable files on this platform?
-AC_OBJEXT
-AC_DEFINE_UNQUOTED([OPENAXIOM_EXEEXT], ["$ac_cv_exeext"], 
-                   [Extension of executable file.])
+AC_SUBST(FASLEXT,$oa_fasl_type)
 ])
 
 dnl ------------------------------
diff --git a/config/var-def.mk b/config/var-def.mk
index 2b91a330..09a90a06 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -209,7 +209,7 @@ oa_hammer = $(top_builddir)/src/utils/hammer$(EXEEXT)
 
 OA_LISP = @OA_LISP@
 # Extension of the output file name returned by compile-file
-FASLEXT = @oa_fasl_type@
+FASLEXT = @FASLEXT@
 
 # Extension of compiled FASLs appropriate for linking into executable
 # programs.  For most Lisp systems, it is the same as FASLEXT because
diff --git a/configure b/configure
index 413651ac..9c8c461d 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-10.
+# Generated by GNU Autoconf 2.69 for OpenAxiom 1.5.0-2014-02-22.
 #
 # 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-10'
-PACKAGE_STRING='OpenAxiom 1.5.0-2014-02-10'
+PACKAGE_VERSION='1.5.0-2014-02-22'
+PACKAGE_STRING='OpenAxiom 1.5.0-2014-02-22'
 PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net'
 PACKAGE_URL=''
 
@@ -671,7 +671,7 @@ oa_enable_checking
 oa_enable_profiling
 oa_keep_files
 oa_enable_threads
-oa_fasl_type
+FASLEXT
 oa_use_dynamic_lib
 oa_eval_flags
 oa_quiet_flags
@@ -739,6 +739,8 @@ CC
 oa_delay_ffi
 OA_STANDARD_LINKING_FALSE
 OA_STANDARD_LINKING_TRUE
+OA_GCL_RT_FALSE
+OA_GCL_RT_TRUE
 OA_ECL_RT_FALSE
 OA_ECL_RT_TRUE
 oa_standard_linking
@@ -1413,7 +1415,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-10 to adapt to many kinds of systems.
+\`configure' configures OpenAxiom 1.5.0-2014-02-22 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1488,7 +1490,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-10:";;
+     short | recursive ) echo "Configuration of OpenAxiom 1.5.0-2014-02-22:";;
    esac
   cat <<\_ACEOF
 
@@ -1605,7 +1607,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenAxiom configure 1.5.0-2014-02-10
+OpenAxiom configure 1.5.0-2014-02-22
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2606,7 +2608,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-10, which was
+It was created by OpenAxiom $as_me 1.5.0-2014-02-22, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3622,7 +3624,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='openaxiom'
- VERSION='1.5.0-2014-02-10'
+ VERSION='1.5.0-2014-02-22'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4035,6 +4037,14 @@ else
   OA_ECL_RT_FALSE=
 fi
 
+ if test $oa_lisp_flavor = gcl; then
+  OA_GCL_RT_TRUE=
+  OA_GCL_RT_FALSE='#'
+else
+  OA_GCL_RT_TRUE='#'
+  OA_GCL_RT_FALSE=
+fi
+
  if test $oa_standard_linking = yes; then
   OA_STANDARD_LINKING_TRUE=
   OA_STANDARD_LINKING_FALSE='#'
@@ -17779,7 +17789,15 @@ case $oa_lisp_flavor in
 esac
 
 
+# What is the extension of object and executable files on this platform?
+
+
+cat >>confdefs.h <<_ACEOF
+#define OPENAXIOM_EXEEXT "$ac_cv_exeext"
+_ACEOF
+
 
+oa_fasl_type=
 { $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
@@ -17803,13 +17821,7 @@ else
 fi
 { $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?
-
-
-cat >>confdefs.h <<_ACEOF
-#define OPENAXIOM_EXEEXT "$ac_cv_exeext"
-_ACEOF
+FASLEXT=$oa_fasl_type
 
 
 
@@ -20278,6 +20290,10 @@ if test -z "${OA_ECL_RT_TRUE}" && test -z "${OA_ECL_RT_FALSE}"; then
   as_fn_error $? "conditional \"OA_ECL_RT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${OA_GCL_RT_TRUE}" && test -z "${OA_GCL_RT_FALSE}"; then
+  as_fn_error $? "conditional \"OA_GCL_RT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${OA_STANDARD_LINKING_TRUE}" && test -z "${OA_STANDARD_LINKING_FALSE}"; then
   as_fn_error $? "conditional \"OA_STANDARD_LINKING\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20712,7 +20728,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-10, which was
+This file was extended by OpenAxiom $as_me 1.5.0-2014-02-22, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20778,7 +20794,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-10
+OpenAxiom config.status 1.5.0-2014-02-22
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 9b3ccd90..e008ece8 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-10], 
+AC_INIT([OpenAxiom], [1.5.0-2014-02-22], 
         [open-axiom-bugs@lists.sf.net])
 
 dnl Most of the macros used in this configure.ac are defined in files
diff --git a/src/Makefile.in b/src/Makefile.in
index e9b7ecb7..fe45f1c0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -236,6 +236,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FASLEXT = @FASLEXT@
 FGREP = @FGREP@
 GCLOPTS = @GCLOPTS@
 GREP = @GREP@
@@ -348,7 +349,6 @@ 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@
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am
index 6825f6d8..a44bed95 100644
--- a/src/algebra/Makefile.am
+++ b/src/algebra/Makefile.am
@@ -79,9 +79,6 @@ INPUT=../input
 
 STAMP = echo timestamp >
 
-# Extension of the output file name returned by compile-file
-FASLEXT = @oa_fasl_type@
-
 oa_hammer = $(top_builddir)/src/utils/hammer$(EXEEXT)
 
 # Name of the driver to launch the compiler
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index e9254726..5ebcfb14 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -420,6 +420,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FASLEXT = @FASLEXT@
 FGREP = @FGREP@
 GCLOPTS = @GCLOPTS@
 GREP = @GREP@
@@ -532,7 +533,6 @@ 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@
@@ -585,9 +585,6 @@ DOC = $(oa_target_docdir)/src/algebra
 OUTSRC = $(oa_target_srcdir)/algebra
 INPUT = ../input
 STAMP = echo timestamp >
-
-# Extension of the output file name returned by compile-file
-FASLEXT = @oa_fasl_type@
 oa_hammer = $(top_builddir)/src/utils/hammer$(EXEEXT)
 
 # Name of the driver to launch the compiler
diff --git a/src/io/Makefile.in b/src/io/Makefile.in
index 4bf2aeee..2b0c7d32 100644
--- a/src/io/Makefile.in
+++ b/src/io/Makefile.in
@@ -233,6 +233,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FASLEXT = @FASLEXT@
 FGREP = @FGREP@
 GCLOPTS = @GCLOPTS@
 GREP = @GREP@
@@ -345,7 +346,6 @@ 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@
diff --git a/src/rt/Makefile.in b/src/rt/Makefile.in
index 5ff44e8c..9cbce2df 100644
--- a/src/rt/Makefile.in
+++ b/src/rt/Makefile.in
@@ -233,6 +233,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FASLEXT = @FASLEXT@
 FGREP = @FGREP@
 GCLOPTS = @GCLOPTS@
 GREP = @GREP@
@@ -345,7 +346,6 @@ 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@
diff --git a/src/syntax/Makefile.in b/src/syntax/Makefile.in
index 6c459782..56fcaf5a 100644
--- a/src/syntax/Makefile.in
+++ b/src/syntax/Makefile.in
@@ -233,6 +233,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FASLEXT = @FASLEXT@
 FGREP = @FGREP@
 GCLOPTS = @GCLOPTS@
 GREP = @GREP@
@@ -345,7 +346,6 @@ 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@