From: Spencer Oliver Date: Mon, 18 Jul 2011 13:02:31 +0000 (+0100) Subject: build: do not install jimtcl X-Git-Tag: v0.5.0~17 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=ffbb5cd85caeffde06a36bc996238655e2808520 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 --- diff --git a/Makefile.am b/Makefile.am index 1b19ba4360..461bca4999 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 8c77a2554a..a1ca005801 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