X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.ac;h=eb2af2b6582d9565d2064c93b8973e8cabcdfc5e;hb=92fa836f79b00b0c53eb087a4909b5cfce768c1e;hp=2bf6c7e330de9840b2f907ad4ca224cc9a691f3b;hpb=e87d56b665ca30a3e5920c23cd60c99b84341aa2;p=fw%2Faltos diff --git a/configure.ac b/configure.ac index 2bf6c7e3..eb2af2b6 100644 --- a/configure.ac +++ b/configure.ac @@ -18,13 +18,13 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) -AC_INIT([altos], 1.8.2) -ANDROID_VERSION=16 +AC_INIT([altos], 1.8.6.1) +ANDROID_VERSION=17 AC_CONFIG_SRCDIR([src/kernel/ao.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -RELEASE_DATE=2017-09-18 +RELEASE_DATE=2018-06-17 AC_SUBST(RELEASE_DATE) VERSION_DASH=`echo $VERSION | sed 's/\./-/g'` @@ -34,8 +34,8 @@ AC_SUBST(ANDROID_VERSION) dnl ========================================================================== dnl Java library versions -ALTOSUILIB_VERSION=12 -ALTOSLIB_VERSION=12 +ALTOSUILIB_VERSION=13 +ALTOSLIB_VERSION=13 AC_SUBST(ALTOSLIB_VERSION) AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package]) @@ -203,36 +203,6 @@ if test "x$GCC" = "xyes"; then fi AC_SUBST(WARN_CFLAGS) -# -# Configure SDCC -# - -AC_ARG_WITH([sdcc], - [AS_HELP_STRING([--with-sdcc], - [Name of SDCC])], - [], - [with_sdcc=auto]) - -if test "x$with_sdcc" != "xno"; then - if test "x$with_sdcc" = "xauto"; then - with_sdcc="sdcc" - AC_CHECK_PROG([HAVE_SDCC],[$with_sdcc], yes, no) - else - HAVE_SDCC=yes - fi -else - HAVE_SDCC=no -fi - -if test "x$HAVE_SDCC" = "xno"; then - AC_MSG_WARN([SDCC not found, cc1111 binaries will not be built]) -else - SDCC=$with_sdcc -fi - -AC_SUBST(SDCC) -AC_SUBST(HAVE_SDCC) - # # Configure ARM compiler for STM32L and LPC11U14 # @@ -574,8 +544,6 @@ echo " Configuration" echo " Arm compiler................: ${ARM_CC}" echo " STM32L support..............: ${HAVE_ARM_M3_CC}" echo " LPC11U14 support............: ${HAVE_ARM_M0_CC}" -echo " SDCC........................: ${SDCC}" -echo " CC1111 support..............: ${HAVE_SDCC}" echo " AVR compiler................: ${AVR_CC} ${AVR_OBJCOPY}" echo " AVR support.................: ${HAVE_AVR_CC}" echo " Android support.............: ${HAVE_ANDROID_SDK}"