Remove tcl support and internal lubheap

git-svn-id: https://klish.googlecode.com/svn/trunk@594 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb

Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.4 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19,6 +19,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -237,6 +254,11 @@ DIST_SOURCES = $(libclish_la_SOURCES) $(libkonf_la_SOURCES) \
 	$(liblub_la_SOURCES) $(libtinyrl_la_SOURCES) \
 	$(libtinyxml_la_SOURCES) $(bin_clish_SOURCES) \
 	$(bin_konf_SOURCES) $(bin_konfd_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(nobase_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -301,8 +323,6 @@ LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
-LUBHEAP_CFLAGS = @LUBHEAP_CFLAGS@
-LUBHEAP_LIBS = @LUBHEAP_LIBS@
 LUB_CFLAGS = @LUB_CFLAGS@
 LUB_LIBS = @LUB_LIBS@
 MAKEINFO = @MAKEINFO@
@@ -329,9 +349,6 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-TCL_CFLAGS = @TCL_CFLAGS@
-TCL_LIBS = @TCL_LIBS@
-TCL_VERSION = @TCL_VERSION@
 TINYRL_CFLAGS = @TINYRL_CFLAGS@
 TINYRL_LIBS = @TINYRL_LIBS@
 TINYXML_CXXFLAGS = @TINYXML_CXXFLAGS@
@@ -464,7 +481,7 @@ libclish_la_SOURCES = clish/callback_access.c clish/callback_script.c \
 	clish/action/action.c clish/action/action_dump.c \
 	clish/action/private.h clish/config/config.c \
 	clish/config/config_dump.c clish/config/private.h
-libclish_la_CFLAGS = @LUB_CFLAGS@ @LUBHEAP_CFLAGS@ $(DEBUG_CFLAGS)
+libclish_la_CFLAGS = @LUB_CFLAGS@ $(DEBUG_CFLAGS)
 libclish_la_LIBADD = \
 	liblub.la \
 	libtinyrl.la \
@@ -569,7 +586,6 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 install-libLIBRARIES: $(lib_LIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -577,6 +593,8 @@ install-libLIBRARIES: $(lib_LIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; }
 	@$(POST_INSTALL)
@@ -599,7 +617,6 @@ clean-libLIBRARIES:
 	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -607,6 +624,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) '$(DESTDIR)$(libdir)' || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -982,8 +1001,11 @@ libtinyxml.la: $(libtinyxml_la_OBJECTS) $(libtinyxml_la_DEPENDENCIES) $(EXTRA_li
 	$(libtinyxml_la_LINK) -rpath $(libdir) $(libtinyxml_la_OBJECTS) $(libtinyxml_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -1698,15 +1720,18 @@ distclean-libtool:
 	-rm -f libtool config.lt
 install-nobase_includeHEADERS: $(nobase_include_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
+	fi; \
 	$(am__nobase_list) | while read dir files; do \
 	  xfiles=; for file in $$files; do \
 	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
 	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
 	  test -z "$$xfiles" || { \
 	    test "x$$dir" = x. || { \
-	      echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
 	      $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
 	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
 	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
@@ -2128,23 +2153,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libLIBRARIES \
 	uninstall-nobase_includeHEADERS
 
 
-@TCL_TRUE@	bin_PROGRAMS += bin/tclish@TCL_VERSION@
-
-@TCL_TRUE@	bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
-@TCL_TRUE@		bin/tclish_fini_callback.c \
-@TCL_TRUE@		bin/tclish_init_callback.c \
-@TCL_TRUE@		bin/tclish_script_callback.c \
-@TCL_TRUE@		bin/tclish_show_result.c
-
-@TCL_TRUE@	bin_tclish@TCL_VERSION@_LDADD = \
-@TCL_TRUE@		libclish.la \
-@TCL_TRUE@		libkonf.la \
-@TCL_TRUE@		libtinyrl.la \
-@TCL_TRUE@		libtinyxml.la \
-@TCL_TRUE@		liblub.la \
-@TCL_TRUE@		@TCL_LIBS@ \
-@TCL_TRUE@		@BFD_LIBS@
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aclocal.m4

@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.4 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -8647,7 +8647,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.11.4], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -8663,7 +8663,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.4])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

aux_scripts/compile

@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-03-05.13; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
 # Software Foundation, Inc.
@@ -79,6 +79,48 @@ func_file_conv ()
   esac
 }
 
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
 # func_cl_wrapper cl arg...
 # Adjust compile command to suit cl
 func_cl_wrapper ()
@@ -109,43 +151,34 @@ func_cl_wrapper ()
 	      ;;
 	  esac
 	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
 	-I*)
 	  func_file_conv "${1#-I}" mingw
 	  set x "$@" -I"$file"
 	  shift
 	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
 	-l*)
-	  lib=${1#-l}
-	  found=no
-	  save_IFS=$IFS
-	  IFS=';'
-	  for dir in $lib_path $LIB
-	  do
-	    IFS=$save_IFS
-	    if $shared && test -f "$dir/$lib.dll.lib"; then
-	      found=yes
-	      set x "$@" "$dir/$lib.dll.lib"
-	      break
-	    fi
-	    if test -f "$dir/$lib.lib"; then
-	      found=yes
-	      set x "$@" "$dir/$lib.lib"
-	      break
-	    fi
-	  done
-	  IFS=$save_IFS
-
-	  test "$found" != yes && set x "$@" "$lib.lib"
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
 	  shift
 	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
 	-L*)
-	  func_file_conv "${1#-L}"
-	  if test -z "$lib_path"; then
-	    lib_path=$file
-	  else
-	    lib_path="$lib_path;$file"
-	  fi
-	  linker_opts="$linker_opts -LIBPATH:$file"
+	  func_cl_dashL "${1#-L}"
 	  ;;
 	-static)
 	  shared=false

