X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=b92e06a9af6d5696b2864a077269379526bf0036;hp=aa957b1fb5112bbf766de420a49ed3b7befbf5a4;hb=bc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3;hpb=ebb36d56c732ffe9cdb8d2ea53d00e1d4ece8f97

diff --git a/configure.ac b/configure.ac
index aa957b1f..b92e06a9 100644
--- 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.9.4)
+AC_INIT([altos], 1.3)
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -238,6 +238,27 @@ fi
 AC_SUBST(HAVE_ARM_CC)
 AC_SUBST(ARM_CC)
 
+if test -d pdclib -a x"$HAVE_ARM_CC" = xyes; then
+	PDCLIB_ROOT='$(TOPDIR)/../pdclib-root'
+	PDCLIB_INCLUDES='-I$(TOPDIR)/../pdclib-root/include'
+	PDCLIB_LIBS_M0='-L$(TOPDIR)/../pdclib-root/lib -lpdclib-cortex-m0'
+	PDCLIB_LIBS_M3='-L$(TOPDIR)/../pdclib-root/lib -lpdclib-cortex-m3'
+	HAVE_PDCLIB=yes
+else
+	PDCLIB_INCLUDES=''
+	PDCLIB_LIBS_M0='-lpdclib-cortex-m0'
+	PDCLIB_LIBS_M3='-lpdclib-cortex-m3'
+	HAVE_PDCLIB=no
+fi
+
+AM_CONDITIONAL(PDCLIB, [test x$HAVE_PDCLIB = xyes])
+
+AC_SUBST(PDCLIB_INCLUDES)
+AC_SUBST(PDCLIB_LIBS_M0)
+AC_SUBST(PDCLIB_LIBS_M3)
+AC_SUBST(PDCLIB_ROOT)
+AC_SUBST(HAVE_PDCLIB)
+
 if test "x$HAVE_ARM_CC" = "xyes"; then
 	save_CC="$CC"
 	save_CFLAGS="$CFLAGS"
@@ -253,10 +274,6 @@ if test "x$HAVE_ARM_CC" = "xyes"; then
 			  [HAVE_ARM_M0_CC=no])
         AC_MSG_RESULT([$HAVE_ARM_M0_CC])
 
-	AC_CHECK_LIB(pdclib-cortex-m0,memcpy,
-		     [],
-		     [HAVE_ARM_M0_CC=no])
-
 	CFLAGS="-mthumb -mcpu=cortex-m3"
 	AC_MSG_CHECKING([if ]$ARM_CC[ supports cortex-m3])
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int i;])],
@@ -264,9 +281,15 @@ if test "x$HAVE_ARM_CC" = "xyes"; then
 			  [HAVE_ARM_M3_CC=no])
         AC_MSG_RESULT([$HAVE_ARM_M3_CC])
 
-	AC_CHECK_LIB(pdclib-cortex-m3,memcpy,
-		     [],
-		     [HAVE_ARM_M3_CC=no])
+	if test x$HAVE_PDCLIB != xyes; then
+		AC_CHECK_LIB(pdclib-cortex-m0,memcpy,
+			     [],
+			     [HAVE_ARM_M0_CC=no])
+
+		AC_CHECK_LIB(pdclib-cortex-m3,memcpy,
+			     [],
+			     [HAVE_ARM_M3_CC=no])
+        fi
 
 	AC_LANG_POP([C])
 	LIBS="$save_LIBS"
@@ -459,6 +482,7 @@ echo "    AVR compiler................: ${AVR_CC} ${AVR_OBJCOPY}"
 echo "    AVR support.................: ${HAVE_AVR_CC}"
 echo "    Android support.............: ${HAVE_ANDROID_SDK}"
 echo "    STlink support..............: ${HAVE_STLINK}"
+echo "    Local pdclib................: ${HAVE_PDCLIB}"
 echo ""
 echo "  Java paths"
 echo "    freetts.....................: ${FREETTS}"