- Bring all the ftdi names inline in the cfg scripts. scripts will now work for eithe...

[openocd.git] / configure.in

diff --git a/configure.in b/configure.in
index 9250dc58385b09abf43f199ec099ed31d355e290..79a650cc6d25afac56d77dfe673c15c0b94e621c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 AC_PREREQ(2.60)
-AC_INIT([openocd], [0.2.0-in-development],
+AC_INIT([openocd], [0.3.0-in-development],
   [OpenOCD Mailing List <openocd-development@lists.berlios.de>])
 AC_CONFIG_SRCDIR([src/openocd.c])
 
-AM_INIT_AUTOMAKE([-Wall -Wno-portability])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability dist-bzip2 dist-zip])
 AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
@@ -89,17 +89,20 @@ is_cygwin=no
 is_mingw=no
 is_win32=no
 is_darwin=no
-build_release=yes
-
-AC_ARG_ENABLE(release,
-  AS_HELP_STRING([--enable-release], [Enable Release Build, default no]),
-  [build_release=$enableval], [build_release=no])
 
 if test $cross_compiling = no; then
-  if test $build_release = no; then
-    # check we can find guess-rev.sh
-    AC_CHECK_FILE("$srcdir/guess-rev.sh", build_release=no, build_release=yes)
+  # guess-rev.sh only exists in the repository, not in the released archives
+  AC_CHECK_FILE("$srcdir/guess-rev.sh", has_guess_rev=yes, has_guess_rev=no)
+
+  AC_MSG_CHECKING([whether to build a release])
+  if test $has_guess_rev = no; then
+    build_release=yes
+  else
+    build_release=no
   fi
+  AC_MSG_RESULT($build_release)
+else
+  build_release=yes
 fi
 
 # We are not *ALWAYS* being installed in the standard place.
@@ -305,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],
@@ -322,7 +325,7 @@ AC_ARG_ENABLE(ft2232_ftd2xx,
 
 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=maybe])
+  [want_ftd2xx_highspeed=$enableval], [want_ftd2xx_highspeed=no])
  
 AC_ARG_ENABLE(amtjtagaccel,
   AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]), 
@@ -450,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])
@@ -463,6 +467,10 @@ 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.])
@@ -471,6 +479,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])
@@ -821,9 +830,11 @@ 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 device support])
+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])
@@ -888,7 +899,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