automake: use subdir-objects option

[openocd.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 95c3eb246b9d24442d276e90ebdbce62be09a8ea..623e63173073be9b6a7da5af26325f7745954ee9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,7 @@ AC_CONFIG_SRCDIR([src/openocd.c])
 
 m4_include([config_subdir.m4])dnl
 
-AM_INIT_AUTOMAKE([-Wall -Wno-portability dist-bzip2 dist-zip])
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([-Wall -Wno-portability dist-bzip2 dist-zip subdir-objects])
 
 AC_CONFIG_HEADERS([config.h])
 AH_BOTTOM([
@@ -1128,7 +1127,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])
@@ -1177,7 +1177,7 @@ fi
 # check if some driver requires libusb-0.1
 need_usb0=no
 if test $build_vsllink = yes -o $build_usbprog = yes -o \
-        $build_rlink = yes -o $build_ulink = yes -o $build_armjtagew = yes; then
+        $build_rlink = yes -o $build_armjtagew = yes; then
   need_usb0=yes
 fi
 
@@ -1191,7 +1191,7 @@ fi
 # check if some driver requires libusb-1.x
 need_usb_ng=no
 if test $build_ftdi = yes -o $build_hladapter_icdi = yes -o \
-        $build_hladapter_stlink = yes; then
+        $build_hladapter_stlink = yes -o $build_ulink = yes; then
   need_usb_ng=yes
 fi
 
@@ -1199,10 +1199,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