aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-10-30 17:56:37 +0100
committerLukas Larsson <[email protected]>2014-02-24 15:16:00 +0100
commita6788ea337a2319a2d1a42ee4618553a1c7765bf (patch)
tree76bd19e2bf8076a1b19c2e7e0d4215b9469e747e /lib/erl_interface
parentd932131754c2bfb2e0539b6419e3d09533fe84e8 (diff)
downloadotp-a6788ea337a2319a2d1a42ee4618553a1c7765bf.tar.gz
otp-a6788ea337a2319a2d1a42ee4618553a1c7765bf.tar.bz2
otp-a6788ea337a2319a2d1a42ee4618553a1c7765bf.zip
ose: Fix various build environment issues
Diffstat (limited to 'lib/erl_interface')
-rw-r--r--lib/erl_interface/aclocal.m49
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/erl_interface/aclocal.m4 b/lib/erl_interface/aclocal.m4
index 4a3407e0eb..09d0f0194c 100644
--- a/lib/erl_interface/aclocal.m4
+++ b/lib/erl_interface/aclocal.m4
@@ -84,6 +84,8 @@ AC_ARG_VAR(erl_xcomp_ose_LM_SET_CONF, [Sets the configuration for an OSE load mo
AC_ARG_VAR(erl_xcomp_ose_LM_ELF_SIZE, [Prints the section size information for an OSE load module (only used when cross compiling for OSE)])
AC_ARG_VAR(erl_xcomp_ose_LM_LCF, [OSE load module linker configuration file (only used when cross compiling for OSE)])
AC_ARG_VAR(erl_xcomp_ose_LM_CONF, [OSE load module default configuration file (only used when cross compiling for OSE)])
+AC_ARG_VAR(erl_xcomp_ose_CONFD, [OSE OSE confd source file])
+AC_ARG_VAR(erl_xcomp_ose_CRT0_LM, [OSE crt0 lm source file])
])
@@ -1106,7 +1108,12 @@ case "$THR_LIB_NAME" in
AC_DEFINE(ETHR_PTHREADS, 1, [Define if you have pthreads])
;;
ose_threads)
- AC_DEFINE(ETHR_OSE_THREADS, 1, [Define if you have OSE style threads]) ETHR_THR_LIB_BASE_DIR=ose
+ AC_DEFINE(ETHR_OSE_THREADS, 1,
+ [Define if you have OSE style threads])
+ ETHR_THR_LIB_BASE_DIR=ose
+ AC_CHECK_HEADER(ose_spi/ose_spi.h,
+ AC_DEFINE(HAVE_OSE_SPI, 1,
+ [Define if you have the "ose_spi/ose_spi.h" header file.]))
;;
esac
if test "x$THR_LIB_NAME" == "xpthread"; then