X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.ac;h=d0b5f44186a1d978268130254bb0b6edfa1c9b81;hb=997d68e13c32118c665fa273c515726c5ab2ce6b;hp=03746926788c7321a877ae8c954100ca9bddcfa3;hpb=8011baae420bb96ec487bfb343a761af70dd980d;p=fw%2Faltos

diff --git a/configure.ac b/configure.ac
index 03746926..d0b5f441 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.12)
+ANDROID_VERSION=35
 AC_CONFIG_SRCDIR([src/kernel/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-RELEASE_DATE=2019-12-05
+RELEASE_DATE=2022-10-28
 AC_SUBST(RELEASE_DATE)
 
 DOC_DATE=`LC_ALL=C date -d $RELEASE_DATE +'%d %b %Y'`
@@ -38,8 +38,8 @@ AC_SUBST(ANDROID_VERSION)
 dnl ==========================================================================
 dnl Java library versions
 
-ALTOSUILIB_VERSION=13
-ALTOSLIB_VERSION=13
+ALTOSUILIB_VERSION=14
+ALTOSLIB_VERSION=14
 
 AC_SUBST(ALTOSLIB_VERSION)
 AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
@@ -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])
-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
+	AC_MSG_WARN([No cortex-m0 arm compiler found, LPC11U14 and STM32F0 binaries will not be built])
 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
@@ -580,6 +570,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,7 +595,6 @@ 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 "    install shared mime info....: ${INSTALL_SHARED_MIME_INFO}"
 echo "    Strip jar timestamps........: ${STRIP_NONDETERMINISM}"
@@ -615,6 +605,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"