X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.in;h=ef552f5c50f7084cca48e48c95b74de10bee256c;hb=ed5b5b834eb3d09ff1676ef60d25a629d9358a13;hp=3b32f5019430214c1d4d1a579f58e6c302c89b99;hpb=a221892f605c38b3f9916b86ddebf497f81af584;p=fw%2Fopenocd

diff --git a/configure.in b/configure.in
index 3b32f5019..ef552f5c5 100644
--- a/configure.in
+++ b/configure.in
@@ -24,6 +24,7 @@ m4_defun([_LT_AC_LANG_F77_CONFIG], [:])
 m4_defun([_LT_AC_LANG_GCJ_CONFIG], [:])
 AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
+AC_SUBST(LIBTOOL_DEPS)
 
 
 dnl configure checks required for Jim files (these are obsolete w/ C99)
@@ -400,13 +401,12 @@ AC_ARG_ENABLE(minidriver_dummy,
 build_minidriver=no
 AC_MSG_CHECKING([whether to enable ZY1000 minidriver])
 if test $build_ecosboard = yes; then
-  # check for that project's header file in the current header search path
-  AC_CHECK_HEADERS(jtag_minidriver.h, [build_minidriver=yes],
-      AC_MSG_WARN([The --enable-ecosboard option needs the out-of-tree 'jtag_minidriver.h'])
-      AC_MSG_ERROR([The out-of-tree jtag_minidriver.h cannot be found.])
-    )
+  if test $build_minidriver = yes; then
+    AC_MSG_ERROR([Multiple minidriver options have been enabled.])
+  fi
+  AC_DEFINE(HAVE_JTAG_MINIDRIVER_H, 1,
+      [Define to 1 if you have the <jtag_minidriver.h> header file.])
   build_minidriver=yes
-  AC_DEFINE(BUILD_MINIDRIVER_DUMMY, 1, [Use the dummy minidriver.])
 fi
 AC_MSG_RESULT($build_ecosboard)
 
@@ -903,11 +903,11 @@ AM_CONDITIONAL(HTTPD, test $build_httpd = yes)
 AM_CONDITIONAL(AT91RM9200, test $build_at91rm9200 = yes)
 AM_CONDITIONAL(BITBANG, test $build_bitbang = yes)
 AM_CONDITIONAL(FT2232_LIBFTDI, test $build_ft2232_libftdi = yes)
-AM_CONDITIONAL(FT2232_FTD2XX, test $build_ft2232_ftd2xx = yes)
+AM_CONDITIONAL(FT2232_DRIVER, test $build_ft2232_ftd2xx = yes -o $build_ft2232_libftdi = yes)
 AM_CONDITIONAL(AMTJTAGACCEL, test $build_amtjtagaccel = yes)
 AM_CONDITIONAL(GW16012, test $build_gw16012 = yes)
 AM_CONDITIONAL(PRESTO_LIBFTDI, test $build_presto_libftdi = yes)
-AM_CONDITIONAL(PRESTO_FTD2XX, test $build_presto_ftd2xx = yes)
+AM_CONDITIONAL(PRESTO_DRIVER, test $build_presto_ftd2xx = yes -o $build_presto_libftdi = yes)
 AM_CONDITIONAL(USBPROG, test $build_usbprog = yes)
 AM_CONDITIONAL(OOCD_TRACE, test $build_oocd_trace = yes)
 AM_CONDITIONAL(JLINK, test $build_jlink = yes)
@@ -1014,16 +1014,16 @@ fi
 AC_MSG_RESULT([$EXEEXT_FOR_BUILD])
 AC_SUBST(EXEEXT_FOR_BUILD)
 
-AC_OUTPUT([
-    Makefile
-    src/Makefile
-    src/helper/Makefile
-    src/jtag/Makefile
-    src/xsvf/Makefile
-    src/svf/Makefile
-    src/target/Makefile
-    src/server/Makefile
-    src/flash/Makefile
-    src/pld/Makefile
-    doc/Makefile
-  ])
+AC_OUTPUT(dnl
+    Makefile dnl
+    src/Makefile dnl
+    src/helper/Makefile dnl
+    src/jtag/Makefile dnl
+    src/xsvf/Makefile dnl
+    src/svf/Makefile dnl
+    src/target/Makefile dnl
+    src/server/Makefile dnl
+    src/flash/Makefile dnl
+    src/pld/Makefile dnl
+    doc/Makefile dnl
+  )