aux_scripts/config.guess

@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-01-01'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2012-01-01'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -863,6 +861,13 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -1320,6 +1325,9 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

aux_scripts/config.sub

@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-01-01'
+timestamp='2012-02-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2012-01-01'
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -132,6 +130,10 @@ case $maybe_os in
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -247,6 +249,7 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
@@ -319,7 +322,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -332,7 +335,10 @@ case $basic_machine in
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -355,6 +361,7 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \

aux_scripts/depcomp

@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2012-03-27.16; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ scriptversion=2011-12-04.11; # UTC
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,8 +40,8 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
   tmpdepfile  Temporary file to use when outputting dependencies.
@@ -57,6 +57,12 @@ EOF
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -102,6 +108,12 @@ if test "$depmode" = msvc7msys; then
    depmode=msvc7
 fi
 
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -156,15 +168,14 @@ gcc)
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
@@ -203,18 +214,15 @@ sgi)
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -226,10 +234,17 @@ sgi)
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -259,12 +274,11 @@ aix)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -275,23 +289,26 @@ aix)
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -300,15 +317,21 @@ icc)
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Each line is of the form 'foo.o: dependent.h',
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -344,7 +367,7 @@ hp2)
   done
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
@@ -359,9 +382,9 @@ hp2)
 
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
+   # dependencies in 'foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    test "x$dir" = "x$object" && dir=
@@ -407,8 +430,7 @@ tru64)
    done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
@@ -443,11 +465,11 @@ msvc7)
   p
 }' | $cygpath_u | sort -u | sed -n '
 s/ /\\ /g
-s/\(.*\)/	\1 \\/p
+s/\(.*\)/'"$tab"'\1 \\/p
 s/.\(.*\) \\/\1:/
 H
 $ {
-  s/.*/	/
+  s/.*/'"$tab"'/
   G
   p
 }' >> "$depfile"
@@ -478,7 +500,7 @@ dashmstdout)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -498,15 +520,14 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
+  tr ' ' "$nl" < "$tmpdepfile" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -562,8 +583,7 @@ makedepend)
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -583,7 +603,7 @@ cpp)
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -652,8 +672,8 @@ msvisualcpp)
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;

bin/lubheap.c

@@ -1,49 +0,0 @@
-/*
- * This program provides a wrapper to another command but ensuring that the
- * lubheap memory management system is used in preference to the native one
- */
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "lub/heap.h"
-
-
-void
-usage(const char *prog)
-{
-    printf("%s [-l] command [args ...]\n"
-           "\n"
-           "    This application invokes the specified\n"
-           "    command utilsing the lubheap memory management\n"
-           "    library.\n"
-           "\n"
-           "    -l      - enable leak detection\n"
-           "    command - the program to run\n\n", 
-           prog);
-    exit(-1);
-}
-
-int
-main(int    argc, 
-     char **argv, 
-     char **envp)
-{
-    const char *prog = *argv;
-    const char *path;
-    --argc,++argv;
-
-    if(!argc)
-    {
-        usage(prog);
-    }
-    path = *argv;
-
-    /* check to see whether this program exists in the current path */
-    
-
-    /* replace the current process having first set up the memory management system */
-    lub_heap_init(prog);    
-
-    return execve(path,argv,envp);
-}

