X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=configure.in;h=79e80dd5b4b3ca6d4abb90ee2d863abdb802f65c;hb=e9b919fbc67a12f8825732f028b33c66e8321e11;hp=5ce3ff3c3d8d0c8308be915f924c8ee04b2d580d;hpb=00fad24996d6642c6a820cc951c197dddef5734a;p=openocd.git diff --git a/configure.in b/configure.in index 5ce3ff3c3d..79e80dd5b4 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.3.0-in-development], [OpenOCD Mailing List ]) AC_CONFIG_SRCDIR([src/openocd.c]) @@ -308,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], @@ -453,6 +453,7 @@ esac 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]) @@ -474,6 +475,7 @@ case $host in *-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]) @@ -824,7 +826,9 @@ 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 highspeed device support]) AC_MSG_RESULT([$want_ftd2xx_highspeed]) @@ -891,7 +895,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