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

git-svn-id: svn://svn.berlios.de/openocd/trunk@2456 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/README b/README
index 07ccac1839149eaf3cb7c45c73db9d603f114f58..6b844270b3d17112baab8b215e30f85d1f796762 100644 (file)
--- a/README
+++ b/README
@@ -252,11 +252,6 @@ The following additional options may also be useful:
   --disable-wextra        Disable extra compiler warnings
   --disable-werror        Do not treat warnings as errors
 
-  --enable-release        Enable building of an OpenOCD release.  This
-                         option is intended for project maintainers.
-                         It simply omits the svn version string when
-                         the openocd -v is executed (to KISS).
-
   --disable-option-checking
                           Ignore unrecognized --enable and --with options.
   --disable-dependency-tracking  speeds up one-time build

diff --git a/configure.in b/configure.in
index 082b1e65af03382b4c777d202ee24769b116116e..5ce3ff3c3d8d0c8308be915f924c8ee04b2d580d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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.