Remove --enable-release option; if guess-rev.sh is missing, it is a release.

[openocd.git] / configure.in

diff --git a/configure.in b/configure.in
index 711ea557629a10fa1b3d7b797792f3cc5f7e0395..5ce3ff3c3d8d0c8308be915f924c8ee04b2d580d 100644 (file)
--- 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.
@@ -823,7 +826,7 @@ main( int argc, char **argv )
     AC_MSG_ERROR([Cannot build & run test program using ftd2xx.lib])
   ] )
 
-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])