X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.in;h=de74ffa98c7394be079b5a1f1a977416a90c26f1;hp=1b8640368835375e6bff791ff5de735b88cd8019;hb=89fa8ce2d8c58707f3dfda397138f8ee336e1a47;hpb=b628207ea6dd39280ebdd8b66a1ac869350c6d00 diff --git a/configure.in b/configure.in index 1b86403688..de74ffa98c 100644 --- a/configure.in +++ b/configure.in @@ -1,15 +1,17 @@ AC_PREREQ(2.60) -AC_INIT([openocd], [0.3.0-rc1-dev], +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 AM_CONFIG_HEADER(config.h) AH_BOTTOM([ -#include "system.h" -#include "replacements.h" +#include +#include ]) AC_LANG_C @@ -35,27 +37,78 @@ AC_TYPE_LONG_LONG_INT AC_SEARCH_LIBS([ioperm], [ioperm]) AC_SEARCH_LIBS([dlopen], [dl]) -AC_CHECK_HEADERS(arpa/inet.h) +AC_CHECK_HEADERS(sys/socket.h) +AC_CHECK_HEADERS(arpa/inet.h, [], [], [dnl +#include +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_SYS_SOCKET_H +# include +#endif +]) AC_CHECK_HEADERS(elf.h) AC_CHECK_HEADERS(dirent.h) AC_CHECK_HEADERS(fcntl.h) -AC_CHECK_HEADERS(ifaddrs.h) +AC_CHECK_HEADERS(ifaddrs.h, [], [], [dnl +#include +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_SYS_SOCKET_H +# include +#endif +]) AC_CHECK_HEADERS(malloc.h) AC_CHECK_HEADERS(netdb.h) -AC_CHECK_HEADERS(netinet/in.h) -AC_CHECK_HEADERS(netinet/tcp.h) +AC_CHECK_HEADERS([netinet/in.h], [], [], [dnl +#include +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_SYS_SOCKET_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/tcp.h, [], [], [dnl +#include +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_SYS_SOCKET_H +# include +#endif +]) AC_CHECK_HEADERS(pthread.h) AC_CHECK_HEADERS(strings.h) AC_CHECK_HEADERS(sys/ioctl.h) AC_CHECK_HEADERS(sys/param.h) AC_CHECK_HEADERS(sys/poll.h) AC_CHECK_HEADERS(sys/select.h) -AC_CHECK_HEADERS(sys/socket.h) AC_CHECK_HEADERS(sys/stat.h) AC_CHECK_HEADERS(sys/time.h) AC_CHECK_HEADERS(sys/types.h) AC_CHECK_HEADERS(unistd.h) - AC_CHECK_HEADERS([net/if.h], [], [], [dnl #include #ifdef STDC_HEADERS @@ -226,6 +279,24 @@ AC_ARG_WITH(ftd2xx-lib, with_ftd2xx_lib=static ]) + +AC_ARG_ENABLE(doxygen-html, + AS_HELP_STRING([--disable-doxygen-html], + [Disable building Doxygen manual as HTML.]), + [doxygen_as_html=$enableval], [doxygen_as_html=yes]) +AC_SUBST(doxygen_as_html) +AC_MSG_CHECKING([whether to build Doxygen as HTML]) +AC_MSG_RESULT($doxygen_as_html) + +AC_ARG_ENABLE(doxygen-pdf, + AS_HELP_STRING([--enable-doxygen-pdf], + [Enable building Doxygen manual as PDF.]), + [doxygen_as_pdf=$enableval], [doxygen_as_pdf=no]) +AC_SUBST(doxygen_as_pdf) +AC_MSG_CHECKING([whether to build Doxygen as PDF]) +AC_MSG_RESULT($doxygen_as_pdf) + + AC_ARG_ENABLE(gccwarnings, AS_HELP_STRING([--disable-gccwarnings], [Disable compiler warnings]), [gcc_warnings=$enableval], [gcc_warnings=yes]) @@ -323,6 +394,14 @@ AC_ARG_ENABLE(ft2232_ftd2xx, AS_HELP_STRING([--enable-ft2232_ftd2xx], [Enable building support for FT2232 based devices using the FTD2XX driver from ftdichip.com]), [build_ft2232_ftd2xx=$enableval], [build_ft2232_ftd2xx=no]) +AC_ARG_ENABLE(usb_blaster_libftdi, + AS_HELP_STRING([--enable-usb_blaster_libftdi], [Enable building support for the Altera USB-Blaster using the libftdi driver, opensource alternate of FTD2XX]), + [build_usb_blaster_libftdi=$enableval], [build_usb_blaster_libftdi=no]) + +AC_ARG_ENABLE(usb_blaster_ftd2xx, + AS_HELP_STRING([--enable-usb_blaster_ftd2xx], [Enable building support for the Altera USB-Blaster using the FTD2XX driver from ftdichip.com]), + [build_usb_blaster_ftd2xx=$enableval], [build_usb_blaster_ftd2xx=no]) + AC_ARG_ENABLE(amtjtagaccel, AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]), [build_amtjtagaccel=$enableval], [build_amtjtagaccel=no]) @@ -331,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]) @@ -339,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, @@ -393,14 +472,25 @@ AC_ARG_ENABLE(rlink, AS_HELP_STRING([--enable-rlink], [Enable building support for the Raisonance RLink JTAG Programmer]), [build_rlink=$enableval], [build_rlink=no]) +AC_ARG_ENABLE(ulink, + AS_HELP_STRING([--enable-ulink], [Enable building support for the Keil ULINK JTAG Programmer]), + [build_ulink=$enableval], [build_ulink=no]) + 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]) @@ -452,7 +542,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.]) @@ -482,7 +572,7 @@ case $host in AC_MSG_WARN([--disable-parport-giveio is not supported by MinGW32 hosts]) fi parport_use_giveio=yes - + CFLAGS="$CFLAGS -D__USE_MINGW_ANSI_STDIO" AC_DEFINE(IS_MINGW, 1, [1 if building for MinGW.]) @@ -545,16 +635,10 @@ 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.]) +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_IOUTIL, 0, [0 if you don't want ioutils.]) -fi - -if test $build_httpd = yes; then - AC_DEFINE(BUILD_HTTPD, 1, [1 if you want httpd.]) -else - AC_DEFINE(BUILD_HTTPD, 0, [0 if you don't want httpd.]) + AC_DEFINE(BUILD_ZY1000_MASTER, 0, [0 if you don't want ZY1000 JTAG master registers.]) fi if test $build_at91rm9200 = yes; then @@ -594,6 +678,20 @@ else AC_DEFINE(BUILD_FT2232_FTD2XX, 0, [0 if you don't want ftd2xx ft2232.]) fi +if test $build_usb_blaster_libftdi = yes; then + build_bitbang=yes + AC_DEFINE(BUILD_USB_BLASTER_LIBFTDI, 1, [1 if you want libftdi usb_blaster.]) +else + AC_DEFINE(BUILD_USB_BLASTER_LIBFTDI, 0, [0 if you don't want libftdi usb_blaster.]) +fi + +if test $build_usb_blaster_ftd2xx = yes; then + build_bitbang=yes + AC_DEFINE(BUILD_USB_BLASTER_FTD2XX, 1, [1 if you want ftd2xx usb_blaster.]) +else + AC_DEFINE(BUILD_USB_BLASTER_FTD2XX, 0, [0 if you don't want ftd2xx usb_blaster.]) +fi + if test $build_amtjtagaccel = yes; then AC_DEFINE(BUILD_AMTJTAGACCEL, 1, [1 if you want the Amontec JTAG-Accelerator driver.]) else @@ -656,12 +754,32 @@ else AC_DEFINE(BUILD_RLINK, 0, [0 if you don't want the RLink JTAG driver.]) fi +if test $build_ulink = yes; then + AC_DEFINE(BUILD_ULINK, 1, [1 if you want the ULINK JTAG driver.]) +else + AC_DEFINE(BUILD_ULINK, 0, [0 if you don't want the ULINK JTAG driver.]) +fi + if test $build_armjtagew = yes; then AC_DEFINE(BUILD_ARMJTAGEW, 1, [1 if you want the ARM-JTAG-EW JTAG driver.]) 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 @@ -670,7 +788,7 @@ then AC_MSG_ERROR([The option: with_ftd2xx_linux_tardir is for LINUX only.]) fi -if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes ; then +if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes -o $build_usb_blaster_ftd2xx = yes ; then AC_MSG_CHECKING([for ftd2xx.lib exists (win32)]) # if we are given a zipdir... @@ -685,12 +803,12 @@ if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes ; then # And calculate the LDFLAGS for the machine case "$host_cpu" in - i?86|x86_*) + i?86|x86_32) LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/i386" LIBS="$LIBS -lftd2xx" f=$with_ftd2xx_win32_zipdir/i386/ftd2xx.lib ;; - amd64) + amd64|x86_64) LDFLAGS="$LDFLAGS -L$with_ftd2xx_win32_zipdir/amd64" LIBS="$LIBS -lftd2xx" f=$with_ftd2xx_win32_zipdir/amd64/ftd2xx.lib @@ -810,22 +928,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]) @@ -834,15 +947,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 @@ -874,13 +988,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 ){ @@ -889,8 +1000,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]) @@ -899,11 +1009,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 @@ -922,11 +1033,13 @@ enum ftdi_chip_type x = TYPE_2232H; fi # check for usb.h when a driver will require it +build_usb=no if test $build_jlink = yes -o $build_vsllink = yes -o $build_usbprog = yes -o \ - $build_rlink = yes -o $build_armjtagew = yes + $build_rlink = yes -o $build_ulink = yes -o $build_armjtagew = yes then AC_CHECK_HEADERS([usb.h],[], [AC_MSG_ERROR([usb.h is required to build some OpenOCD driver(s)])]) + build_usb=yes fi AM_CONDITIONAL(RELEASE, test $build_release = yes) @@ -936,12 +1049,14 @@ 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) AM_CONDITIONAL(FT2232_DRIVER, test $build_ft2232_ftd2xx = yes -o $build_ft2232_libftdi = yes) +AM_CONDITIONAL(USB_BLASTER_LIBFTDI, test $build_usb_blaster_libftdi = yes) +AM_CONDITIONAL(USB_BLASTER_DRIVER, test $build_usb_blaster_ftd2xx = yes -o $build_usb_blaster_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) @@ -951,7 +1066,10 @@ AM_CONDITIONAL(OOCD_TRACE, test $build_oocd_trace = yes) AM_CONDITIONAL(JLINK, test $build_jlink = yes) AM_CONDITIONAL(VSLLINK, test $build_vsllink = yes) AM_CONDITIONAL(RLINK, test $build_rlink = yes) +AM_CONDITIONAL(ULINK, test $build_ulink = 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) AM_CONDITIONAL(IS_WIN32, test $is_win32 = yes) @@ -961,14 +1079,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 ], [ @@ -976,10 +1096,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 ], [ @@ -995,7 +1115,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" @@ -1057,11 +1177,16 @@ AC_OUTPUT(dnl src/Makefile 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 + src/flash/nand/Makefile dnl src/pld/Makefile dnl doc/Makefile dnl )