[Openocd-svn] r2456 - trunk

[<zw...@ma...>]

Author: zwelch
Date: 2009-07-02 13:17:14 +0200 (Thu, 02 Jul 2009)
New Revision: 2456

Modified:
   trunk/README
   trunk/configure.in
Log:
Remove --enable-release option; if guess-rev.sh is missing, it is a release.


Modified: trunk/README
===================================================================
--- trunk/README	2009-07-02 11:17:04 UTC (rev 2455)
+++ trunk/README	2009-07-02 11:17:14 UTC (rev 2456)
@@ -252,11 +252,6 @@
   --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

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2009-07-02 11:17:04 UTC (rev 2455)
+++ trunk/configure.in	2009-07-02 11:17:14 UTC (rev 2456)
@@ -89,17 +89,20 @@
 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
+  # 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)
 
-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)
+  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.