build: add autobuild jimtcl to configure scripts

Rather than having to configure/build jimtcl openocd
will do this as part of its own build.

To use an external jimtcl lib specify disable-internal-jimtcl
to the configure step.

Signed-off-by: Spencer Oliver <ntfreak@users.sourceforge.net>

diff --git a/Makefile.am b/Makefile.am
index 7d42fd3f7e0d90a0ebeeafa85c196e8f9c749fb0..b31bcea9195be838ac5fe08c30afd082df69fdb8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,13 @@ nobase_dist_pkgdata_DATA = \
        contrib/libdcc/README \
        contrib/openocd.udev
 
-SUBDIRS = src doc
+if INTERNAL_JIMTCL
+SUBDIRS = jimtcl
+else
+SUBDIRS =
+endif
+
+SUBDIRS += src doc
 
 EXTRA_DIST = \
        Doxyfile.in \

diff --git a/common.mk b/common.mk
index d2273d78827229601716be8638f782947e14887e..c1a5e6c66e45ab8e67aedd9b01c350bca55704db 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -3,3 +3,8 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src \
                          -I$(top_builddir)/src \
                          -DPKGDATADIR=\"$(pkgdatadir)\"
+
+if INTERNAL_JIMTCL
+AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \
+                          -I$(top_builddir)/jimtcl
+endif

diff --git a/configure.in b/configure.in
index 70dddb95e4b6a494758d9df19a6fafd28fb4bf59..c5e81a2812cb4619033224c7bbd12bbb98279c0f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,6 +2,7 @@ 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([.])
 
 AM_INIT_AUTOMAKE([-Wall -Wno-portability dist-bzip2 dist-zip])
 AM_MAINTAINER_MODE
@@ -482,6 +483,9 @@ AC_ARG_ENABLE(minidriver_dummy,
   AS_HELP_STRING([--enable-minidriver-dummy], [Enable the dummy minidriver.]),
   [build_minidriver_dummy=$enableval], [build_minidriver_dummy=no])
 
+AC_ARG_ENABLE(internal-jimtcl,
+  AS_HELP_STRING([--enable-internal-jimtcl], [Enable internal jimtcl]),
+  [use_internal_jimtcl=$enableval], [use_internal_jimtcl=yes])
 
 build_minidriver=no
 AC_MSG_CHECKING([whether to enable ZY1000 minidriver])
@@ -757,6 +761,14 @@ else
   AC_DEFINE(BUILD_BUSPIRATE, 0, [0 if you don't want the Buspirate JTAG driver.])
 fi
 
+if test "$use_internal_jimtcl" = yes; then
+  if test -f "$srcdir/jimtcl/configure.ac"; then
+    AC_CONFIG_SUBDIRS([jimtcl])
+  else
+    AC_MSG_ERROR([jimtcl not found, run git submodule init and git submodule update.])
+  fi
+fi
+
 #-- Deal with MingW/Cygwin FTD2XX issues
 
 if test $is_win32 = yes; then
@@ -1062,6 +1074,8 @@ AM_CONDITIONAL(BITQ, test $build_bitq = yes)
 AM_CONDITIONAL(MINIDRIVER, test $build_minidriver = yes)
 AM_CONDITIONAL(MINIDRIVER_DUMMY, test $build_minidriver_dummy = yes)
 
+AM_CONDITIONAL(INTERNAL_JIMTCL, test $use_internal_jimtcl = yes)
+
 # Look for environ alternatives.  Possibility #1: is environ in unistd.h or stdlib.h?
 AC_MSG_CHECKING([for environ in unistd.h and stdlib.h])
 AC_COMPILE_IFELSE([

diff --git a/jimtcl b/jimtcl
index fbbc8e0b402adb4b0c8d3976015fe4a82c94560f..9c8bcfe4e6f8ec12552edae7b2afa0a9a21d8861 160000 (submodule)
--- a/jimtcl
+++ b/jimtcl
@@ -1 +1 @@
-Subproject commit fbbc8e0b402adb4b0c8d3976015fe4a82c94560f
+Subproject commit 9c8bcfe4e6f8ec12552edae7b2afa0a9a21d8861

diff --git a/src/Makefile.am b/src/Makefile.am
index c2d37c1010601cb18e300c0e365270e03a3f964d..77449862dadc8547a91075877080131aaeaa08a4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,13 @@ MAINFILE = main.c
 endif
 
 openocd_SOURCES = $(MAINFILE)
-openocd_LDADD = libopenocd.la -ljim
+openocd_LDADD = libopenocd.la
+
+if INTERNAL_JIMTCL
+openocd_LDADD += $(top_builddir)/jimtcl/libjim.a
+else
+openocd_LDADD += -ljim
+endif
 
 libopenocd_la_SOURCES = \
        hello.c \