* configure.ac: Define Automake conditional OA_DELAYED_FFI.

	* config/open-axiom.m4 (OPENAXIOM_CHECK_DELAYED_FFI): New.
	(OPENAXIOM_HOST_COMPILERS): Call it.
src/
	* lisp/core.lisp.in (primitiveLoad): New.  Export.
	($delayedFFI): Likewise.
	* lisp/Makefile.in (oa_delay_ffi): New.
	(edit): Update.
	* interp/sys-utility.boot: import sys-constants instead of sys-os.
	* interp/sys-driver.boot (%sysInit): Do not loadSystemRuntimeCore.
	(loadDelayedFFI): New.
	(executeSpadScript): Call it.
	(compileSpadLibrary): Likewise.
	(buildInitdbHandler): Likewise.
	(systemMain): Likewise.
	* interp/util.lisp (BUILD-INTERPSYS): Likewise.
	* interp/Makefile.in (oa_target_moddir): New.
	(OA_FFI_MOD): Likewise.
	(OA_FFI_OBJ): Define conditionally.
	(OBJS): Use it.
	($(oa_target_delayed)): New rule.
	(oa_target_delayed): New.
	(oa_target_ffi): Define conditionally.
	(${SAVESYS}): Require it.
	(${AXIOMSYS}): Likewise.
	(sys-utility.$(FASLEXT)): Now require sys-constants.$(FASLEXT).

1 files changed, 26 insertions, 0 deletions

diff --git a/configure b/configure
index 41f202f8..c5068f78 100755
--- a/configure
+++ b/configure
@@ -685,6 +685,8 @@ oa_shrobj_flags
 oa_use_libtool_for_shared_lib
 EGREP
 GREP
+OA_DELAYED_FFI_FALSE
+OA_DELAYED_FFI_TRUE
 OA_BUILD_GCL_FALSE
 OA_BUILD_GCL_TRUE
 CXXCPP
@@ -712,6 +714,7 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+oa_delay_ffi
 oa_standard_linking
 axiom_lisp_flavor
 AXIOM_LISP
@@ -3833,6 +3836,17 @@ $as_echo_n "checking CPU precision as seen by $AXIOM_LISP... " >&6; }
 $as_echo "$openaxiom_host_lisp_precision" >&6; }
 fi
 
+
+case ${axiom_lisp_flavor},$host in
+  sbcl,* | clozure,* | clisp,*)
+     oa_delay_ffi=yes
+     ;;
+  *)
+     oa_delay_ffi=no
+     ;;
+esac
+
+
 ## Are we using compilers from GNU?
 oa_gnu_compiler=no
 ac_ext=c
@@ -5458,6 +5472,14 @@ else
   OA_BUILD_GCL_FALSE=
 fi
 
+ if test x$oa_delay_ffi = xyes; then
+  OA_DELAYED_FFI_TRUE=
+  OA_DELAYED_FFI_FALSE='#'
+else
+  OA_DELAYED_FFI_TRUE='#'
+  OA_DELAYED_FFI_FALSE=
+fi
+
 
 
 
@@ -19854,6 +19876,10 @@ if test -z "${OA_BUILD_GCL_TRUE}" && test -z "${OA_BUILD_GCL_FALSE}"; then
   as_fn_error $? "conditional \"OA_BUILD_GCL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${OA_DELAYED_FFI_TRUE}" && test -z "${OA_DELAYED_FFI_FALSE}"; then
+  as_fn_error $? "conditional \"OA_DELAYED_FFI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 if test -z "${OA_BUILD_SMAN_TRUE}" && test -z "${OA_BUILD_SMAN_FALSE}"; then
   as_fn_error $? "conditional \"OA_BUILD_SMAN\" was never defined.