X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=configure.in;h=3c0056ccc49acb62468d1ca13946097cb1dfc2be;hb=8ff6097e2317c8e668a21c38b8ba32db1ea70509;hp=8c77a2554ae036b211f8722f7316bbcf3dcbdb0e;hpb=107ddb38b7450f46bd812f52208e43c073e71af6;p=openocd.git

diff --git a/configure.in b/configure.in
index 8c77a2554a..3c0056ccc4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_PREREQ(2.60)
-AC_INIT([openocd], [0.5.0-dev],
+AC_INIT([openocd], [0.6.0-dev],
   [OpenOCD Mailing List <openocd-development@lists.berlios.de>])
 AC_CONFIG_SRCDIR([src/openocd.c])
 
@@ -143,20 +143,14 @@ is_mingw=no
 is_win32=no
 is_darwin=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)
-
-  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)
+# guess-rev.sh only exists in the repository, not in the released archives
+AC_MSG_CHECKING([whether to build a release])
+if test -f $srcdir/guess-rev.sh ; then
+  build_release=no
 else
   build_release=yes
 fi
+AC_MSG_RESULT($build_release)
 
 # We are not *ALWAYS* being installed in the standard place.
 # We may be installed in a "tool-build" specific location.
@@ -774,7 +768,7 @@ fi
 
 if test "$use_internal_jimtcl" = yes; then
   if test -f "$srcdir/jimtcl/configure.ac"; then
-    AX_CONFIG_SUBDIR_OPTION([jimtcl], [--with-jim-ext=nvp --disable-lineedit])
+    AX_CONFIG_SUBDIR_OPTION([jimtcl], [--with-jim-ext=nvp --disable-lineedit --disable-install-jim])
   else
     AC_MSG_ERROR([jimtcl not found, run git submodule init and git submodule update.])
   fi