X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=20acdf5f3dd2b2bab0e593b1b617c91364aebf80;hp=b6e17355a496c1ddc5451698b7f4c282f9d67af2;hb=8bff2822c242d2878b408b9c0d8a7647108ea4b1;hpb=9c200c3bc742b4dd1a7e28bfce9d5b27e833aae5

diff --git a/configure.ac b/configure.ac
index b6e17355..20acdf5f 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.3)
+AC_INIT([altos], 1.3.9.1)
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -30,7 +30,7 @@ dnl ==========================================================================
 dnl Java library versions
 
 ALTOSUILIB_VERSION=1
-ALTOSLIB_VERSION=2
+ALTOSLIB_VERSION=3
 
 AC_SUBST(ALTOSLIB_VERSION)
 AC_DEFINE(ALTOSLIB_VERSION,$ALTOSLIB_VERSION,[Version of the AltosLib package])
@@ -239,9 +239,10 @@ AC_SUBST(HAVE_ARM_CC)
 AC_SUBST(ARM_CC)
 
 if test -d pdclib -a x"$HAVE_ARM_CC" = xyes; then
-	PDCLIB_INCLUDES='-I$(TOPDIR)/../pdclib/opt/include'
-	PDCLIB_LIBS_M0='-L$(TOPDIR)/../pdclib/opt/lib -lpdclib-cortex-m0'
-	PDCLIB_LIBS_M3='-L$(TOPDIR)/../pdclib/opt/lib -lpdclib-cortex-m3'
+	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=''
@@ -255,6 +256,7 @@ 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
@@ -428,7 +430,58 @@ if test x"$HAVE_STLINK" = "xyes"; then
 	AC_DEFINE(HAVE_STLINK,1,[Using STlink library])
 fi
 
-AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK == xyes])
+AM_CONDITIONAL([LIBSTLINK], [test x$HAVE_STLINK = xyes])
+
+AC_ARG_ENABLE([multi-arch],
+	      [AS_HELP_STRING([--enable-multi-arch],
+			      [enable building both i386 and amd64 libraries (default=auto)])],
+	      [MULTI_ARCH=$enableval],
+	      [MULTI_ARCH=auto])
+
+case x"$MULTI_ARCH" in
+xauto)
+	arch=`uname -m`
+	case x"$arch" in
+	xx86_64|xi*86)
+		save_CFLAGS="$CFLAGS"
+		save_LIBS="$LIBS"
+		LIBS="-lbluetooth"
+		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=no
+			;;
+		esac
+		;;
+	*)
+		MULTI_ARCH=no
+		;;
+	esac
+	;;
+xyes|xno)
+	;;
+*)
+	MULTI_ARCH="no"
+	;;
+esac
+	
+AM_CONDITIONAL([MULTI_ARCH], [test x$MULTI_ARCH = xyes])
 
 AC_OUTPUT([
 Makefile
@@ -481,6 +534,7 @@ echo "    AVR support.................: ${HAVE_AVR_CC}"
 echo "    Android support.............: ${HAVE_ANDROID_SDK}"
 echo "    STlink support..............: ${HAVE_STLINK}"
 echo "    Local pdclib................: ${HAVE_PDCLIB}"
+echo "    i386 and amd64 libaltos.....: ${MULTI_ARCH}"
 echo ""
 echo "  Java paths"
 echo "    freetts.....................: ${FREETTS}"