X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.in;h=fa2a4985bf318c0f3e8bfd2d9b29c588f94022a2;hp=46538cb3227354887165165ba29683da08357b21;hb=f86137066a6b42c46c457c9837a8015990bf71e6;hpb=6d20e27f9a3a96b57a0e3a898cccef6ccd04f4ab diff --git a/configure.in b/configure.in index 46538cb322..fa2a4985bf 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT([openocd], [0.2.0-in-development], +AC_INIT([openocd], [0.4.0-dev], [OpenOCD Mailing List ]) AC_CONFIG_SRCDIR([src/openocd.c]) @@ -35,27 +35,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 @@ -128,7 +179,7 @@ then # Nonstandard --prefix and/or --exec-prefix # We have an override of some sort. # use build specific install library dir - + LDFLAGS="$LDFLAGS -L$OCDxprefix/lib" # RPATH becomes an issue on Linux only if test $host_os = linux-gnu || test $host_os = linux ; then @@ -146,7 +197,7 @@ cat << __EOF__ The option: --with-ftd2xx= has been removed. On Linux, the new option is: - + --with-ftd2xx-linux-tardir=/path/to/files Where is the path the the directory where the "tar.gz" file @@ -245,7 +296,7 @@ debug_usb_comms=no AC_ARG_ENABLE(verbose, AS_HELP_STRING([--enable-verbose], - [Enable verbose JTAG I/O messages (for debugging).]), + [Enable verbose JTAG I/O messages (for debugging).]), [ debug_jtag_io=$enableval debug_usb_io=$enableval @@ -254,15 +305,15 @@ AC_ARG_ENABLE(verbose, AC_ARG_ENABLE(verbose_jtag_io, AS_HELP_STRING([--enable-verbose-jtag-io], - [Enable verbose JTAG I/O messages (for debugging).]), + [Enable verbose JTAG I/O messages (for debugging).]), [debug_jtag_io=$enableval], []) AC_ARG_ENABLE(verbose_usb_io, AS_HELP_STRING([--enable-verbose-usb-io], - [Enable verbose USB I/O messages (for debugging)]), + [Enable verbose USB I/O messages (for debugging)]), [debug_usb_io=$enableval], []) AC_ARG_ENABLE(verbose_usb_comms, AS_HELP_STRING([--enable-verbose-usb-comms], - [Enable verbose USB communication messages (for debugging)]), + [Enable verbose USB communication messages (for debugging)]), [debug_usb_comms=$enableval], []) AC_MSG_CHECKING([whether to enable verbose JTAG I/O messages]); @@ -287,7 +338,7 @@ fi debug_malloc=no AC_ARG_ENABLE(malloc_logging, AS_HELP_STRING([--enable-malloc-logging], - [Include free space in logging messages (requires malloc.h).]), + [Include free space in logging messages (requires malloc.h).]), [debug_malloc=$enableval], []) AC_MSG_CHECKING([whether to enable malloc free space logging]); @@ -298,67 +349,63 @@ fi AC_ARG_ENABLE(dummy, - AS_HELP_STRING([--enable-dummy], [Enable building the dummy port driver]), + AS_HELP_STRING([--enable-dummy], [Enable building the dummy port driver]), [build_dummy=$enableval], [build_dummy=no]) AC_ARG_ENABLE(parport, - AS_HELP_STRING([--enable-parport], [Enable building the pc parallel port driver]), + AS_HELP_STRING([--enable-parport], [Enable building the pc parallel port driver]), [build_parport=$enableval], [build_parport=no]) AC_ARG_ENABLE(parport_ppdev, AS_HELP_STRING([--disable-parport-ppdev], - [Disable use of ppdev (/dev/parportN) for parport (for x86 only)]), + [Disable use of ppdev (/dev/parportN) for parport (for x86 only)]), [parport_use_ppdev=$enableval], [parport_use_ppdev=yes]) AC_ARG_ENABLE(parport_giveio, AS_HELP_STRING([--enable-parport-giveio], - [Enable use of giveio for parport (for CygWin only)]), + [Enable use of giveio for parport (for CygWin only)]), [parport_use_giveio=$enableval], [parport_use_giveio=]) - + AC_ARG_ENABLE(ft2232_libftdi, - AS_HELP_STRING([--enable-ft2232_libftdi], [Enable building support for FT2232 based devices using the libftdi driver, opensource alternate of FTD2XX]), + AS_HELP_STRING([--enable-ft2232_libftdi], [Enable building support for FT2232 based devices using the libftdi driver, opensource alternate of FTD2XX]), [build_ft2232_libftdi=$enableval], [build_ft2232_libftdi=no]) 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]), + 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(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=no]) - AC_ARG_ENABLE(amtjtagaccel, - AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]), + 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 eCos 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]), + 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]), + 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]), + AS_HELP_STRING([--enable-httpd], [Enable builtin httpd server - useful for standalone OpenOCD implementations]), [build_httpd=$enableval], [build_httpd=no]) -case "${host_cpu}" in +case "${host_cpu}" in arm*) AC_ARG_ENABLE(ep93xx, - AS_HELP_STRING([--enable-ep93xx], [Enable building support for EP93xx based SBCs]), + AS_HELP_STRING([--enable-ep93xx], [Enable building support for EP93xx based SBCs]), [build_ep93xx=$enableval], [build_ep93xx=no]) AC_ARG_ENABLE(at91rm9200, AS_HELP_STRING([--enable-at91rm9200], [Enable building support for AT91RM9200 based SBCs]), [build_at91rm9200=$enableval], [build_at91rm9200=no]) ;; - - *) + + *) build_ep93xx=no build_at91rm9200=no ;; @@ -381,7 +428,8 @@ AC_ARG_ENABLE(usbprog, [build_usbprog=$enableval], [build_usbprog=no]) AC_ARG_ENABLE(oocd_trace, - AS_HELP_STRING([--enable-oocd_trace], [Enable building support for the OpenOCD+trace ETM capture device]), + AS_HELP_STRING([--enable-oocd_trace], + [Enable building support for some prototype OpenOCD+trace ETM capture hardware]), [build_oocd_trace=$enableval], [build_oocd_trace=no]) AC_ARG_ENABLE(jlink, @@ -439,10 +487,10 @@ else AC_MSG_RESULT([yes]) fi -case "${host_cpu}" in +case "${host_cpu}" in i?86|x86*) ;; - *) + *) if test x$parport_use_ppdev = xno; then AC_MSG_WARN([--disable-parport-ppdev is not supported by the host CPU]) fi @@ -450,9 +498,10 @@ case "${host_cpu}" in ;; esac -case $host in - *-cygwin*) +case $host in + *-cygwin*) is_win32=yes + parport_use_ppdev=no AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[return __MINGW32__;]), [is_mingw=yes],[is_mingw=no]) @@ -466,24 +515,31 @@ case $host in else is_cygwin=yes AC_DEFINE(IS_CYGWIN, 1, [1 if building for Cygwin.]) + # sys/io.h needed under cygwin for parport access + if test $build_parport = yes; then + AC_CHECK_HEADERS(sys/io.h,[],AC_MSG_ERROR([Please install the cygwin ioperm package])) + fi fi - + AC_DEFINE(IS_WIN32, 1, [1 if building for Win32.]) AC_DEFINE(IS_DARWIN, 0, [0 if not building for Darwin.]) - ;; - *-mingw*) + ;; + *-mingw*) is_mingw=yes is_win32=yes + parport_use_ppdev=no if test x$parport_use_giveio = xno; then 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.]) AC_DEFINE(IS_WIN32, 1, [1 if building for Win32.]) AC_DEFINE(IS_DARWIN, 0, [0 if not building for Darwin.]) - ;; + ;; *darwin*) is_darwin=yes @@ -496,7 +552,7 @@ case $host in AC_DEFINE(IS_WIN32, 0, [0 if not building for Win32.]) AC_DEFINE(IS_DARWIN, 1, [1 if building for Darwin.]) ;; - *) + *) if test x$parport_use_giveio = xyes; then AC_MSG_WARN([--enable-parport-giveio cannot be used by ]$host[ hosts]) fi @@ -680,12 +736,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 @@ -828,11 +884,8 @@ main( int argc, char **argv ) AC_MSG_RESULT([Skipping as we are cross-compiling]) ]) -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]) - AC_COMPILE_IFELSE([ +AC_MSG_CHECKING([for ftd2xx highspeed device support]) +AC_COMPILE_IFELSE([ #include "confdefs.h" #if IS_WIN32 #include "windows.h" @@ -841,18 +894,17 @@ if test $want_ftd2xx_highspeed != no; then #include DWORD x = FT_DEVICE_4232H; ], [ - AC_DEFINE(BUILD_FTD2XX_HIGHSPEED, [1], - [Support FT2232H/FT4232HS with FTD2XX.]) - build_ftd2xx_highspeed=yes + AC_DEFINE(BUILD_FT2232_HIGHSPEED, [1], + [Support FT2232H/FT4232HS with FTD2XX or libftdi.]) + build_ft2232_highspeed=yes ], [ - build_ftd2xx_highspeed=no + build_ft2232_highspeed=no ]) - AC_MSG_RESULT([$build_ftd2xx_highspeed]) + AC_MSG_RESULT([$build_ft2232_highspeed]) - if test $want_ftd2xx_highspeed = yes -a $build_ftd2xx_highspeed = no; then - AC_MSG_ERROR([You need a newer FTD2XX driver (version 0.4.16 or later).]) + if test $build_ft2232_highspeed = no; then + AC_MSG_WARN([You need a newer FTD2XX driver (version 2.04.16 or later).]) fi -fi LDFLAGS=$LDFLAGS_SAVE CFLAGS=$CFLAGS_SAVE @@ -862,7 +914,7 @@ if test $build_ft2232_libftdi = yes ; then # We assume: the package is preinstalled in the proper place # these present as 2 libraries.. LIBS="$LIBS -lftdi -lusb" - # + # # Try to build a small program. AC_MSG_CHECKING([Build & Link with libftdi...]) @@ -897,6 +949,24 @@ main( int argc, char **argv ) AC_MSG_RESULT([Skipping as we are cross-compiling]) ]) +AC_MSG_CHECKING([for libftdi highspeed device support]) +AC_COMPILE_IFELSE([ +#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 + ], [ + build_ft2232_highspeed=no + ]) + AC_MSG_RESULT([$build_ft2232_highspeed]) + + if test $build_ft2232_highspeed = no; then + AC_MSG_WARN([You need a newer libftdi version (0.16 or later).]) + fi + # Restore the 'unexpanded ldflags' LDFLAGS=$LDFLAGS_SAVE CFLAGS=$CFLAGS_SAVE @@ -905,7 +975,7 @@ fi # check for usb.h when a driver will require it if test $build_jlink = yes -o $build_vsllink = yes -o $build_usbprog = yes -o \ $build_rlink = yes -o $build_armjtagew = yes -then +then AC_CHECK_HEADERS([usb.h],[], [AC_MSG_ERROR([usb.h is required to build some OpenOCD driver(s)])]) fi @@ -970,7 +1040,7 @@ int main(int argc, char **argv) { char **ep = environ; } ]) if test "${has_environ}" != "yes" ; then - AC_MSG_FAILURE([Could not find 'environ' in unistd.h or available libraries.]) + AC_MSG_FAILURE([Could not find 'environ' in unistd.h or available libraries.]) fi AC_DEFINE([_GNU_SOURCE],[1],[Use GNU C library extensions (e.g. stdndup).])