X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.ac;h=87f95d5dd19486d23940bdfc087e94f51d53d9eb;hp=b247aad570ed5253d981ece327b8e87644f85b32;hb=80d01ca975b3e00e9aba0089a4d0a5c7d8e3f2e0;hpb=6be2a55bde5531de9897fd844c6db13e49213ae8

diff --git a/configure.ac b/configure.ac
index b247aad570..87f95d5dd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1128,7 +1128,8 @@ if test $build_ft2232_libftdi = yes -o $build_usb_blaster_libftdi = yes -o \
     ], [
       AC_MSG_ERROR([Cannot build & run test program using libftdi])
     ], [
-      AC_MSG_RESULT([Skipping as we are cross-compiling])
+      AC_MSG_RESULT([Skipping as we are cross-compiling, trying build only])
+      AC_SEARCH_LIBS([ftdi_new], [], [], [AC_MSG_ERROR([Cannot link with libftdi])])
     ])
 
 AC_MSG_CHECKING([for libftdi highspeed device support])
@@ -1199,10 +1200,10 @@ fi
 use_libusb1=no
 if test $need_usb = yes -o $need_usb_ng = yes; then
   AC_CHECK_HEADER([libusb-1.0/libusb.h], [
-	AC_DEFINE(HAVE_LIBUSB1, 1, [Define if you have libusb-1.x])
+	AC_DEFINE([HAVE_LIBUSB1], [1], [Define if you have libusb-1.x])
 	use_libusb1=yes
 	AC_SEARCH_LIBS([libusb_error_name], [usb-1.0],
-		[AC_DEFINE(HAVE_LIBUSB_ERROR_NAME, 1, [Define if your libusb has libusb_error_name()])],
+		[AC_DEFINE([HAVE_LIBUSB_ERROR_NAME], [1], [Define if your libusb has libusb_error_name()])],
 		[AC_MSG_WARN([libusb-1.x older than 1.0.9 detected, consider updating])])
   ], [
 	if test $need_usb_ng = yes; then
@@ -1262,12 +1263,12 @@ AM_CONDITIONAL([SYSFSGPIO], [test $build_sysfsgpio = yes])
 AM_CONDITIONAL([USE_LIBUSB0], [test $use_libusb0 = yes])
 AM_CONDITIONAL([USE_LIBUSB1], [test $use_libusb1 = yes])
 AM_CONDITIONAL([IS_CYGWIN], [test $is_cygwin = yes])
-AM_CONDITIONAL([IS_MINGW], [test $is_mingw = ye]s)
-AM_CONDITIONAL([IS_WIN32], [test $is_win32 = ye]s)
-AM_CONDITIONAL([IS_DARWIN], [test $is_darwin = ye]s)
+AM_CONDITIONAL([IS_MINGW], [test $is_mingw = yes])
+AM_CONDITIONAL([IS_WIN32], [test $is_win32 = yes])
+AM_CONDITIONAL([IS_DARWIN], [test $is_darwin = yes])
 AM_CONDITIONAL([BITQ], [test $build_bitq = yes])
 
-AM_CONDITIONAL([MINIDRIVER], [test $build_minidriver = ye]s)
+AM_CONDITIONAL([MINIDRIVER], [test $build_minidriver = yes])
 AM_CONDITIONAL([MINIDRIVER_DUMMY], [test $build_minidriver_dummy = yes])
 
 AM_CONDITIONAL([INTERNAL_JIMTCL], [test $use_internal_jimtcl = yes])