X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=configure.in;h=cce438fe076e67044a163451b3f9d87629e430e4;hp=ae35f555b643e9e883fcd0423db1b6da992d2fc4;hb=cebfbfa661b4e53cabf23bbb32c227e0b1962c77;hpb=7280d4a2c74f444e81d5a2df8b77a2f184f5e6d1

diff --git a/configure.in b/configure.in
index ae35f555b6..cce438fe07 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,11 @@
 AC_PREREQ(2.59)
 AC_INIT(configure.in)
 
-AC_SEARCH_LIBS([ioperm], [ioperm])
-
 AC_CANONICAL_HOST
 
+AC_SEARCH_LIBS([ioperm], [ioperm])
+AC_SEARCH_LIBS([dlopen], [dl])
+
 AC_CHECK_HEADERS(jtag_minidriver.h)
 AC_CHECK_HEADERS(sys/param.h)
 AC_CHECK_HEADERS(sys/time.h)
@@ -99,6 +100,10 @@ AC_ARG_ENABLE(oocd_trace,
   AS_HELP_STRING([--enable-oocd_trace], [Enable building support for the OpenOCD+trace ETM capture device]),
   [build_oocd_trace=$enableval], [build_oocd_trace=no])
 
+AC_ARG_ENABLE(jlink,
+  AS_HELP_STRING([--enable-jlink], [Enable building support for the Segger J-Link JTAG Programmer]),
+  [build_jlink=$enableval], [build_jlink=no])
+
 AC_ARG_WITH(ftd2xx,
         [AS_HELP_STRING(--with-ftd2xx,
            [Where libftd2xx can be found <default=search>])],
@@ -251,6 +256,12 @@ else
   AC_DEFINE(BUILD_OOCD_TRACE, 0, [0 if you don't want the OpenOCD+trace ETM capture driver.])
 fi
 
+if test $build_jlink = yes; then
+  AC_DEFINE(BUILD_JLINK, 1, [1 if you want the J-Link JTAG driver.])
+else
+  AC_DEFINE(BUILD_JLINK, 0, [0 if you don't want the J-Link JTAG driver.])
+fi
+
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(openocd, 1.0)
 
@@ -269,6 +280,7 @@ AM_CONDITIONAL(PRESTO_LIBFTDI, test $build_presto_libftdi = yes)
 AM_CONDITIONAL(PRESTO_FTD2XX, test $build_presto_ftd2xx = yes)
 AM_CONDITIONAL(USBPROG, test $build_usbprog = yes)
 AM_CONDITIONAL(OOCD_TRACE, test $build_oocd_trace = yes)
+AM_CONDITIONAL(JLINK, test $build_jlink = yes)
 AM_CONDITIONAL(IS_CYGWIN, test $is_cygwin = yes)
 AM_CONDITIONAL(IS_MINGW, test $is_mingw = yes)
 AM_CONDITIONAL(IS_WIN32, test $is_win32 = yes)
@@ -278,6 +290,12 @@ AM_CONDITIONAL(BITQ, test $build_bitq = yes)
 AC_LANG_C
 AC_PROG_CC
 AC_PROG_RANLIB
+AC_PATH_PROG(TCLSH, tclsh)
+
+# quit if we have no tclsh
+if test "x${TCLSH}" = "x"; then
+	AC_MSG_ERROR([no working tclsh found])
+fi
 
 AC_SUBST(WITH_FTD2XX, $with_ftd2xx)