summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-05-02 23:14:02 -0700
committerKeith Packard <keithp@keithp.com>2013-05-02 23:16:39 -0700
commit1629acba4a63baae2c687ed56a17d02faf45f5e5 (patch)
tree52f81b00fa9de9a46c500b25b1f13c114fcabfa6
parent7cce6c205e4595894e033ab8f0acc8064bf9f561 (diff)
Allow build without SDCC
The AltOS directory handles not building the cc1111 apps when sdcc is missing already, so don't require it, just whinge if it's missing Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--configure.ac34
1 files changed, 33 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index f54a8b4c..46467705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,6 +145,12 @@ if test "x$ANDROID_SDK" != "xno"; then
fi
fi
+if test "x$ANDROID_SDK" != "xno"; then
+ HAVE_ANDROID_SDK="yes"
+else
+ HAVE_ANDROD_SDK="no"
+fi
+
AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno])
AC_SUBST(ANDROID_SDK)
@@ -176,7 +182,12 @@ AC_SUBST(WARN_CFLAGS)
AC_CHECK_PROG([HAVE_SDCC], [sdcc], yes, no)
if test "x$HAVE_SDCC" = "xno"; then
- AC_MSG_ERROR([Please install sdcc to build AltOs])
+ AC_MSG_WARN([No sdcc found, cc1111 binaries will not be built])
+fi
+
+AC_CHECK_PROG([HAVE_ARM_GCC], [arm-none-eabi-gcc], yes, no)
+if test "x$HAVE_ARM_GCC" = "xno"; then
+ AC_MSG_WARN([No arm compiler found, STM32L and LPC11U14 binaries will not be built])
fi
AC_CHECK_PROG([HAVE_NICKLE], [nickle], yes, no)
@@ -227,3 +238,24 @@ ao-tools/ao-dump-up/Makefile
ao-utils/Makefile
src/Version
])
+
+echo ""
+echo " Package: ${PACKAGE_NAME} ${PACKAGE_VERSION}"
+echo ""
+echo " Configuration"
+echo " STM32L/LPC11U14 support.....: ${HAVE_ARM_GCC}"
+echo " CC1111 support..............: ${HAVE_SDCC}"
+echo " Android support.............: ${HAVE_ANDROID_SDK}"
+echo " STlink support..............: ${HAVE_STLINK}"
+echo ""
+echo " Java paths"
+echo " freetts.....................: ${FREETTS}"
+echo " jfreechart..................: ${JFREECHART}"
+echo " jcommon.....................: ${JCOMMON}"
+echo " JVM include.................: ${JVM_INCLUDE}"
+if test x${ANDROID_SDK} != "xno"; then
+echo ""
+echo " Android path"
+echo " Android SDK.................: ${ANDROID_SDK}"
+fi
+echo ""