X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.in;h=1dea31ffee2dce1c5008df6b693d7b106c83b5d7;hp=deef708688ba0db4aa0fb343f4de9cc1bf2a24ee;hb=f56c2db5a7e0f25f550d23c30a77c797e48f4ae2;hpb=38a1ae728104bdcbcf57bffcc09648c29e210606

diff --git a/configure.in b/configure.in
index deef708688..1dea31ffee 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT([openocd], [0.2.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.
@@ -821,7 +824,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])
@@ -888,7 +893,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