bin/module.am

@@ -22,23 +22,3 @@ bin_konf_SOURCES = bin/konf.c
 bin_konf_LDADD = \
 	libkonf.la \
 	liblub.la
-
-## If TCL is enabled
-if TCL
-	bin_PROGRAMS += bin/tclish@TCL_VERSION@
-
-	bin_tclish@TCL_VERSION@_SOURCES = bin/tclish.cpp \
-		bin/tclish_fini_callback.c \
-		bin/tclish_init_callback.c \
-		bin/tclish_script_callback.c \
-		bin/tclish_show_result.c
-
-	bin_tclish@TCL_VERSION@_LDADD = \
-		libclish.la \
-		libkonf.la \
-		libtinyrl.la \
-		libtinyxml.la \
-		liblub.la \
-		@TCL_LIBS@ \
-		@BFD_LIBS@
-endif

bin/tcl_private.h

@@ -1,20 +0,0 @@
-#include "clish/shell.h"
-
-_BEGIN_C_DECL
-
-struct Tcl_Interp;
-
-typedef struct tclish_cookie_s tclish_cookie_t;
-struct tclish_cookie_s {
-	struct Tcl_Interp *interp;
-};
-
-/* tclish callback functions */
-extern void tclish_show_result(struct Tcl_Interp *interp);
-extern clish_shell_init_fn_t tclish_init_callback;
-extern clish_shell_access_fn_t tclish_access_callback;
-extern clish_shell_script_fn_t tclish_script_callback;
-extern clish_shell_fini_fn_t tclish_fini_callback;
-
-_END_C_DECL
-

bin/tclish.cpp

@@ -1,129 +0,0 @@
-//-------------------------------------
-// tclish.cpp
-//
-// A simple client for libclish using
-// a TCL interpreter.
-//
-// (T)CL
-// (C)ommand
-// (L)ine
-// (I)nterface
-// (Sh)ell
-//
-// Pronounced: Ticklish
-//-------------------------------------
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifdef HAVE_LIBTCL
-#include <assert.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <tcl.h>
-
-#include "clish/shell.h"
-#include "clish/internal.h"
-#include "tcl_private.h"
-
-//---------------------------------------------------------
-static clish_shell_hooks_t my_hooks = 
-{
-    tclish_init_callback,
-    clish_access_callback,
-    NULL, /* don't worry about cmd_line callback */
-    tclish_script_callback,
-    tclish_fini_callback,
-    NULL, /* don't worry about config callback */
-    NULL
-};
-//---------------------------------------------------------
-static void
-tclish_cookie_init(tclish_cookie_t *cookie,
-                   const char      *argv0)
-{
-    /* make sure that the platform specific details are set up */
-    Tcl_FindExecutable(argv0);
-
-    cookie->interp     = NULL;
-}
-//---------------------------------------------------------
-static tclish_cookie_t *
-tclish_cookie_new(const char *argv0)
-{
-    tclish_cookie_t *cookie = (tclish_cookie_t *)malloc(sizeof(tclish_cookie_t));
-    
-    if(NULL != cookie)
-    {
-        tclish_cookie_init(cookie,argv0);
-    }
-    return cookie;
-}
-//---------------------------------------------------------
-int 
-main(int argc, const char **argv)
-{
-	tclish_cookie_t *cookie;
-	bool_t running;
-	int result = -1;
-	clish_shell_t * shell;
-	bool_t lockless = BOOL_FALSE;
-	bool_t stop_on_error = BOOL_FALSE;
-	const char *xml_path = getenv("CLISH_PATH");
-	const char *view = getenv("CLISH_VIEW");
-	const char *viewid = getenv("CLISH_VIEWID");
-
-	cookie = tclish_cookie_new(argv[0]);
-	/* Create shell instance */
-	shell = clish_shell_new(&my_hooks, cookie, NULL, stdout, stop_on_error);
-	if (!shell) {
-		fprintf(stderr, "Cannot run clish.\n");
-		return -1;
-	}
-	/* Load the XML files */
-	clish_shell_load_scheme(shell, xml_path);
-	/* Set communication to the konfd */
-//	clish_shell__set_socket(shell, socket_path);
-	/* Set lockless mode */
-	if (lockless)
-		clish_shell__set_lockfile(shell, NULL);
-	/* Set startup view */
-	if (view)
-		clish_shell__set_startup_view(shell, view);
-	/* Set startup viewid */
-	if (viewid)
-		clish_shell__set_startup_viewid(shell, viewid);
-	/* Execute startup */
-	running = clish_shell_startup(shell);
-	if (!running) {
-		fprintf(stderr, "Cannot startup clish.\n");
-		clish_shell_delete(shell);
-		return -1;
-	}
-
-	if(argc > 1) {
-		int i;
-		/* Run the commands from the files */
-		for (i = argc - 1; i >= 1; i--)
-			clish_shell_push_file(shell, argv[i], stop_on_error);
-	} else {
-		/* The interactive shell */
-		clish_shell_push_fd(shell, fdopen(dup(fileno(stdin)), "r"), stop_on_error);
-	}
-	result = clish_shell_loop(shell);
-
-	/* Cleanup */
-	clish_shell_delete(shell);
-	free(cookie);
-	(void)Tcl_FinalizeThread();
-
-	return result ? 0 : -1;
-}
-//---------------------------------------------------------
-#else /* not HAVE_LIBTCL */
-#include <stdio.h>
-int main(void)
-{
-    printf("TCL not compiled in...\n");
-}
-#endif /* not HAVE_LIBTCL */

