X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=configure.in;h=f91d6c7afb372f3e45e3f8e6410046bfcc5d78b2;hb=4eb2e50e4d7c8757bd6ade97cb784880778452a6;hp=7ab9db3db5085800c679e9580820524174e4a073;hpb=76d9c3d5b8ef774b9ae60eb27a653c18691b8c0d;p=openocd.git diff --git a/configure.in b/configure.in index 7ab9db3db5..f91d6c7afb 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,9 @@ AC_PREREQ(2.60) -AC_INIT([openocd], [0.2.0-in-development], +AC_INIT([openocd], [0.3.0-in-development], [OpenOCD Mailing List ]) AC_CONFIG_SRCDIR([src/openocd.c]) -AM_INIT_AUTOMAKE([-Wall -Wno-portability]) +AM_INIT_AUTOMAKE([-Wall -Wno-portability dist-bzip2 dist-zip]) AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) @@ -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) @@ -88,17 +89,20 @@ is_cygwin=no is_mingw=no is_win32=no is_darwin=no -build_release=yes - -AC_ARG_ENABLE(release, - AS_HELP_STRING([--enable-release], [Enable Release Build, default no]), - [build_release=$enableval], [build_release=no]) if test $cross_compiling = no; then - if test $build_release = no; then - # check we can find guess-rev.sh - AC_CHECK_FILE("$srcdir/guess-rev.sh", build_release=no, build_release=yes) + # guess-rev.sh only exists in the repository, not in the released archives + AC_CHECK_FILE("$srcdir/guess-rev.sh", has_guess_rev=yes, has_guess_rev=no) + + AC_MSG_CHECKING([whether to build a release]) + if test $has_guess_rev = no; then + build_release=yes + else + build_release=no fi + AC_MSG_RESULT($build_release) +else + build_release=yes fi # We are not *ALWAYS* being installed in the standard place. @@ -304,7 +308,7 @@ AC_ARG_ENABLE(parport, AC_ARG_ENABLE(parport_ppdev, AS_HELP_STRING([--disable-parport-ppdev], [Disable use of ppdev (/dev/parportN) for parport (for x86 only)]), - [parport_use_ppdev=$enableval], [parport_use_ppdev=]) + [parport_use_ppdev=$enableval], [parport_use_ppdev=yes]) AC_ARG_ENABLE(parport_giveio, AS_HELP_STRING([--enable-parport-giveio], @@ -321,16 +325,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,16 +407,15 @@ 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_zy1000 = yes; then + 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 header file.]) build_minidriver=yes - AC_DEFINE(BUILD_MINIDRIVER_DUMMY, 1, [Use the dummy minidriver.]) fi -AC_MSG_RESULT($build_ecosboard) +AC_MSG_RESULT($build_zy1000) AC_MSG_CHECKING([whether to enable dummy minidriver]) @@ -527,6 +534,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 @@ -811,9 +824,11 @@ main( int argc, char **argv ) AC_MSG_RESULT([Success!]) ], [ AC_MSG_ERROR([Cannot build & run test program using ftd2xx.lib]) - ] ) + ], [ + AC_MSG_RESULT([Skipping as we are cross-compiling]) + ]) -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]) @@ -878,7 +893,10 @@ main( int argc, char **argv ) AC_MSG_RESULT([Success]) ], [ AC_MSG_ERROR([Cannot build & run test program using libftdi]) + ], [ + AC_MSG_RESULT([Skipping as we are cross-compiling]) ]) + # Restore the 'unexpanded ldflags' LDFLAGS=$LDFLAGS_SAVE CFLAGS=$CFLAGS_SAVE @@ -898,16 +916,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)