X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=configure.in;h=deef708688ba0db4aa0fb343f4de9cc1bf2a24ee;hb=f0fd28a66ca5866de557941113b35de5b55b554d;hp=56e431d9b73bf7dd56b962b61c7f4f4d4debc518;hpb=3245a0cd5fdfcf27cc08a173e5c29abfd66882ee;p=openocd.git

diff --git a/configure.in b/configure.in
index 56e431d9b7..deef708688 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)
@@ -321,16 +322,20 @@ AC_ARG_ENABLE(ft2232_ftd2xx,
 
 AC_ARG_ENABLE(ftd2xx_highspeed,
   AS_HELP_STRING([--enable-ftd2xx-highspeed], [Enable building support for FT2232H and FT4232H-based devices (requires >=libftd2xx-0.4.16)]), 
-  [want_ftd2xx_highspeed=$enableval], [want_ftd2xx_highspeed=maybe])
+  [want_ftd2xx_highspeed=$enableval], [want_ftd2xx_highspeed=no])
  
 AC_ARG_ENABLE(amtjtagaccel,
   AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]), 
   [build_amtjtagaccel=$enableval], [build_amtjtagaccel=no])
 
 AC_ARG_ENABLE(ecosboard,
-  AS_HELP_STRING([--enable-ecosboard], [Enable building support for eCosBoard based JTAG debugger]), 
+  AS_HELP_STRING([--enable-ecosboard], [Enable building support for eCos based JTAG debugger]), 
   [build_ecosboard=$enableval], [build_ecosboard=no])
 
+AC_ARG_ENABLE(zy1000,
+  AS_HELP_STRING([--enable-zy1000], [Enable ZY1000 interface]), 
+  [build_zy1000=$enableval], [build_zy1000=no])
+
 AC_ARG_ENABLE(ioutil,
   AS_HELP_STRING([--enable-ioutil], [Enable ioutil functions - useful for standalone OpenOCD implementations]), 
   [build_ioutil=$enableval], [build_ioutil=no])
@@ -399,7 +404,7 @@ AC_ARG_ENABLE(minidriver_dummy,
 
 build_minidriver=no
 AC_MSG_CHECKING([whether to enable ZY1000 minidriver])
-if test $build_ecosboard = yes; then
+if test $build_zy1000 = yes; then
   if test $build_minidriver = yes; then
     AC_MSG_ERROR([Multiple minidriver options have been enabled.])
   fi
@@ -407,7 +412,7 @@ if test $build_ecosboard = yes; then
       [Define to 1 if you have the <jtag_minidriver.h> header file.])
   build_minidriver=yes
 fi
-AC_MSG_RESULT($build_ecosboard)
+AC_MSG_RESULT($build_zy1000)
 
 
 AC_MSG_CHECKING([whether to enable dummy minidriver])
@@ -526,6 +531,12 @@ else
   AC_DEFINE(BUILD_ECOSBOARD, 0, [0 if you don't want eCosBoard.])
 fi
 
+if test $build_zy1000 = yes; then
+  AC_DEFINE(BUILD_ZY1000, 1, [1 if you want ZY1000.])
+else
+  AC_DEFINE(BUILD_ZY1000, 0, [0 if you don't want ZY1000.])
+fi
+
 if test $build_ioutil = yes; then
   AC_DEFINE(BUILD_IOUTIL, 1, [1 if you want ioutils.])
 else
@@ -812,7 +823,7 @@ main( int argc, char **argv )
     AC_MSG_ERROR([Cannot build & run test program using ftd2xx.lib])
   ] )
 
-AC_MSG_CHECKING([whether to build ftd2xx device support])
+AC_MSG_CHECKING([whether to build ftd2xx highspeed device support])
 AC_MSG_RESULT([$want_ftd2xx_highspeed])
 if test $want_ftd2xx_highspeed != no; then
   AC_MSG_CHECKING([for ftd2xx highspeed device support])
@@ -897,16 +908,17 @@ AM_CONDITIONAL(DUMMY, test $build_dummy = yes)
 AM_CONDITIONAL(GIVEIO, test x$parport_use_giveio = xyes)
 AM_CONDITIONAL(EP93XX, test $build_ep93xx = yes)
 AM_CONDITIONAL(ECOSBOARD, test $build_ecosboard = yes)
+AM_CONDITIONAL(ZY1000, test $build_zy1000 = yes)
 AM_CONDITIONAL(IOUTIL, test $build_ioutil = yes)
 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)