bin/tclish_fini_callback.c

@@ -1,29 +0,0 @@
-/*
- * tclish_fini_callback.c
- *
- *  Callback to restore the terminal settings
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif				/* HAVE_CONFIG_H */
-
-#ifdef HAVE_LIBTCL
-#include <stdlib.h>
-#include <tcl.h>
-
-#include "tcl_private.h"
-/*--------------------------------------------------------- */
-void tclish_fini_callback(const clish_shell_t * shell)
-{
-	tclish_cookie_t *this = clish_shell__get_client_cookie(shell);
-
-	/* cleanup the TCL interpreter */
-	(void)Tcl_Release(this->interp);
-	(void)Tcl_DeleteInterp(this->interp);
-
-	/* free up memory */
-	free(this);
-}
-
-/*--------------------------------------------------------- */
-#endif				/* HAVE_LIBTCL */

bin/tclish_init_callback.c

@@ -1,37 +0,0 @@
-/*
- * tclish_init_callback.c
- *
- * Callback to set the initialise the terminal
- * - set raw mode (block for a single character)
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif				/* HAVE_CONFIG_H */
-
-#ifdef HAVE_LIBTCL
-#include <assert.h>
-#include <tcl.h>
-
-#include "tcl_private.h"
-/*--------------------------------------------------------- */
-bool_t tclish_init_callback(const clish_shell_t * shell)
-{
-	int result;
-	tclish_cookie_t *this = clish_shell__get_client_cookie(shell);
-
-	/* initialise the TCL interpreter */
-	this->interp = Tcl_CreateInterp();
-	assert(NULL != this->interp);
-	/* initialise the memory */
-	Tcl_InitMemory(interp);
-	result = Tcl_Init(this->interp);
-	if (TCL_OK != result) {
-		tclish_show_result(this->interp);
-	}
-	Tcl_Preserve(this->interp);
-
-	return BOOL_TRUE;
-}
-
-/*--------------------------------------------------------- */
-#endif				/* HAVE_LIBTCL */

bin/tclish_script_callback.c

@@ -1,38 +0,0 @@
-/*
- * tclish_script_callback.c
- *
- *
- * Callback hook to action a TCL script.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif				/* HAVE_CONFIG_H */
-
-#ifdef HAVE_LIBTCL
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <tcl.h>
-
-#include "tcl_private.h"
-/*--------------------------------------------------------- */
-bool_t tclish_script_callback(clish_shell_t * shell,
-	const clish_command_t * cmd, const char *script, char ** out)
-{
-	bool_t result = BOOL_TRUE;
-	tclish_cookie_t *this = clish_shell__get_client_cookie(shell);
-
-	if (Tcl_CommandComplete(script)) {
-		if (TCL_OK != Tcl_EvalEx(this->interp,
-					 script,
-					 strlen(script), TCL_EVAL_GLOBAL)) {
-			result = BOOL_FALSE;
-		}
-		tclish_show_result(this->interp);
-	}
-	return result;
-}
-
-/*--------------------------------------------------------- */
-#endif				/* HAVE_LIBTCL */

bin/tclish_show_result.c

