X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.in;h=cb62c8590f482b66306ea0061f9bdac7039e2103;hp=3b0a06d30b2eaf280f2167caaeea3c063fadaad7;hb=e7c611deeac63e585eb61d6c4cdb54d078c2c579;hpb=b853b9dbc0ba3d68a501d8badc4491f8108cd11b diff --git a/configure.in b/configure.in index 3b0a06d30b..cb62c8590f 100644 --- a/configure.in +++ b/configure.in @@ -3,6 +3,8 @@ AC_INIT([openocd], [0.5.0-dev], [OpenOCD Mailing List ]) 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 @@ -408,6 +410,10 @@ AC_ARG_ENABLE(ecosboard, AS_HELP_STRING([--enable-ecosboard], [Enable building support for eCos based JTAG debugger]), [build_ecosboard=$enableval], [build_ecosboard=no]) +AC_ARG_ENABLE(zy1000_master, + AS_HELP_STRING([--enable-zy1000-master], [Use ZY1000 JTAG master registers]), + [build_zy1000_master=$enableval], [build_zy1000_master=no]) + AC_ARG_ENABLE(zy1000, AS_HELP_STRING([--enable-zy1000], [Enable ZY1000 interface]), [build_zy1000=$enableval], [build_zy1000=no]) @@ -416,10 +422,6 @@ AC_ARG_ENABLE(ioutil, AS_HELP_STRING([--enable-ioutil], [Enable ioutil functions - useful for standalone OpenOCD implementations]), [build_ioutil=$enableval], [build_ioutil=no]) -AC_ARG_ENABLE(httpd, - AS_HELP_STRING([--enable-httpd], [Enable builtin httpd server - useful for standalone OpenOCD implementations]), - [build_httpd=$enableval], [build_httpd=no]) - case "${host_cpu}" in arm*) AC_ARG_ENABLE(ep93xx, @@ -474,10 +476,17 @@ AC_ARG_ENABLE(arm-jtag-ew, AS_HELP_STRING([--enable-arm-jtag-ew], [Enable building support for the Olimex ARM-JTAG-EW Programmer]), [build_armjtagew=$enableval], [build_armjtagew=no]) +AC_ARG_ENABLE(buspirate, + AS_HELP_STRING([--enable-buspirate], [Enable building support for the Buspirate]), + [build_buspirate=$enableval], [build_buspirate=no]) + AC_ARG_ENABLE(minidriver_dummy, AS_HELP_STRING([--enable-minidriver-dummy], [Enable the dummy minidriver.]), [build_minidriver_dummy=$enableval], [build_minidriver_dummy=no]) +AC_ARG_ENABLE(internal-jimtcl, + AS_HELP_STRING([--disable-internal-jimtcl], [Disable building internal jimtcl]), + [use_internal_jimtcl=$enableval], [use_internal_jimtcl=yes]) build_minidriver=no AC_MSG_CHECKING([whether to enable ZY1000 minidriver]) @@ -529,7 +538,7 @@ case $host in is_win32=yes parport_use_ppdev=no - AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[return __MINGW32__;]), + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[return __MINGW32__;]])], [is_mingw=yes],[is_mingw=no]) if test $is_mingw = yes; then AC_DEFINE(IS_MINGW, 1, [1 if building for MinGW.]) @@ -622,6 +631,12 @@ else AC_DEFINE(BUILD_ZY1000, 0, [0 if you don't want ZY1000.]) fi +if test $build_zy1000_master = yes; then + AC_DEFINE(BUILD_ZY1000_MASTER, 1, [1 if you want ZY1000 JTAG master registers.]) +else + AC_DEFINE(BUILD_ZY1000_MASTER, 0, [0 if you don't want ZY1000 JTAG master registers.]) +fi + if test $build_at91rm9200 = yes; then build_bitbang=yes AC_DEFINE(BUILD_AT91RM9200, 1, [1 if you want at91rm9200.]) @@ -741,6 +756,20 @@ else AC_DEFINE(BUILD_ARMJTAGEW, 0, [0 if you don't want the ARM-JTAG-EW JTAG driver.]) fi +if test $build_buspirate = yes; then + AC_DEFINE(BUILD_BUSPIRATE, 1, [1 if you want the Buspirate JTAG driver.]) +else + AC_DEFINE(BUILD_BUSPIRATE, 0, [0 if you don't want the Buspirate JTAG driver.]) +fi + +if test "$use_internal_jimtcl" = yes; then + if test -f "$srcdir/jimtcl/configure.ac"; then + AX_CONFIG_SUBDIR_OPTION([jimtcl], [--with-jim-ext=nvp --disable-lineedit]) + else + AC_MSG_ERROR([jimtcl not found, run git submodule init and git submodule update.]) + fi +fi + #-- Deal with MingW/Cygwin FTD2XX issues if test $is_win32 = yes; then @@ -889,22 +918,17 @@ _CFLAGS=`eval echo $CFLAGS` LDFLAGS=$_LDFLAGS CFLAGS=$_CFLAGS -AC_RUN_IFELSE([ +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include "confdefs.h" #if IS_WIN32 #include "windows.h" #endif #include #include - -int -main( int argc, char **argv ) -{ + ]], [[ DWORD x; FT_GetLibraryVersion( &x ); - return 0; -} - ], [ + ]])], [ AC_MSG_RESULT([Success!]) ], [ AC_MSG_ERROR([Cannot build & run test program using ftd2xx.lib]) @@ -913,15 +937,16 @@ main( int argc, char **argv ) ]) AC_MSG_CHECKING([for ftd2xx highspeed device support]) -AC_COMPILE_IFELSE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include "confdefs.h" #if IS_WIN32 #include "windows.h" #endif #include #include + DWORD x = FT_DEVICE_4232H; - ], [ + ]], [])], [ AC_DEFINE(BUILD_FT2232_HIGHSPEED, [1], [Support FT2232H/FT4232HS with FTD2XX or libftdi.]) build_ft2232_highspeed=yes @@ -953,13 +978,10 @@ if test $build_ft2232_libftdi = yes ; then LDFLAGS=$_LDFLAGS CFLAGS=$_CFLAGS - AC_RUN_IFELSE([ + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include #include - -int -main( int argc, char **argv ) -{ + ]], [[ struct ftdi_context *p; p = ftdi_new(); if( p != NULL ){ @@ -968,8 +990,7 @@ main( int argc, char **argv ) fprintf( stderr, "calling ftdi_new() failed\n"); return 1; } -} - ], [ + ]])], [ AC_MSG_RESULT([Success]) ], [ AC_MSG_ERROR([Cannot build & run test program using libftdi]) @@ -978,11 +999,12 @@ main( int argc, char **argv ) ]) AC_MSG_CHECKING([for libftdi highspeed device support]) -AC_COMPILE_IFELSE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include #include + ]], [[ enum ftdi_chip_type x = TYPE_2232H; - ], [ + ]])], [ AC_DEFINE(BUILD_FT2232_HIGHSPEED, [1], [Support FT2232H/FT4232HS with FTD2XX or libftdi.]) build_ft2232_highspeed=yes @@ -1017,8 +1039,8 @@ 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(ZY1000_MASTER, test $build_zy1000_master = 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) @@ -1035,6 +1057,7 @@ AM_CONDITIONAL(JLINK, test $build_jlink = yes) AM_CONDITIONAL(VSLLINK, test $build_vsllink = yes) AM_CONDITIONAL(RLINK, test $build_rlink = yes) AM_CONDITIONAL(ARMJTAGEW, test $build_armjtagew = yes) +AM_CONDITIONAL(BUSPIRATE, test $build_buspirate = yes) AM_CONDITIONAL(USB, test $build_usb = yes) AM_CONDITIONAL(IS_CYGWIN, test $is_cygwin = yes) AM_CONDITIONAL(IS_MINGW, test $is_mingw = yes) @@ -1045,14 +1068,16 @@ AM_CONDITIONAL(BITQ, test $build_bitq = yes) 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) + # Look for environ alternatives. Possibility #1: is environ in unistd.h or stdlib.h? AC_MSG_CHECKING([for environ in unistd.h and stdlib.h]) -AC_COMPILE_IFELSE([ +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #define _GNU_SOURCE #include #include -int main(int argc, char **argv) { char **ep = environ; } - ], [ + ]], [[char **ep = environ;]] + )], [ AC_MSG_RESULT([yes]) has_environ=yes ], [ @@ -1060,10 +1085,10 @@ int main(int argc, char **argv) { char **ep = environ; } # Possibility #2: can environ be found in an available library? AC_MSG_CHECKING([for extern environ]) - AC_LINK_IFELSE([ -extern char **environ; -int main(int argc, char **argv) { char **ep = environ; } - ], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + extern char **environ; + ]], [[char **ep = environ;]] + )], [ AC_DEFINE(NEED_ENVIRON_EXTERN, [1], [Must declare 'environ' to use it.]) has_environ=yes ], [ @@ -1079,7 +1104,7 @@ fi AC_DEFINE([_GNU_SOURCE],[1],[Use GNU C library extensions (e.g. stdndup).]) # set default gcc warnings -GCC_WARNINGS="-Wall -Wstrict-prototypes -Wformat-security" +GCC_WARNINGS="-Wall -Wstrict-prototypes -Wformat-security -Wshadow" if test "${gcc_wextra}" = yes; then GCC_WARNINGS="${GCC_WARNINGS} -Wextra -Wno-unused-parameter" GCC_WARNINGS="${GCC_WARNINGS} -Wbad-function-cast" @@ -1142,9 +1167,11 @@ AC_OUTPUT(dnl src/helper/Makefile dnl src/jtag/Makefile dnl src/jtag/drivers/Makefile dnl + src/transport/Makefile dnl src/xsvf/Makefile dnl src/svf/Makefile dnl src/target/Makefile dnl + src/rtos/Makefile dnl src/server/Makefile dnl src/flash/Makefile dnl src/flash/nor/Makefile dnl