aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer Oliver <ntfreak@users.sourceforge.net>2011-07-18 14:02:31 +0100
committerSpencer Oliver <ntfreak@users.sourceforge.net>2011-07-18 14:02:31 +0100
commitffbb5cd85caeffde06a36bc996238655e2808520 (patch)
tree1186f45b0ca8b525900a3424cf609d78bc97475e
parent5e7c8d074c9de94d16210406baa1fd2872dc79e7 (diff)
build: do not install jimtcl
We now make use of the new jimtcl --disable-install-jim Now we can install openocd without jimtcl bring installed. Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>
-rw-r--r--Makefile.am2
-rw-r--r--configure.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 1b19ba43..461bca49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
AUTOMAKE_OPTIONS = gnu 1.6
# make sure we pass the correct jimtcl flags to distcheck
-DISTCHECK_CONFIGURE_FLAGS = --with-jim-ext=nvp --disable-lineedit
+DISTCHECK_CONFIGURE_FLAGS = --with-jim-ext=nvp --disable-lineedit --disable-install-jim
nobase_dist_pkgdata_DATA = \
contrib/libdcc/dcc_stdio.c \
diff --git a/configure.in b/configure.in
index 8c77a255..a1ca0058 100644
--- a/configure.in
+++ b/configure.in
@@ -774,7 +774,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