X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=configure.in;h=627c26b8f973d491234039ac76d86c6d95c2248a;hb=0eed61b7c4cb31338562db426cea0d1a999e0d9f;hp=c5e81a2812cb4619033224c7bbd12bbb98279c0f;hpb=d80fca527a6618595a118381a2cd2a569f85889f;p=openocd.git

diff --git a/configure.in b/configure.in
index c5e81a2812..627c26b8f9 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,8 @@ AC_PREREQ(2.60)
 AC_INIT([openocd], [0.5.0-dev],
   [OpenOCD Mailing List <openocd-development@lists.berlios.de>])
 AC_CONFIG_SRCDIR([src/openocd.c])
-AC_CONFIG_AUX_DIR([.])
+
+m4_include(config_subdir.m4)dnl
 
 AM_INIT_AUTOMAKE([-Wall -Wno-portability dist-bzip2 dist-zip])
 AM_MAINTAINER_MODE
@@ -484,7 +485,7 @@ AC_ARG_ENABLE(minidriver_dummy,
   [build_minidriver_dummy=$enableval], [build_minidriver_dummy=no])
 
 AC_ARG_ENABLE(internal-jimtcl,
-  AS_HELP_STRING([--enable-internal-jimtcl], [Enable internal jimtcl]),
+  AS_HELP_STRING([--disable-internal-jimtcl], [Disable building internal jimtcl]),
   [use_internal_jimtcl=$enableval], [use_internal_jimtcl=yes])
 
 build_minidriver=no
@@ -763,7 +764,7 @@ fi
 
 if test "$use_internal_jimtcl" = yes; then
   if test -f "$srcdir/jimtcl/configure.ac"; then
-    AC_CONFIG_SUBDIRS([jimtcl])
+    AX_CONFIG_SUBDIR_OPTION([jimtcl], [--with-jim-ext=nvp --disable-lineedit])
   else
     AC_MSG_ERROR([jimtcl not found, run git submodule init and git submodule update.])
   fi