This is an automated email from Gerrit.

Tomasz CEDRO ([email protected]) just uploaded a new patch set to Gerrit, which 
you can find at http://openocd.zylin.com/1014

-- gerrit

commit 716ad16a784f1baf8c22d878eb4463433df0d37e
Author: Tomek CEDRO <[email protected]>
Date:   Wed Oct 24 00:18:24 2012 +0200

    Added LibSWD to autoconf scripts and the --disable-internal-libswd switch 
that can disable build of internal libswd submodule just in the same way as 
JimTCL integration works.
    
    Change-Id: I9c1a90dbc595ad51047aa6e77feb1af083b77e34
    Signed-off-by: Tomek CEDRO <[email protected]>

diff --git a/configure.ac b/configure.ac
index d61dcc1..dadeef9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -499,6 +499,10 @@ AC_ARG_ENABLE([internal-jimtcl],
   AS_HELP_STRING([--disable-internal-jimtcl], [Disable building internal 
jimtcl]),
   [use_internal_jimtcl=$enableval], [use_internal_jimtcl=yes])
 
+AC_ARG_ENABLE(internal-libswd,
+  AS_HELP_STRING([--disable-internal-libswd], [Disable building internal 
libswd]),
+  [use_internal_libswd=$enableval], [use_internal_libswd=yes])
+
 AC_ARG_ENABLE([libusb0],
   AS_HELP_STRING([--enable-libusb0], [Use libusb-0.1 library for USB JTAG 
devices]),
   [check_libusb0=$enableval], [check_libusb0=no])
@@ -816,6 +820,14 @@ if test "$use_internal_jimtcl" = yes; then
   fi
 fi
 
+if test "$use_internal_libswd" = yes; then
+  if test -f "$srcdir/submodules/libswd/configure.ac"; then
+    AX_CONFIG_SUBDIR_OPTION([submodules/libswd])
+  else
+    AC_MSG_ERROR([libswd not found, run git submodule init and git submodule 
update.])
+  fi
+fi  
+
 if test $build_remote_bitbang = yes; then
   build_bitbang=yes
   AC_DEFINE([BUILD_REMOTE_BITBANG], [1], [1 if you want the Remote Bitbang 
JTAG driver.])
@@ -1210,6 +1222,7 @@ AM_CONDITIONAL([MINIDRIVER], [test $build_minidriver = 
ye]s)
 AM_CONDITIONAL([MINIDRIVER_DUMMY], [test $build_minidriver_dummy = yes])
 
 AM_CONDITIONAL([INTERNAL_JIMTCL], [test $use_internal_jimtcl = yes])
+AM_CONDITIONAL(INTERNAL_LIBSWD, test $use_internal_libswd = 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])

-- 

------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to