@@ -1,29 +0,0 @@
-/*
- * tclish_show_result.c
- *
- * Display the last result for the specified interpreter.
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif				/* HAVE_CONFIG_H */
-
-#ifdef HAVE_LIBTCL
-#include <assert.h>
-#include <tcl.h>
-
-#include "tcl_private.h"
-/*--------------------------------------------------------- */
-void tclish_show_result(Tcl_Interp * interp)
-{
-	Tcl_Obj *obj = Tcl_GetObjResult(interp);
-	int length;
-	if (NULL != obj) {
-		char *string = Tcl_GetStringFromObj(obj, &length);
-		if (NULL != string) {
-			printf("%s", string);
-		}
-	}
-}
-
-/*--------------------------------------------------------- */
-#endif				/* HAVE_LIBTCL */

clish/module.am

@@ -8,7 +8,7 @@ libclish_la_SOURCES = \
     clish/callback_log.c \
     clish/private.h
 
-libclish_la_CFLAGS = @LUB_CFLAGS@ @LUBHEAP_CFLAGS@ $(DEBUG_CFLAGS)
+libclish_la_CFLAGS = @LUB_CFLAGS@ $(DEBUG_CFLAGS)
 libclish_la_LIBADD = \
 	liblub.la \
 	libtinyrl.la \

config.h.in

@@ -30,9 +30,6 @@
 /* Have POSIX real time library */
 #undef HAVE_LIBRT
 
-/* Have TCL library */
-#undef HAVE_LIBTCL
-
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
@@ -66,9 +63,6 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
-/* Define to 1 if you have the <tcl.h> header file. */
-#undef HAVE_TCL_H
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 

configure

@@ -616,15 +616,6 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 BFD_LIBS
-LUBHEAP_CFLAGS
-LUBHEAP_LIBS
-LUBHEAP_FALSE
-LUBHEAP_TRUE
-TCL_FALSE
-TCL_TRUE
-TCL_VERSION
-TCL_LIBS
-TCL_CFLAGS
 RT_CFLAGS
 RT_LIBS
 TINYXML_CXXFLAGS
@@ -766,8 +757,6 @@ enable_libtool_lock
 enable_dependency_tracking
 enable_debug
 with_rt
-with_tcl
-enable_lubheap
 enable_gpl
 '
       ac_precious_vars='build_alias
@@ -1411,8 +1400,6 @@ Optional Features:
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-debug          Turn on debugging including asserts [default=no]
-  --enable-lubheap        Replace standard memory libaries with lubheap
-                          (EXPERIMENTAL) [default=no]
   --enable-gpl            Link with GPL licenced libraries [default=yes]
 
 Optional Packages:
