From 13e5c3f6bc5954bcb6b6a76672b1ae6850385179 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 23 Feb 2014 06:42:21 +0000
Subject: FASLEXT is now AC_SUBST

---
 config/open-axiom.m4 | 14 ++++++++------
 config/var-def.mk    |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'config')

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
-- 
cgit v1.2.3