X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=configure.ac;h=2d5cb5e29c208910ecb456215f4511b38e0c5d09;hb=c7bdce33e2edd3b9d6d0eb85d38e7cac8e0a4e6e;hp=95b2d50ae1a82ddc8ccb8e9140ec9f695f3a7cc2;hpb=bd4bd54b60b3297b746d3d5379f25d54846ce517;p=openocd.git

diff --git a/configure.ac b/configure.ac
index 95b2d50ae1..2d5cb5e29c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,12 @@ AC_PROG_CC
 m4_version_prereq([2.70],[],[AC_PROG_CC_C99])
 AM_PROG_CC_C_O
 AC_PROG_RANLIB
+
+# If macro PKG_PROG_PKG_CONFIG is not available, Autoconf generates a misleading error message,
+# so check for existence first, and otherwise provide helpful advice.
+m4_ifndef([PKG_PROG_PKG_CONFIG], [m4_fatal(m4_normalize([
+  Macro PKG_PROG_PKG_CONFIG is not available.
+  It is usually defined in file pkg.m4 provided by package pkg-config.]))])
 PKG_PROG_PKG_CONFIG([0.23])
 
 dnl disable checks for C++, Fortran and GNU Java Compiler
@@ -570,9 +576,9 @@ AS_IF([test "x$enable_buspirate" != "xno"], [
 AS_IF([test "x$use_internal_jimtcl" = "xyes"], [
   AS_IF([test -f "$srcdir/jimtcl/configure.ac"], [
     AS_IF([test "x$use_internal_jimtcl_maintainer" = "xyes"], [
-      jimtcl_config_options="--disable-install-jim --maintainer"
+      jimtcl_config_options="--disable-install-jim --with-ext=json --maintainer"
     ], [
-      jimtcl_config_options="--disable-install-jim"
+      jimtcl_config_options="--disable-install-jim --with-ext=json"
     ])
     AX_CONFIG_SUBDIR_OPTION([jimtcl], [$jimtcl_config_options])
   ], [