X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=442fafd34fc83d4766d86a7a0b746c368beb06d2;hp=22e19f48360a01c561344a5c9f3333cd4e59e813;hb=HEAD;hpb=528fdc4e03466430c8d81fc78c90d3c9e8465ca7 diff --git a/configure.ac b/configure.ac index 22e19f48..9e3db494 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.9.1f) -ANDROID_VERSION=26 +AC_INIT([altos], 1.9.17) +ANDROID_VERSION=37 AC_CONFIG_SRCDIR([src/kernel/ao.h]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -RELEASE_DATE=2019-12-05 +RELEASE_DATE=2023-08-30 AC_SUBST(RELEASE_DATE) DOC_DATE=`LC_ALL=C date -d $RELEASE_DATE +'%d %b %Y'` @@ -200,6 +200,22 @@ else HAVE_GOOGLE_KEY="no" fi +AC_ARG_WITH(windows-key, AS_HELP_STRING([--with-windows-key=PATH], + [Set the file containing the Windows installer signing key (defaults to ~/altusmetrumllc/ssl.com/altus_metrum,_llc.p12)]), + [WINDOWSKEYFILE="$withval"], [WINDOWSKEYFILE=$HOME/altusmetrumllc/ssl.com/altus_metrum,_llc.p12]) + +AC_ARG_WITH(windows-key-pass, AS_HELP_STRING([--with-windows-key-pass=PATH], + [Set the file containing the Windows installer signing key password (defaults to ~/altusmetrumllc/ssl.com/password)]), + [WINDOWSKEYPASSFILE="$withval"], [WINDOWSKEYPASSFILE=$HOME/altusmetrumllc/ssl.com/password]) + +AC_CHECK_PROG(jsign, jsign, "yes", "no") + +if test -s "$WINDOWSKEYFILE" -a -s "$WINDOWSKEYPASSFILE" -a "$jsign" = yes; then + HAVE_WINDOWS_KEY="yes" +else + HAVE_WINDOWS_KEY="no" +fi + WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs" AC_SUBST(WARN_CFLAGS) @@ -210,6 +226,9 @@ AC_ARG_ENABLE(faketime, AS_HELP_STRING([--enable-faketime], AM_CONDITIONAL(FAKETIME, [test x$FAKETIME = xyes]) AC_SUBST(GOOGLEKEY) +AC_SUBST(WINDOWSKEYFILE) +AC_SUBST(WINDOWSKEYPASSFILE) +AC_SUBST(HAVE_WINDOWS_KEY) AC_PROG_CC AC_PROG_INSTALL @@ -262,18 +281,18 @@ if test "x$HAVE_ARM_CC" = "xyes"; then save_LIBS="$LIBS" CC="$ARM_CC" CFLAGS="-mthumb -mcpu=cortex-m0" - LIBS="-ffreestanding -nostdlib" + LIBS="--specs=picolibc.specs" AC_LANG_PUSH([C]) AC_MSG_CHECKING([if ]$ARM_CC[ supports cortex-m0]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int i;])], + AC_LINK_IFELSE([AC_LANG_PROGRAM([])], [HAVE_ARM_M0_CC=yes], [HAVE_ARM_M0_CC=no]) AC_MSG_RESULT([$HAVE_ARM_M0_CC]) CFLAGS="-mthumb -mcpu=cortex-m3" AC_MSG_CHECKING([if ]$ARM_CC[ supports cortex-m3]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int i;])], + AC_LINK_IFELSE([AC_LANG_PROGRAM([])], [HAVE_ARM_M3_CC=yes], [HAVE_ARM_M3_CC=no]) AC_MSG_RESULT([$HAVE_ARM_M3_CC]) @@ -294,39 +313,10 @@ if test "x$HAVE_ARM_M3_CC" = "xno"; then fi if test "x$HAVE_ARM_M0_CC" = "xno"; then - AC_MSG_WARN([No cortex-m0 arm compiler found, LPC11U14 binaries will not be built]) + AC_MSG_WARN([No cortex-m0 arm compiler found, LPC11U14 and STM32F0 binaries will not be built]) fi -AC_ARG_WITH([newlib-nano], - [AS_HELP_STRING([--with-newlib-nano], - [Root of newlib nano install])], - [], - [with_newlib_nano=auto]) - -HAVE_NEWLIB_NANO=no -if test "x$with_newlib_nano" != "xno"; then - if test "x$with_newlib_nano" = "xauto"; then - for d in /usr/local/lib/newlib-nano /usr/lib/newlib-nano; do - if test "x$with_newlib_nano" = "xauto" -a -d "$d"; then - with_newlib_nano="$d" - HAVE_NEWLIB_NANO=yes - fi - done - else - HAVE_NEWLIB_NANO=yes - fi -fi -if test "x$HAVE_NEWLIB_NANO" = "xno"; then - AC_MSG_WARN([No newlib-nano library found, ARM binaries will not be built]) - HAVE_ARM_M3_CC=no - HAVE_ARM_M0_CC=no -else - NEWLIB_NANO="$with_newlib_nano" -fi - -AC_SUBST(HAVE_NEWLIB_NANO) -AC_SUBST(NEWLIB_NANO) # # Configure AVR compiler @@ -485,39 +475,20 @@ AC_ARG_ENABLE([multi-arch], case x"$MULTI_ARCH" in xauto) - arch=`uname -m` - case x"$arch" in - xx86_64|xi*86) - save_CFLAGS="$CFLAGS" - save_LIBS="$LIBS" - LIBS="-ldl" - CFLAGS="-m64" - AC_MSG_CHECKING([if ]$CC[ ]$CFLAGS[ can link programs]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([])], - [M64_LINK=yes], - [M64_LINK=no]) - AC_MSG_RESULT([$M64_LINK]) - CFLAGS="-m32" - AC_MSG_CHECKING([if ]$CC[ ]$CFLAGS[ can link programs]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([])], - [M32_LINK=yes], - [M32_LINK=no]) - AC_MSG_RESULT([$M32_LINK]) - CFLAGS="$save_CFLAGS" - LIBS="$save_LIBS" - case x"$M64_LINK"x"$M32_LINK" in - xyesxyes) - MULTI_ARCH=yes + MULTI_ARCH=yes + for arch in i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabi arm-linux-gnueabihf; do + crossgcc="$arch"-gcc + AC_CHECK_PROG(ARCH_SUPPORTED,$crossgcc,yes,no) + case "$ARCH_SUPPORTED" in + yes) ;; *) MULTI_ARCH=no ;; esac - ;; - *) - MULTI_ARCH=no - ;; - esac + done + AC_MSG_CHECKING([MULTI_ARCH]) + AC_MSG_RESULT([$MULTI_ARCH]) ;; xyes|xno) ;; @@ -580,6 +551,7 @@ ao-tools/ao-flash/Makefile ao-tools/ao-test-igniter/Makefile ao-tools/ao-test-baro/Makefile ao-tools/ao-test-flash/Makefile +ao-tools/ao-test-pressure/Makefile ao-tools/ao-cal-accel/Makefile ao-tools/ao-cal-freq/Makefile ao-tools/ao-test-gps/Makefile @@ -604,8 +576,7 @@ echo " AVR support.................: ${HAVE_AVR_CC}" echo " Android support.............: ${HAVE_ANDROID_SDK}" echo " Android release support.....: ${ANDROID_RELEASE}" echo " STlink support..............: ${HAVE_STLINK}" -echo " Newlib-nano support.........: ${NEWLIB_NANO}" -echo " i386 and amd64 libaltos.....: ${MULTI_ARCH}" +echo " multi-arch libaltos.........: ${MULTI_ARCH}" echo " install shared mime info....: ${INSTALL_SHARED_MIME_INFO}" echo " Strip jar timestamps........: ${STRIP_NONDETERMINISM}" echo "" @@ -615,6 +586,7 @@ echo " jfreechart..................: ${JFREECHART}" echo " jcommon.....................: ${JCOMMON}" echo " JVM include.................: ${JVM_INCLUDE}" echo " AltosDroid maps API key.....: ${HAVE_GOOGLE_KEY}" +echo " Windows installer key.......: ${HAVE_WINDOWS_KEY}" if test x${ANDROID_SDK} != "xno"; then echo "" echo " Android path"