Merge branch 'master' into new-state

[fw/altos] / configure.ac

diff --git a/configure.ac b/configure.ac
index 46467705124c995bedc8c9c9980448f07810f354..4d0a2ef68119872a6376139b2cbf33a39e498a10 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.2)
+AC_INIT([altos], 1.2.9.2)
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -148,7 +148,7 @@ fi
 if test "x$ANDROID_SDK" != "xno"; then
        HAVE_ANDROID_SDK="yes"
 else
-       HAVE_ANDROD_SDK="no"
+       HAVE_ANDROID_SDK="no"
 fi
 
 AM_CONDITIONAL([ANDROID], [test x$ANDROID_SDK != xno])
@@ -185,9 +185,14 @@ if test "x$HAVE_SDCC" = "xno"; then
        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)
+AC_CHECK_PROG([HAVE_ARM_GCC],[arm-none-eabi-gcc], yes, no,[/opt/cortex/bin])
 if test "x$HAVE_ARM_GCC" = "xno"; then
-       AC_MSG_WARN([No arm compiler found, STM32L and LPC11U14 binaries will not be built])
+       AC_MSG_WARN([No summon toolchain arm compiler found, STM32L binaries will not be built])
+fi
+
+AC_CHECK_PROG([HAVE_ARM_M0_GCC], [arm-none-eabi-gcc], yes, no,[/usr/bin])
+if test "x$HAVE_ARM_M0_GCC" = "xno"; then
+       AC_MSG_WARN([No linaro toolchain arm cortex-m0 compiler found, LPC11U14 binaries will not be built])
 fi
 
 AC_CHECK_PROG([HAVE_NICKLE], [nickle], yes, no)
@@ -243,7 +248,8 @@ echo ""
 echo "  Package: ${PACKAGE_NAME} ${PACKAGE_VERSION}"
 echo ""
 echo "  Configuration"
-echo "    STM32L/LPC11U14 support.....: ${HAVE_ARM_GCC}"
+echo "    STM32L support..............: ${HAVE_ARM_GCC}"
+echo "    LPC11U14 support............: ${HAVE_ARM_M0_GCC}"
 echo "    CC1111 support..............: ${HAVE_SDCC}"
 echo "    Android support.............: ${HAVE_ANDROID_SDK}"
 echo "    STlink support..............: ${HAVE_STLINK}"