@@ -1424,7 +1411,6 @@ Optional Packages:
   --with-sysroot=DIR Search for dependent libraries within DIR
                         (or the compiler's sysroot if not specified).
   --with-rt=DIR           Use POSIX real time library distribution in DIR
-  --with-tcl=DIR          Use TCL library distribution in DIR
 
 Some influential environment variables:
   CC          C compiler command
@@ -16526,133 +16512,6 @@ $as_echo "#define HAVE_LIBRT /**/" >>confdefs.h
 fi
 
 
-################################
-# Check for the TCL library
-################################
-TCL_CONFIG=${libdir}/tclConfig.sh
-
-
-# Check whether --with-tcl was given.
-if test "${with_tcl+set}" = set; then :
-  withval=$with_tcl; if test -e $TCL_CONFIG; then
-    source ${TCL_CONFIG} # get TCL_VERSION
-    if test "${with_tcl}" = "yes"; then
-        TCL_CFLAGS="${TCL_INCLUDE_SPEC}"
-        TCL_LIBS="${TCL_LIB_SPEC}"
-    else
-        TCL_CFLAGS="-I${with_tcl}/include"
-        TCL_LIBS="-L${with_tcl}/lib -ltcl"
-    fi
-    CPPFLAGS="$CPPFLAGS $TCL_CFLAGS"
-    for ac_header in tcl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "tcl.h" "ac_cv_header_tcl_h" "$ac_includes_default"
-if test "x$ac_cv_header_tcl_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_TCL_H 1
-_ACEOF
- as_ac_Lib=`$as_echo "ac_cv_lib_tcl${TCL_VERSION}''_Tcl_CreateInterp" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl_CreateInterp in -ltcl${TCL_VERSION}" >&5
-$as_echo_n "checking for Tcl_CreateInterp in -ltcl${TCL_VERSION}... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltcl${TCL_VERSION}  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char Tcl_CreateInterp ();
-int
-main ()
-{
-return Tcl_CreateInterp ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-
-
-$as_echo "#define HAVE_LIBTCL /**/" >>confdefs.h
-
-
-
-
-            have_tcl="yes"
-
-fi
-
-
-fi
-
-done
-
-fi
-
-fi
-
- if test "x${have_tcl}" = "xyes"; then
-  TCL_TRUE=
-  TCL_FALSE='#'
-else
-  TCL_TRUE='#'
-  TCL_FALSE=
-fi
-
-
-################################
-# Check for inclusion of lub_heap
-################################
-# Check whether --enable-lubheap was given.
-if test "${enable_lubheap+set}" = set; then :
-  enableval=$enable_lubheap;
-else
-  enable_lubheap=no
-fi
-
-
- if test "x$enable_lubheap" = "xyes"; then
-  LUBHEAP_TRUE=
-  LUBHEAP_FALSE='#'
-else
-  LUBHEAP_TRUE='#'
-  LUBHEAP_FALSE=
-fi
-
-
-if test "x$enable_lubheap" = "xyes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Replacing standard memory libraries with lubheap" >&5
-$as_echo "$as_me: WARNING: Replacing standard memory libraries with lubheap" >&2;}
-
-    LUBHEAP_LIBS="-llubheap"
-    LUBHEAP_CFLAGS=""
-
-    if test "x$LUBHEAP_LIBS" = "x"; then
-        as_fn_error $? "Cannot find the \"Little Useful Bits Heap\" library" "$LINENO" 5
-    fi
-
-
-fi
-
 ################################
 # Check for linkage with GPL libraries
 ################################
@@ -17117,14 +16976,6 @@ if test -z "${DEBUG_TRUE}" && test -z "${DEBUG_FALSE}"; then
   as_fn_error $? "conditional \"DEBUG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${TCL_TRUE}" && test -z "${TCL_FALSE}"; then
-  as_fn_error $? "conditional \"TCL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${LUBHEAP_TRUE}" && test -z "${LUBHEAP_FALSE}"; then
-  as_fn_error $? "conditional \"LUBHEAP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0

configure.ac

@@ -135,61 +135,6 @@ AC_CHECK_LIB(rt,
                 AC_SUBST(RT_CFLAGS)
              ])
 
-################################
-# Check for the TCL library
-################################
-TCL_CONFIG=${libdir}/tclConfig.sh
-
-AC_ARG_WITH(tcl,
-            [AS_HELP_STRING([--with-tcl=DIR],
-                            [Use TCL library distribution in DIR])],
-if test -e $TCL_CONFIG; then
-    source ${TCL_CONFIG} # get TCL_VERSION
-    if test "${with_tcl}" = "yes"; then
-        TCL_CFLAGS="${TCL_INCLUDE_SPEC}"
-        TCL_LIBS="${TCL_LIB_SPEC}"
-    else
-        TCL_CFLAGS="-I${with_tcl}/include"
-        TCL_LIBS="-L${with_tcl}/lib -ltcl"
-    fi
-    CPPFLAGS="$CPPFLAGS $TCL_CFLAGS"
-    AC_CHECK_HEADERS(tcl.h,
-        AC_CHECK_LIB(tcl${TCL_VERSION}, Tcl_CreateInterp, [
-            AC_DEFINE([HAVE_LIBTCL], [], [Have TCL library])
-            AC_SUBST(TCL_CFLAGS)
-            AC_SUBST(TCL_LIBS)
-            AC_SUBST(TCL_VERSION)
-            have_tcl="yes"
-        ])
-    )
-fi
-)
-AM_CONDITIONAL(TCL,test "x${have_tcl}" = "xyes")
-
-################################
-# Check for inclusion of lub_heap
-################################
-AC_ARG_ENABLE(lubheap,
-    [AS_HELP_STRING([--enable-lubheap],
-                    [Replace standard memory libaries with lubheap (EXPERIMENTAL) [default=no]])],
-    [],
-    [enable_lubheap=no])
-
-AM_CONDITIONAL(LUBHEAP,test "x$enable_lubheap" = "xyes")
-
-if test "x$enable_lubheap" = "xyes"; then
-    AC_MSG_WARN([Replacing standard memory libraries with lubheap])
-
-    LUBHEAP_LIBS="-llubheap"
-    LUBHEAP_CFLAGS=""
-
-    if test "x$LUBHEAP_LIBS" = "x"; then
-        AC_MSG_ERROR([Cannot find the "Little Useful Bits Heap" library])
-    fi
-    AC_SUBST(LUBHEAP_LIBS)
-    AC_SUBST(LUBHEAP_CFLAGS)
-fi
-
 ################################
 # Check for linkage with GPL libraries
 ################################