X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=bc9ce7128aaab2c50e4a3cd3fa98b39cb964ea4a;hb=8d80146722786dc682ee7fa8cf168ab6f06a8271;hp=b86a59ceb5665d40fb12e4678693af311d0432ad;hpb=a0b277ba67169ce4343dc7ce14d350b930ee4eef;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index b86a59ce..bc9ce712 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,9 +33,6 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
-# We require this to know the target settings if we're cross-compiling.
-AC_CANONICAL_SYSTEM
-
 # We require at least automake 1.11 (needed for 'silent rules').
 AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -276,7 +273,7 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
 # libserialport is only needed for some hardware drivers. Disable the
 # respective drivers if it is not found.
 if test "x$enable_libserialport" != "xno"; then
-	PKG_CHECK_MODULES([libserialport], [libserialport >= 0.2.0],
+	PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.1],
 		[have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS";
 		LIBS="$LIBS $libserialport_LIBS";
 		SR_PKGLIBS="$SR_PKGLIBS libserialport"],
@@ -432,9 +429,9 @@ AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"])
 
 # The ACME driver can only be built for Linux.
-case "$target_os" in
-	linux*) ;;
-	*) HW_ACME="no" ;;
+case "$host" in
+	*linux*) ;;
+	*) HW_BAYLIBRE_ACME="no" ;;
 esac
 
 AC_SUBST(SR_PKGLIBS)
@@ -565,7 +562,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.2.0" \
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.1" \
 	"librevisa >= 0.0.20130412" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" \
 	"libftdi1 >= 1.0" "libgpib" "glibmm-2.4 >= 2.32.0" \
 	"pygobject-3.0 >= 3.0.0" "check >= 0.9.4"