X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.in;h=a1ca0058015dd7a854dd767bce1a9de633b3743a;hp=a3323765b80443548355162253d7a3f4e3c24f4e;hb=29f0ac0efd112f058fc2058665bb66daa80fb9f7;hpb=6dbe9b71241172193428d9fa77e59945dc455e78 diff --git a/configure.in b/configure.in index a3323765b8..a1ca005801 100644 --- a/configure.in +++ b/configure.in @@ -472,6 +472,10 @@ 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]) @@ -485,7 +489,7 @@ AC_ARG_ENABLE(minidriver_dummy, [build_minidriver_dummy=$enableval], [build_minidriver_dummy=no]) AC_ARG_ENABLE(internal-jimtcl, - AS_HELP_STRING([--enable-internal-jimtcl], [Enable internal jimtcl]), + AS_HELP_STRING([--disable-internal-jimtcl], [Disable building internal jimtcl]), [use_internal_jimtcl=$enableval], [use_internal_jimtcl=yes]) build_minidriver=no @@ -538,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.]) @@ -750,6 +754,12 @@ 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 @@ -764,7 +774,7 @@ 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]) + AX_CONFIG_SUBDIR_OPTION([jimtcl], [--with-jim-ext=nvp --disable-lineedit --disable-install-jim]) else AC_MSG_ERROR([jimtcl not found, run git submodule init and git submodule update.]) fi @@ -863,14 +873,23 @@ if test $build_ft2232_ftd2xx = yes -o $build_presto_ftd2xx = yes ; then AC_MSG_ERROR([Option: --with-ftd2xx-linux-tardir appears wrong, cannot find: ${FTD2XX_H}]) fi CFLAGS="$CFLAGS -I$with_ftd2xx_linux_tardir" - FTD2XX_LDFLAGS="-L$with_ftd2xx_linux_tardir" - FTD2XX_LIB="-lftd2xx" - if test $with_ftd2xx_lib != shared; then - # Test #1 - Future proof - if/when ftdichip fixes their distro. - # Try it with the simple ".a" suffix. - FTD2XX_LIB="$with_ftd2xx_linux_tardir/static_lib/libftd2xx.a" - if test -f "${FTD2XX_LIB}"; then - FTD2XX_LDFLAGS="${FTD2XX_LDFLAGS}/static_lib" + if test $with_ftd2xx_lib = shared; then + FTD2XX_LDFLAGS="-L$with_ftd2xx_linux_tardir" + FTD2XX_LIB="-lftd2xx" + else + # Test #1 - v1.0.x + case "$host_cpu" in + i?86|x86_32) + dir=build/i386;; + amd64|x86_64) + dir=build/x86_64;; + *) + dir=none;; + esac + if test -f "$with_ftd2xx_linux_tardir/$dir/libftd2xx.a"; then + FTD2XX_LDFLAGS="-L$with_ftd2xx_linux_tardir/$dir" + # Also needs -lrt + FTD2XX_LIB="-lftd2xx -lrt" else # Test Number2. # Grr.. perhaps it exists as a version number? @@ -918,22 +937,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]) @@ -942,15 +956,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 @@ -982,13 +997,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 ){ @@ -997,8 +1009,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]) @@ -1007,11 +1018,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 @@ -1032,7 +1044,7 @@ 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)])]) @@ -1063,6 +1075,7 @@ 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) @@ -1079,12 +1092,12 @@ 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 ], [ @@ -1092,10 +1105,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 ], [ @@ -1174,9 +1187,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