Don't require tclsh for building without utf-8

Signed-off-by: Steve Bennett <steveb@workware.net.au>

3 files changed, 18 insertions, 12 deletions

diff --git a/Makefile.in b/Makefile.in
index de25fdf..4197e57 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,11 +78,13 @@ test:
 
 $(OBJS) $(EXTENSION_OBJS): Makefile
 
+ifneq (@JIM_UTF8@,)
 # Generate the unicode case mapping
 utf8.o: unicode_mapping.c
 
 unicode_mapping.c: @SRCDIR@/UnicodeData.txt @SRCDIR@/parse-unidata.tcl
 	tclsh @SRCDIR@/parse-unidata.tcl @SRCDIR@/UnicodeData.txt >$@
+endif
 
 ifeq ($(jim_libtype),static)
 $(LIBJIM): $(OBJS) $(EXTENSION_OBJS)
diff --git a/configure b/configure
index 41396f9..a81c71a 100755
--- a/configure
+++ b/configure
@@ -613,6 +613,7 @@ JIM_TCL_EXTENSIONS
 JIM_MOD_EXTENSIONS
 JIM_EXTENSIONS
 JIM_LIBTYPE
+JIM_UTF8
 LINKFLAGS
 SHOBJ_LDFLAGS
 SHOBJ_CFLAGS
@@ -3828,6 +3829,8 @@ if test "${enable_utf8+set}" = set; then :
   enableval=$enable_utf8;
         if test "x$enableval" = "xyes" ; then
                         EXTRA_CFLAGS="$EXTRA_CFLAGS -DJIM_UTF8 -DJIM_REGEXP"
+            JIM_UTF8=1
+
         fi
 
 
@@ -4056,11 +4059,11 @@ done
 for i in $ext_default $with_jim_ext $with_jim_extmod; do
     in_list "$i" "$with_out_jim_ext" && continue
     eval "libs=\$libs_$i"
-	needed_libs="$needed_libs $libs"
+    needed_libs="$needed_libs $libs"
 done
 
 if in_list dl "$needed_libs"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
 $as_echo_n "checking for library containing dlopen... " >&6; }
 if ${ac_cv_search_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -4120,7 +4123,7 @@ fi
 
 fi
 if in_list readline "$needed_libs"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing readline" >&5
 $as_echo_n "checking for library containing readline... " >&6; }
 if ${ac_cv_search_readline+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -4180,7 +4183,7 @@ fi
 
 fi
 if in_list sqlite "$needed_libs"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqlite_open" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqlite_open" >&5
 $as_echo_n "checking for library containing sqlite_open... " >&6; }
 if ${ac_cv_search_sqlite_open+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -4240,7 +4243,7 @@ fi
 
 fi
 if in_list sqlite3 "$needed_libs"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqlite3_open" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqlite3_open" >&5
 $as_echo_n "checking for library containing sqlite3_open... " >&6; }
 if ${ac_cv_search_sqlite3_open+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -4300,7 +4303,7 @@ fi
 
 fi
 if in_list socket "$needed_libs"; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
 $as_echo_n "checking for library containing socket... " >&6; }
 if ${ac_cv_search_socket+:} false; then :
   $as_echo_n "(cached) " >&6
diff --git a/configure.ac b/configure.ac
index 7d0f05a..9d33a81 100755
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,7 @@ AC_ARG_ENABLE(utf8,
         if test "x$enableval" = "xyes" ; then
             dnl Note that utf-8 support requires the built-in regexp
             EXTRA_CFLAGS="$EXTRA_CFLAGS -DJIM_UTF8 -DJIM_REGEXP"
+            AC_SUBST(JIM_UTF8,1)
         fi
     ]
 )
@@ -260,24 +261,24 @@ dnl Now what libraries may we need?
 for i in $ext_default $with_jim_ext $with_jim_extmod; do
     in_list "$i" "$with_out_jim_ext" && continue
     eval "libs=\$libs_$i"
-	needed_libs="$needed_libs $libs"
+    needed_libs="$needed_libs $libs"
 done
 
 dnl Don't need to search for libs if the corresponding extensions aren't enabled
 if in_list dl "$needed_libs"; then
-	AC_SEARCH_LIBS(dlopen, dl, have_dlopen=yes; AC_DEFINE([HAVE_DLOPEN],[1],[Have the dlopen function]))
+    AC_SEARCH_LIBS(dlopen, dl, have_dlopen=yes; AC_DEFINE([HAVE_DLOPEN],[1],[Have the dlopen function]))
 fi
 if in_list readline "$needed_libs"; then
-	AC_SEARCH_LIBS(readline, readline, AC_DEFINE([HAVE_READLINE],[1],[Have libreadline]))
+    AC_SEARCH_LIBS(readline, readline, AC_DEFINE([HAVE_READLINE],[1],[Have libreadline]))
 fi
 if in_list sqlite "$needed_libs"; then
-	AC_SEARCH_LIBS(sqlite_open, sqlite, AC_DEFINE([HAVE_SQLITE],[1],[Have libsqlite]))
+    AC_SEARCH_LIBS(sqlite_open, sqlite, AC_DEFINE([HAVE_SQLITE],[1],[Have libsqlite]))
 fi
 if in_list sqlite3 "$needed_libs"; then
-	AC_SEARCH_LIBS(sqlite3_open, sqlite3, AC_DEFINE([HAVE_SQLITE3],[1],[Have libsqlite3]))
+    AC_SEARCH_LIBS(sqlite3_open, sqlite3, AC_DEFINE([HAVE_SQLITE3],[1],[Have libsqlite3]))
 fi
 if in_list socket "$needed_libs"; then
-	AC_SEARCH_LIBS(socket, socket)
+    AC_SEARCH_LIBS(socket, socket)
 fi
 
 dnl Look for environ. If it is declared in unistd, no need to declare it