updated configure scripts for libs/teckit

git-svn-id: svn://tug.org/texlive/trunk@2283 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 1205 insertions, 378 deletions

diff --git a/Build/source/libs/teckit/Makefile.in b/Build/source/libs/teckit/Makefile.in
index 2bcaa00e44d..09ca2172185 100644
--- a/Build/source/libs/teckit/Makefile.in
+++ b/Build/source/libs/teckit/Makefile.in
@@ -80,6 +80,7 @@ F77 = @F77@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDZLIB = @LDZLIB@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
@@ -89,6 +90,8 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
+ZLIBDEP = @ZLIBDEP@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
@@ -122,7 +125,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	  $(AUTOMAKE) --gnu  Makefile
 Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
 
diff --git a/Build/source/libs/teckit/bin/Makefile.am b/Build/source/libs/teckit/bin/Makefile.am
index 23c2e15c1c6..54100c88c80 100644
--- a/Build/source/libs/teckit/bin/Makefile.am
+++ b/Build/source/libs/teckit/bin/Makefile.am
@@ -1,39 +1,40 @@
 AUTOMAKE_OPTIONS = 1.6
 
-LINK=$(CXXLINK)
-
-bin_PROGRAMS = teckit_compile txtconv sfconv
+bin_PROGRAMS = teckit_compile txtconv # sfconv
 
 AM_CPPFLAGS  = -I$(top_srcdir)/source/Public-headers
 
 expatdir = $(top_srcdir)/SFconv/expat
 
-if SYSTEM_EXPAT
-EXPAT_CFLAGS = -DXML_DTD
-EXPAT_SOURCES =
-else
-EXPAT_CFLAGS = -I$(expatdir)/xmlparse -I$(expatdir)/xmltok -DXML_DTD
-EXPAT_SOURCES  = $(expatdir)/xmlparse/xmlparse.c
-EXPAT_SOURCES += $(expatdir)/xmlparse/hashtable.c
-EXPAT_SOURCES += $(expatdir)/xmltok/xmlrole.c
-EXPAT_SOURCES += $(expatdir)/xmltok/xmltok.c
-endif
+ZLIBSRCDIR = $(top_srcdir)/../zlib
+ZLIBDIR = $(top_builddir)/../zlib
+
+#if SYSTEM_EXPAT
+#EXPAT_CFLAGS = -DXML_DTD
+#EXPAT_SOURCES =
+#else
+#EXPAT_CFLAGS = -I$(expatdir)/xmlparse -I$(expatdir)/xmltok -DXML_DTD
+#EXPAT_SOURCES  = $(expatdir)/xmlparse/xmlparse.c
+#EXPAT_SOURCES += $(expatdir)/xmlparse/hashtable.c
+#EXPAT_SOURCES += $(expatdir)/xmltok/xmlrole.c
+#EXPAT_SOURCES += $(expatdir)/xmltok/xmltok.c
+#endif
 
 AM_CPPFLAGS  += $(EXPAT_CFLAGS)
 AM_CFLAGS    = $(AM_CPPFLAGS)
 
 
-teckit_compile_SOURCES = $(top_srcdir)/source/Sample-tools/TECkit_Compile.c
+teckit_compile_SOURCES = $(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp
 
-txtconv_SOURCES = $(top_srcdir)/source/Sample-tools/TxtConv.c
+txtconv_SOURCES = $(top_srcdir)/source/Sample-tools/TxtConv.cpp
 
-sfconv_SOURCES  = $(top_srcdir)/SFconv/SFconv.cpp
-sfconv_SOURCES += $(top_srcdir)/SFconv/ConvertUTF.c
-sfconv_SOURCES += $(EXPAT_SOURCES)
+# sfconv_SOURCES  = $(top_srcdir)/SFconv/SFconv.cpp
+# sfconv_SOURCES += $(top_srcdir)/SFconv/ConvertUTF.c
+# sfconv_SOURCES += $(EXPAT_SOURCES)
 
-teckit_compile_LDADD = $(top_builddir)/lib/libTECkit_Compiler.la
+teckit_compile_LDADD = $(top_builddir)/lib/libTECkit_Compiler.la @LDZLIB@
 
-txtconv_LDADD = $(top_builddir)/lib/libTECkit.la
+txtconv_LDADD = $(top_builddir)/lib/libTECkit.la @LDZLIB@
 
-sfconv_LDADD = $(top_builddir)/lib/libTECkit.la
+# sfconv_LDADD = $(top_builddir)/lib/libTECkit.la
 
diff --git a/Build/source/libs/teckit/bin/Makefile.in b/Build/source/libs/teckit/bin/Makefile.in
index 896cb27a27a..c7ba0fd6414 100644
--- a/Build/source/libs/teckit/bin/Makefile.in
+++ b/Build/source/libs/teckit/bin/Makefile.in
@@ -80,6 +80,7 @@ F77 = @F77@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDZLIB = @LDZLIB@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
@@ -89,52 +90,52 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
+ZLIBDEP = @ZLIBDEP@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 AUTOMAKE_OPTIONS = 1.6
 
-LINK = $(CXXLINK)
+bin_PROGRAMS = teckit_compile txtconv # sfconv
 
-bin_PROGRAMS = teckit_compile txtconv sfconv
 
+#if SYSTEM_EXPAT
+#EXPAT_CFLAGS = -DXML_DTD
+#EXPAT_SOURCES =
+#else
+#EXPAT_CFLAGS = -I$(expatdir)/xmlparse -I$(expatdir)/xmltok -DXML_DTD
+#EXPAT_SOURCES  = $(expatdir)/xmlparse/xmlparse.c
+#EXPAT_SOURCES += $(expatdir)/xmlparse/hashtable.c
+#EXPAT_SOURCES += $(expatdir)/xmltok/xmlrole.c
+#EXPAT_SOURCES += $(expatdir)/xmltok/xmltok.c
+#endif
 AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers $(EXPAT_CFLAGS)
 
 expatdir = $(top_srcdir)/SFconv/expat
 
-@SYSTEM_EXPAT_TRUE@EXPAT_CFLAGS = -DXML_DTD
-@SYSTEM_EXPAT_FALSE@EXPAT_CFLAGS = -I$(expatdir)/xmlparse -I$(expatdir)/xmltok -DXML_DTD
-@SYSTEM_EXPAT_TRUE@EXPAT_SOURCES = 
-@SYSTEM_EXPAT_FALSE@EXPAT_SOURCES = $(expatdir)/xmlparse/xmlparse.c $(expatdir)/xmlparse/hashtable.c $(expatdir)/xmltok/xmlrole.c $(expatdir)/xmltok/xmltok.c
+ZLIBSRCDIR = $(top_srcdir)/../zlib
+ZLIBDIR = $(top_builddir)/../zlib
 AM_CFLAGS = $(AM_CPPFLAGS)
 
-teckit_compile_SOURCES = $(top_srcdir)/source/Sample-tools/TECkit_Compile.c
+teckit_compile_SOURCES = $(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp
 
-txtconv_SOURCES = $(top_srcdir)/source/Sample-tools/TxtConv.c
+txtconv_SOURCES = $(top_srcdir)/source/Sample-tools/TxtConv.cpp
 
-sfconv_SOURCES = $(top_srcdir)/SFconv/SFconv.cpp $(top_srcdir)/SFconv/ConvertUTF.c $(EXPAT_SOURCES)
 
-teckit_compile_LDADD = $(top_builddir)/lib/libTECkit_Compiler.la
+# sfconv_SOURCES  = $(top_srcdir)/SFconv/SFconv.cpp
+# sfconv_SOURCES += $(top_srcdir)/SFconv/ConvertUTF.c
+# sfconv_SOURCES += $(EXPAT_SOURCES)
+teckit_compile_LDADD = $(top_builddir)/lib/libTECkit_Compiler.la @LDZLIB@
 
-txtconv_LDADD = $(top_builddir)/lib/libTECkit.la
-
-sfconv_LDADD = $(top_builddir)/lib/libTECkit.la
+txtconv_LDADD = $(top_builddir)/lib/libTECkit.la @LDZLIB@
 subdir = bin
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-bin_PROGRAMS = teckit_compile$(EXEEXT) txtconv$(EXEEXT) sfconv$(EXEEXT)
+bin_PROGRAMS = teckit_compile$(EXEEXT) txtconv$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-@SYSTEM_EXPAT_TRUE@am__objects_1 =
-@SYSTEM_EXPAT_FALSE@am__objects_1 = xmlparse.$(OBJEXT) \
-@SYSTEM_EXPAT_FALSE@	hashtable.$(OBJEXT) xmlrole.$(OBJEXT) \
-@SYSTEM_EXPAT_FALSE@	xmltok.$(OBJEXT)
-am_sfconv_OBJECTS = SFconv.$(OBJEXT) ConvertUTF.$(OBJEXT) \
-	$(am__objects_1)
-sfconv_OBJECTS = $(am_sfconv_OBJECTS)
-sfconv_DEPENDENCIES = $(top_builddir)/lib/libTECkit.la
-sfconv_LDFLAGS =
 am_teckit_compile_OBJECTS = TECkit_Compile.$(OBJEXT)
 teckit_compile_OBJECTS = $(am_teckit_compile_OBJECTS)
 teckit_compile_DEPENDENCIES = $(top_builddir)/lib/libTECkit_Compiler.la
@@ -151,17 +152,8 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ConvertUTF.Po ./$(DEPDIR)/SFconv.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/TECkit_Compile.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/TxtConv.Po ./$(DEPDIR)/hashtable.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/xmlparse.Po ./$(DEPDIR)/xmlrole.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/xmltok.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-CFLAGS = @CFLAGS@
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/TECkit_Compile.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/TxtConv.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
@@ -171,18 +163,17 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(sfconv_SOURCES) $(teckit_compile_SOURCES) \
-	$(txtconv_SOURCES)
+DIST_SOURCES = $(teckit_compile_SOURCES) $(txtconv_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(sfconv_SOURCES) $(teckit_compile_SOURCES) $(txtconv_SOURCES)
+SOURCES = $(teckit_compile_SOURCES) $(txtconv_SOURCES)
 
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
+.SUFFIXES: .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  bin/Makefile
+	  $(AUTOMAKE) --gnu  bin/Makefile
 Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -214,24 +205,15 @@ clean-binPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-SFconv.$(OBJEXT): $(top_srcdir)/SFconv/SFconv.cpp
-ConvertUTF.$(OBJEXT): $(top_srcdir)/SFconv/ConvertUTF.c
-xmlparse.$(OBJEXT): $(expatdir)/xmlparse/xmlparse.c
-hashtable.$(OBJEXT): $(expatdir)/xmlparse/hashtable.c
-xmlrole.$(OBJEXT): $(expatdir)/xmltok/xmlrole.c
-xmltok.$(OBJEXT): $(expatdir)/xmltok/xmltok.c
-sfconv$(EXEEXT): $(sfconv_OBJECTS) $(sfconv_DEPENDENCIES) 
-	@rm -f sfconv$(EXEEXT)
-	$(CXXLINK) $(sfconv_LDFLAGS) $(sfconv_OBJECTS) $(sfconv_LDADD) $(LIBS)
 TECkit_Compile.$(OBJEXT): \
-	$(top_srcdir)/source/Sample-tools/TECkit_Compile.c
+	$(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp
 teckit_compile$(EXEEXT): $(teckit_compile_OBJECTS) $(teckit_compile_DEPENDENCIES) 
 	@rm -f teckit_compile$(EXEEXT)
-	$(LINK) $(teckit_compile_LDFLAGS) $(teckit_compile_OBJECTS) $(teckit_compile_LDADD) $(LIBS)
-TxtConv.$(OBJEXT): $(top_srcdir)/source/Sample-tools/TxtConv.c
+	$(CXXLINK) $(teckit_compile_LDFLAGS) $(teckit_compile_OBJECTS) $(teckit_compile_LDADD) $(LIBS)
+TxtConv.$(OBJEXT): $(top_srcdir)/source/Sample-tools/TxtConv.cpp
 txtconv$(EXEEXT): $(txtconv_OBJECTS) $(txtconv_DEPENDENCIES) 
 	@rm -f txtconv$(EXEEXT)
-	$(LINK) $(txtconv_LDFLAGS) $(txtconv_OBJECTS) $(txtconv_LDADD) $(LIBS)
+	$(CXXLINK) $(txtconv_LDFLAGS) $(txtconv_OBJECTS) $(txtconv_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
@@ -239,163 +221,12 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConvertUTF.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SFconv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TECkit_Compile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TxtConv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hashtable.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrole.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltok.Po@am__quote@
 
 distclean-depend:
 	-rm -rf ./$(DEPDIR)
 
-.c.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-
-.c.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `cygpath -w $<`
-
-.c.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-ConvertUTF.o: $(top_srcdir)/SFconv/ConvertUTF.c
-@AMDEP_TRUE@	source='$(top_srcdir)/SFconv/ConvertUTF.c' object='ConvertUTF.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/ConvertUTF.Po' tmpdepfile='$(DEPDIR)/ConvertUTF.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ConvertUTF.o `test -f '$(top_srcdir)/SFconv/ConvertUTF.c' || echo '$(srcdir)/'`$(top_srcdir)/SFconv/ConvertUTF.c
-
-ConvertUTF.obj: $(top_srcdir)/SFconv/ConvertUTF.c
-@AMDEP_TRUE@	source='$(top_srcdir)/SFconv/ConvertUTF.c' object='ConvertUTF.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/ConvertUTF.Po' tmpdepfile='$(DEPDIR)/ConvertUTF.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ConvertUTF.obj `cygpath -w $(top_srcdir)/SFconv/ConvertUTF.c`
-
-ConvertUTF.lo: $(top_srcdir)/SFconv/ConvertUTF.c
-@AMDEP_TRUE@	source='$(top_srcdir)/SFconv/ConvertUTF.c' object='ConvertUTF.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/ConvertUTF.Plo' tmpdepfile='$(DEPDIR)/ConvertUTF.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ConvertUTF.lo `test -f '$(top_srcdir)/SFconv/ConvertUTF.c' || echo '$(srcdir)/'`$(top_srcdir)/SFconv/ConvertUTF.c
-
-xmlparse.o: $(expatdir)/xmlparse/xmlparse.c
-@AMDEP_TRUE@	source='$(expatdir)/xmlparse/xmlparse.c' object='xmlparse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/xmlparse.Po' tmpdepfile='$(DEPDIR)/xmlparse.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.o `test -f '$(expatdir)/xmlparse/xmlparse.c' || echo '$(srcdir)/'`$(expatdir)/xmlparse/xmlparse.c
-
-xmlparse.obj: $(expatdir)/xmlparse/xmlparse.c
-@AMDEP_TRUE@	source='$(expatdir)/xmlparse/xmlparse.c' object='xmlparse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/xmlparse.Po' tmpdepfile='$(DEPDIR)/xmlparse.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.obj `cygpath -w $(expatdir)/xmlparse/xmlparse.c`
-
-xmlparse.lo: $(expatdir)/xmlparse/xmlparse.c
-@AMDEP_TRUE@	source='$(expatdir)/xmlparse/xmlparse.c' object='xmlparse.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/xmlparse.Plo' tmpdepfile='$(DEPDIR)/xmlparse.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.lo `test -f '$(expatdir)/xmlparse/xmlparse.c' || echo '$(srcdir)/'`$(expatdir)/xmlparse/xmlparse.c
-
-hashtable.o: $(expatdir)/xmlparse/hashtable.c
-@AMDEP_TRUE@	source='$(expatdir)/xmlparse/hashtable.c' object='hashtable.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/hashtable.Po' tmpdepfile='$(DEPDIR)/hashtable.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hashtable.o `test -f '$(expatdir)/xmlparse/hashtable.c' || echo '$(srcdir)/'`$(expatdir)/xmlparse/hashtable.c
-
-hashtable.obj: $(expatdir)/xmlparse/hashtable.c
-@AMDEP_TRUE@	source='$(expatdir)/xmlparse/hashtable.c' object='hashtable.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/hashtable.Po' tmpdepfile='$(DEPDIR)/hashtable.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hashtable.obj `cygpath -w $(expatdir)/xmlparse/hashtable.c`
-
-hashtable.lo: $(expatdir)/xmlparse/hashtable.c
-@AMDEP_TRUE@	source='$(expatdir)/xmlparse/hashtable.c' object='hashtable.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/hashtable.Plo' tmpdepfile='$(DEPDIR)/hashtable.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o hashtable.lo `test -f '$(expatdir)/xmlparse/hashtable.c' || echo '$(srcdir)/'`$(expatdir)/xmlparse/hashtable.c
-
-xmlrole.o: $(expatdir)/xmltok/xmlrole.c
-@AMDEP_TRUE@	source='$(expatdir)/xmltok/xmlrole.c' object='xmlrole.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/xmlrole.Po' tmpdepfile='$(DEPDIR)/xmlrole.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.o `test -f '$(expatdir)/xmltok/xmlrole.c' || echo '$(srcdir)/'`$(expatdir)/xmltok/xmlrole.c
-
-xmlrole.obj: $(expatdir)/xmltok/xmlrole.c
-@AMDEP_TRUE@	source='$(expatdir)/xmltok/xmlrole.c' object='xmlrole.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/xmlrole.Po' tmpdepfile='$(DEPDIR)/xmlrole.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.obj `cygpath -w $(expatdir)/xmltok/xmlrole.c`
-
-xmlrole.lo: $(expatdir)/xmltok/xmlrole.c
-@AMDEP_TRUE@	source='$(expatdir)/xmltok/xmlrole.c' object='xmlrole.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/xmlrole.Plo' tmpdepfile='$(DEPDIR)/xmlrole.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.lo `test -f '$(expatdir)/xmltok/xmlrole.c' || echo '$(srcdir)/'`$(expatdir)/xmltok/xmlrole.c
-
-xmltok.o: $(expatdir)/xmltok/xmltok.c
-@AMDEP_TRUE@	source='$(expatdir)/xmltok/xmltok.c' object='xmltok.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/xmltok.Po' tmpdepfile='$(DEPDIR)/xmltok.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.o `test -f '$(expatdir)/xmltok/xmltok.c' || echo '$(srcdir)/'`$(expatdir)/xmltok/xmltok.c
-
-xmltok.obj: $(expatdir)/xmltok/xmltok.c
-@AMDEP_TRUE@	source='$(expatdir)/xmltok/xmltok.c' object='xmltok.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/xmltok.Po' tmpdepfile='$(DEPDIR)/xmltok.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `cygpath -w $(expatdir)/xmltok/xmltok.c`
-
-xmltok.lo: $(expatdir)/xmltok/xmltok.c
-@AMDEP_TRUE@	source='$(expatdir)/xmltok/xmltok.c' object='xmltok.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/xmltok.Plo' tmpdepfile='$(DEPDIR)/xmltok.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.lo `test -f '$(expatdir)/xmltok/xmltok.c' || echo '$(srcdir)/'`$(expatdir)/xmltok/xmltok.c
-
-TECkit_Compile.o: $(top_srcdir)/source/Sample-tools/TECkit_Compile.c
-@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TECkit_Compile.c' object='TECkit_Compile.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/TECkit_Compile.Po' tmpdepfile='$(DEPDIR)/TECkit_Compile.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o TECkit_Compile.o `test -f '$(top_srcdir)/source/Sample-tools/TECkit_Compile.c' || echo '$(srcdir)/'`$(top_srcdir)/source/Sample-tools/TECkit_Compile.c
-
-TECkit_Compile.obj: $(top_srcdir)/source/Sample-tools/TECkit_Compile.c
-@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TECkit_Compile.c' object='TECkit_Compile.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/TECkit_Compile.Po' tmpdepfile='$(DEPDIR)/TECkit_Compile.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o TECkit_Compile.obj `cygpath -w $(top_srcdir)/source/Sample-tools/TECkit_Compile.c`
-
-TECkit_Compile.lo: $(top_srcdir)/source/Sample-tools/TECkit_Compile.c
-@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TECkit_Compile.c' object='TECkit_Compile.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/TECkit_Compile.Plo' tmpdepfile='$(DEPDIR)/TECkit_Compile.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o TECkit_Compile.lo `test -f '$(top_srcdir)/source/Sample-tools/TECkit_Compile.c' || echo '$(srcdir)/'`$(top_srcdir)/source/Sample-tools/TECkit_Compile.c
-
-TxtConv.o: $(top_srcdir)/source/Sample-tools/TxtConv.c
-@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TxtConv.c' object='TxtConv.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/TxtConv.Po' tmpdepfile='$(DEPDIR)/TxtConv.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o TxtConv.o `test -f '$(top_srcdir)/source/Sample-tools/TxtConv.c' || echo '$(srcdir)/'`$(top_srcdir)/source/Sample-tools/TxtConv.c
-
-TxtConv.obj: $(top_srcdir)/source/Sample-tools/TxtConv.c
-@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TxtConv.c' object='TxtConv.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/TxtConv.Po' tmpdepfile='$(DEPDIR)/TxtConv.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o TxtConv.obj `cygpath -w $(top_srcdir)/source/Sample-tools/TxtConv.c`
-
-TxtConv.lo: $(top_srcdir)/source/Sample-tools/TxtConv.c
-@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TxtConv.c' object='TxtConv.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/TxtConv.Plo' tmpdepfile='$(DEPDIR)/TxtConv.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o TxtConv.lo `test -f '$(top_srcdir)/source/Sample-tools/TxtConv.c' || echo '$(srcdir)/'`$(top_srcdir)/source/Sample-tools/TxtConv.c
-CCDEPMODE = @CCDEPMODE@
-
 .cpp.o:
 @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@@ -414,23 +245,41 @@ CCDEPMODE = @CCDEPMODE@
 @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
-SFconv.o: $(top_srcdir)/SFconv/SFconv.cpp
-@AMDEP_TRUE@	source='$(top_srcdir)/SFconv/SFconv.cpp' object='SFconv.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/SFconv.Po' tmpdepfile='$(DEPDIR)/SFconv.TPo' @AMDEPBACKSLASH@
+TECkit_Compile.o: $(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp
+@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp' object='TECkit_Compile.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/TECkit_Compile.Po' tmpdepfile='$(DEPDIR)/TECkit_Compile.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SFconv.o `test -f '$(top_srcdir)/SFconv/SFconv.cpp' || echo '$(srcdir)/'`$(top_srcdir)/SFconv/SFconv.cpp
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TECkit_Compile.o `test -f '$(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp
 
-SFconv.obj: $(top_srcdir)/SFconv/SFconv.cpp
-@AMDEP_TRUE@	source='$(top_srcdir)/SFconv/SFconv.cpp' object='SFconv.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/SFconv.Po' tmpdepfile='$(DEPDIR)/SFconv.TPo' @AMDEPBACKSLASH@
+TECkit_Compile.obj: $(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp
+@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp' object='TECkit_Compile.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/TECkit_Compile.Po' tmpdepfile='$(DEPDIR)/TECkit_Compile.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SFconv.obj `cygpath -w $(top_srcdir)/SFconv/SFconv.cpp`
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TECkit_Compile.obj `cygpath -w $(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp`
 
-SFconv.lo: $(top_srcdir)/SFconv/SFconv.cpp
-@AMDEP_TRUE@	source='$(top_srcdir)/SFconv/SFconv.cpp' object='SFconv.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/SFconv.Plo' tmpdepfile='$(DEPDIR)/SFconv.TPlo' @AMDEPBACKSLASH@
+TECkit_Compile.lo: $(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp
+@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp' object='TECkit_Compile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/TECkit_Compile.Plo' tmpdepfile='$(DEPDIR)/TECkit_Compile.TPlo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SFconv.lo `test -f '$(top_srcdir)/SFconv/SFconv.cpp' || echo '$(srcdir)/'`$(top_srcdir)/SFconv/SFconv.cpp
+	$(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TECkit_Compile.lo `test -f '$(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/source/Sample-tools/TECkit_Compile.cpp
+
+TxtConv.o: $(top_srcdir)/source/Sample-tools/TxtConv.cpp
+@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TxtConv.cpp' object='TxtConv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/TxtConv.Po' tmpdepfile='$(DEPDIR)/TxtConv.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TxtConv.o `test -f '$(top_srcdir)/source/Sample-tools/TxtConv.cpp' || echo '$(srcdir)/'`$(top_srcdir)/source/Sample-tools/TxtConv.cpp
+
+TxtConv.obj: $(top_srcdir)/source/Sample-tools/TxtConv.cpp
+@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TxtConv.cpp' object='TxtConv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/TxtConv.Po' tmpdepfile='$(DEPDIR)/TxtConv.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TxtConv.obj `cygpath -w $(top_srcdir)/source/Sample-tools/TxtConv.cpp`
+
+TxtConv.lo: $(top_srcdir)/source/Sample-tools/TxtConv.cpp
+@AMDEP_TRUE@	source='$(top_srcdir)/source/Sample-tools/TxtConv.cpp' object='TxtConv.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/TxtConv.Plo' tmpdepfile='$(DEPDIR)/TxtConv.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TxtConv.lo `test -f '$(top_srcdir)/source/Sample-tools/TxtConv.cpp' || echo '$(srcdir)/'`$(top_srcdir)/source/Sample-tools/TxtConv.cpp
 CXXDEPMODE = @CXXDEPMODE@
 
 mostlyclean-libtool:
@@ -585,6 +434,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	mostlyclean-libtool tags uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-info-am
 
+
+# sfconv_LDADD = $(top_builddir)/lib/libTECkit.la
 # 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:
diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure
index e0dcdca7834..6c430a6b405 100755
--- a/Build/source/libs/teckit/configure
+++ b/Build/source/libs/teckit/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for teckit 2.1.3.
+# Generated by GNU Autoconf 2.59 for teckit 2.1.5.
 #
 # Report bugs to <jonathan_kew@sil.org>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='teckit'
 PACKAGE_TARNAME='teckit'
-PACKAGE_VERSION='2.1.3'
-PACKAGE_STRING='teckit 2.1.3'
+PACKAGE_VERSION='2.1.5'
+PACKAGE_STRING='teckit 2.1.5'
 PACKAGE_BUGREPORT='jonathan_kew@sil.org'
 
 ac_unique_file="source/UnicodeNames.cpp"
@@ -465,7 +465,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SYSTEM_EXPAT_TRUE SYSTEM_EXPAT_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ZLIBCPPFLAGS LDZLIB ZLIBDEP LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures teckit 2.1.3 to adapt to many kinds of systems.
+\`configure' configures teckit 2.1.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1020,7 +1020,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of teckit 2.1.3:";;
+     short | recursive ) echo "Configuration of teckit 2.1.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1047,6 +1047,11 @@ Optional Packages:
                           both]
   --with-tags[=TAGS]
                           include additional configurations [automatic]
+  --with-system-zlib         use installed zlib library
+  --with-zlib-libdir=DIR
+                          Specify directory where the zlib.a resides.
+  --with-zlib-include=DIR
+                          Specify the zlib header files location.
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -1161,7 +1166,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-teckit configure 2.1.3
+teckit configure 2.1.5
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1175,7 +1180,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by teckit $as_me 2.1.3, which was
+It was created by teckit $as_me 2.1.5, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1774,7 +1779,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=teckit
- VERSION=2.1.3
+ VERSION=2.1.5
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1902,10 +1907,6 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 
 # Optional features
-#AC_ARG_ENABLE(grcompiler,
-#    AC_HELP_STRING([--enable-grcompiler],
-#        [build the Graphite font compiler. (default=no)]),
-#    [package_grcompiler_enabled=yes], [package_grcompiler_enabled=no])
 echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
 echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
@@ -1931,7 +1932,6 @@ fi
 
 
 
-
 # Checks for programs.
 ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -18891,10 +18891,57 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 # Checks for libraries.
+## AC_CHECK_LIB(z, compress)
+
+# Check whether --with-system_zlib or --without-system_zlib was given.
+if test "${with_system_zlib+set}" = set; then
+  withval="$with_system_zlib"
+
+fi;
+
+
+# Check whether --with-zlib_libdir or --without-zlib_libdir was given.
+if test "${with_zlib_libdir+set}" = set; then
+  withval="$with_zlib_libdir"
+
+fi;
+
+
+# Check whether --with-zlib_include or --without-zlib_include was given.
+if test "${with_zlib_include+set}" = set; then
+  withval="$with_zlib_include"
+
+fi;
+
+if test "$needs_zlib" = no; then
+  ZLIBCPPFLAGS=
+  LDZLIB=
+  ZLIBDEP=
+else
+  EXTRA_ZLIB_INCLUDE=
+  EXTRA_ZLIB_LIBDIR=
+
+  if test "$with_system_zlib" = yes; then
+    if test "x$with_zlib_libdir" != x; then
+      EXTRA_ZLIB_LIBDIR="-L$with_zlib_libdir"
+    fi
+    if test "x$with_zlib_include" != x; then
+      EXTRA_ZLIB_INCLUDE="-I$with_zlib_include"
+    fi
+  fi
+
+  OLD_LDFLAGS=$LDFLAGS
+  OLD_CPP=$CPP
+  OLD_LIBS=$LIBS
 
-echo "$as_me:$LINENO: checking for compress in -lz" >&5
-echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6
-if test "${ac_cv_lib_z_compress+set}" = set; then
+  LDFLAGS="$LDFLAGS $EXTRA_ZLIB_LIBDIR"
+  CPP="$CPP $EXTRA_ZLIB_INCLUDE"
+
+  if test "$with_system_zlib" = yes; then
+
+echo "$as_me:$LINENO: checking for inflate in -lz" >&5
+echo $ECHO_N "checking for inflate in -lz... $ECHO_C" >&6
+if test "${ac_cv_lib_z_inflate+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -18912,11 +18959,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char compress ();
+char inflate ();
 int
 main ()
 {
-compress ();
+inflate ();
   ;
   return 0;
 }
@@ -18943,61 +18990,246 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_z_compress=yes
+  ac_cv_lib_z_inflate=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_z_compress=no
+ac_cv_lib_z_inflate=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
-echo "${ECHO_T}$ac_cv_lib_z_compress" >&6
-if test $ac_cv_lib_z_compress = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_z_inflate" >&5
+echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6
+if test $ac_cv_lib_z_inflate = yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
 _ACEOF
 
   LIBS="-lz $LIBS"
 
+else
+  { echo "$as_me:$LINENO: WARNING: Standard ZLIB library not found. Compiling my own." >&5
+echo "$as_me: WARNING: Standard ZLIB library not found. Compiling my own." >&2;}
+      with_system_zlib=no
 fi
 
+  fi
 
-echo "$as_me:$LINENO: checking for XML_ExpatVersion in -lexpat" >&5
-echo $ECHO_N "checking for XML_ExpatVersion in -lexpat... $ECHO_C" >&6
-if test "${ac_cv_lib_expat_XML_ExpatVersion+set}" = set; then
+  if test "$with_system_zlib" = yes; then
+
+for ac_header in zlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lexpat  $LIBS"
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------------- ##
+## Report this to jonathan_kew@sil.org ##
+## ----------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+    if test "$ac_cv_header_zlib_h" != yes; then
+      { echo "$as_me:$LINENO: WARNING: zlib.h not found. Using my own zlib sources." >&5
+echo "$as_me: WARNING: zlib.h not found. Using my own zlib sources." >&2;}
+      with_system_zlib=no
+    fi
+  fi
+
+  LDFLAGS=$OLD_LDFLAGS
+  CPP=$OLD_CPP
+  LIBS=$OLD_LIBS
+
+  if test "$with_system_zlib" != yes; then
+    ZLIBCPPFLAGS='-I$(ZLIBDIR) -I$(ZLIBSRCDIR)'
+    LDZLIB='$(ZLIBDIR)/libz.a'
+    ZLIBDEP='$(ZLIBDIR)/libz.a'
+    using_system_zlib=no
+  else
+    ZLIBCPPFLAGS="$EXTRA_ZLIB_INCLUDE"
+    LDZLIB="$EXTRA_ZLIB_LIBDIR -lz"
+    ZLIBDEP=
+    using_system_zlib=yes
+  fi
+fi
+
+
+
+
+
+
+## omit this for TL - we don't need sfconv
+## AC_CHECK_LIB(expat, XML_ExpatVersion)
+## AM_CONDITIONAL(SYSTEM_EXPAT, test x$ac_cv_lib_expat_XML_ExpatVersion = xyes)
+
+# Checks for header files.
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XML_ExpatVersion ();
 int
 main ()
 {
-XML_ExpatVersion ();
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
@@ -19011,63 +19243,835 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
+	 { ac_try='test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_expat_XML_ExpatVersion=yes
+  ac_cv_header_stdc=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_expat_XML_ExpatVersion=no
+ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ExpatVersion" >&5
-echo "${ECHO_T}$ac_cv_lib_expat_XML_ExpatVersion" >&6
-if test $ac_cv_lib_expat_XML_ExpatVersion = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBEXPAT 1
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then
+  :
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then
+  :
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ctype.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      exit(2);
+  exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
 _ACEOF
 
-  LIBS="-lexpat $LIBS"
+fi
 
+
+
+
+
+
+
+for ac_header in limits.h malloc.h memory.h stddef.h stdlib.h string.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
 
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
 
-if test x$ac_cv_lib_expat_XML_ExpatVersion = xyes; then
-  SYSTEM_EXPAT_TRUE=
-  SYSTEM_EXPAT_FALSE='#'
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------------- ##
+## Report this to jonathan_kew@sil.org ##
+## ----------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  SYSTEM_EXPAT_TRUE='#'
-  SYSTEM_EXPAT_FALSE=
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
 fi
 
+done
 
-# Checks for header files.
-#AC_HEADER_STDC
-#AC_CHECK_HEADERS([limits.h malloc.h memory.h stddef.h stdlib.h string.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 #AC_TYPE_SIZE_T
-#AC_STRUCT_TM
-#AC_CHECK_SIZEOF(wchar_t)
-#AC_SUBST(SIZEOF_WCHAR_T)
 
 # Checks for library functions.
-#AC_FUNC_ERROR_AT_LINE
-#AC_FUNC_MALLOC
-#AC_FUNC_MEMCMP
-#AC_FUNC_REALLOC
-#AC_FUNC_VPRINTF
-#AC_CHECK_FUNCS([isascii memmove memset strcasecmp strchr strrchr strtoul])
+
+for ac_header in stdlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------------- ##
+## Report this to jonathan_kew@sil.org ##
+## ----------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
+echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_malloc_0_nonnull=no
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if STDC_HEADERS || HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *malloc ();
+#endif
+
+int
+main ()
+{
+exit (malloc (0) ? 0 : 1);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_malloc_0_nonnull=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_func_malloc_0_nonnull=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
+echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6
+if test $ac_cv_func_malloc_0_nonnull = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_MALLOC 1
+_ACEOF
+
+else
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_MALLOC 0
+_ACEOF
+
+   case $LIBOBJS in
+    "malloc.$ac_objext"   | \
+  *" malloc.$ac_objext"   | \
+    "malloc.$ac_objext "* | \
+  *" malloc.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;;
+esac
+
+
+cat >>confdefs.h <<\_ACEOF
+#define malloc rpl_malloc
+_ACEOF
+
+fi
+
+
+
+echo "$as_me:$LINENO: checking for working memcmp" >&5
+echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
+if test "${ac_cv_func_memcmp_working+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_memcmp_working=no
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+  /* Some versions of memcmp are not 8-bit clean.  */
+  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
+    exit (1);
+
+  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
+     or more and with at least one buffer not starting on a 4-byte boundary.
+     William Lewis provided this test program.   */
+  {
+    char foo[21];
+    char bar[21];
+    int i;
+    for (i = 0; i < 4; i++)
+      {
+	char *a = foo + i;
+	char *b = bar + i;
+	strcpy (a, "--------01111111");
+	strcpy (b, "--------10000000");
+	if (memcmp (a, b, 16) >= 0)
+	  exit (1);
+      }
+    exit (0);
+  }
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_memcmp_working=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_func_memcmp_working=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
+test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
+    "memcmp.$ac_objext"   | \
+  *" memcmp.$ac_objext"   | \
+    "memcmp.$ac_objext "* | \
+  *" memcmp.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
+esac
+
+
+
+for ac_header in stdlib.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    (
+      cat <<\_ASBOX
+## ----------------------------------- ##
+## Report this to jonathan_kew@sil.org ##
+## ----------------------------------- ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
+echo $ECHO_N "checking for GNU libc compatible realloc... $ECHO_C" >&6
+if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_func_realloc_0_nonnull=no
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#if STDC_HEADERS || HAVE_STDLIB_H
+# include <stdlib.h>
+#else
+char *realloc ();
+#endif
+
+int
+main ()
+{
+exit (realloc (0, 0) ? 0 : 1);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_realloc_0_nonnull=yes
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_func_realloc_0_nonnull=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5
+echo "${ECHO_T}$ac_cv_func_realloc_0_nonnull" >&6
+if test $ac_cv_func_realloc_0_nonnull = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_REALLOC 1
+_ACEOF
+
+else
+  cat >>confdefs.h <<\_ACEOF
+#define HAVE_REALLOC 0
+_ACEOF
+
+   case $LIBOBJS in
+    "realloc.$ac_objext"   | \
+  *" realloc.$ac_objext"   | \
+    "realloc.$ac_objext "* | \
+  *" realloc.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS realloc.$ac_objext" ;;
+esac
+
+
+cat >>confdefs.h <<\_ACEOF
+#define realloc rpl_realloc
+_ACEOF
+
+fi
+
+
+
 echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
@@ -19317,24 +20321,6 @@ else
     CXXFLAGS="$CXXFLAGS -DNDEBUG"
 fi
 
-# Enable final
-if test "$enable_final" = yes; then
-  CFLAGS="-O3 -DNDEBUG"
-  CXXFLAGS="-O3 -DNDEBUG"
-fi
-
-# Enable profile
-if test "$enable_profile" = yes; then
-  CFLAGS="$CFLAGS -pg "
-  CXXFLAGS="$CXXFLAGS -pg "
-fi
-if test "$enable_profilefn" = yes; then
-  CFLAGS="$CFLAGS -g -finstrument-functions "
-  CXXFLAGS="$CXXFLAGS -g -finstrument-functions "
-  LIBS="$LIBS -g -finstrument-functions -lfnccheck "
-fi
-
-
                                                   ac_config_files="$ac_config_files Makefile lib/Makefile bin/Makefile docs/Makefile test/Makefile"
 
 
@@ -19443,13 +20429,6 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${SYSTEM_EXPAT_TRUE}" && test -z "${SYSTEM_EXPAT_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"SYSTEM_EXPAT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"SYSTEM_EXPAT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -19721,7 +20700,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by teckit $as_me 2.1.3, which was
+This file was extended by teckit $as_me 2.1.5, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19784,7 +20763,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-teckit config.status 2.1.3
+teckit config.status 2.1.5
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -20045,8 +21024,9 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
-s,@SYSTEM_EXPAT_TRUE@,$SYSTEM_EXPAT_TRUE,;t t
-s,@SYSTEM_EXPAT_FALSE@,$SYSTEM_EXPAT_FALSE,;t t
+s,@ZLIBCPPFLAGS@,$ZLIBCPPFLAGS,;t t
+s,@LDZLIB@,$LDZLIB,;t t
+s,@ZLIBDEP@,$ZLIBDEP,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
diff --git a/Build/source/libs/teckit/configure.ac b/Build/source/libs/teckit/configure.ac
index c08bccc24e7..e3e17d2b6ed 100644
--- a/Build/source/libs/teckit/configure.ac
+++ b/Build/source/libs/teckit/configure.ac
@@ -1,17 +1,12 @@
 AC_PREREQ(2.54)
-AC_INIT(teckit, 2.1.3, jonathan_kew@sil.org)
+AC_INIT(teckit, 2.1.5, jonathan_kew@sil.org)
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([source/UnicodeNames.cpp])
 AM_INIT_AUTOMAKE
 
 # Optional features
-#AC_ARG_ENABLE(grcompiler,
-#    AC_HELP_STRING([--enable-grcompiler],
-#        [build the Graphite font compiler. (default=no)]),
-#    [package_grcompiler_enabled=yes], [package_grcompiler_enabled=no])
 AM_MAINTAINER_MODE
 
-
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
@@ -19,28 +14,25 @@ AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
 # Checks for libraries.
-AC_CHECK_LIB(z, compress)
-AC_CHECK_LIB(expat, XML_ExpatVersion)
+## AC_CHECK_LIB(z, compress)
+sinclude(../zlib/withenable.ac)
+sinclude(../zlib/zlib.ac)
 
-AM_CONDITIONAL(SYSTEM_EXPAT, test x$ac_cv_lib_expat_XML_ExpatVersion = xyes)
+## omit this for TL - we don't need sfconv
+## AC_CHECK_LIB(expat, XML_ExpatVersion)
+## AM_CONDITIONAL(SYSTEM_EXPAT, test x$ac_cv_lib_expat_XML_ExpatVersion = xyes)
 
 # Checks for header files.
-#AC_HEADER_STDC
-#AC_CHECK_HEADERS([limits.h malloc.h memory.h stddef.h stdlib.h string.h])
+AC_HEADER_STDC
+AC_CHECK_HEADERS([limits.h malloc.h memory.h stddef.h stdlib.h string.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 #AC_TYPE_SIZE_T
-#AC_STRUCT_TM
-#AC_CHECK_SIZEOF(wchar_t)
-#AC_SUBST(SIZEOF_WCHAR_T)
 
 # Checks for library functions.
-#AC_FUNC_ERROR_AT_LINE
-#AC_FUNC_MALLOC
-#AC_FUNC_MEMCMP
-#AC_FUNC_REALLOC
-#AC_FUNC_VPRINTF
-#AC_CHECK_FUNCS([isascii memmove memset strcasecmp strchr strrchr strtoul])
+AC_FUNC_MALLOC
+AC_FUNC_MEMCMP
+AC_FUNC_REALLOC
 AC_C_BIGENDIAN
 
 # Enable debug
@@ -61,24 +53,6 @@ else
     CXXFLAGS="$CXXFLAGS -DNDEBUG"
 fi
 
-# Enable final
-if test "$enable_final" = yes; then
-  CFLAGS="-O3 -DNDEBUG"
-  CXXFLAGS="-O3 -DNDEBUG"
-fi
-
-# Enable profile
-if test "$enable_profile" = yes; then
-  CFLAGS="$CFLAGS -pg "
-  CXXFLAGS="$CXXFLAGS -pg "
-fi
-if test "$enable_profilefn" = yes; then
-  CFLAGS="$CFLAGS -g -finstrument-functions "
-  CXXFLAGS="$CXXFLAGS -g -finstrument-functions "
-  LIBS="$LIBS -g -finstrument-functions -lfnccheck "
-fi
-
-
 AC_CONFIG_FILES([ Makefile lib/Makefile bin/Makefile docs/Makefile test/Makefile])
 
 AC_OUTPUT
diff --git a/Build/source/libs/teckit/docs/Makefile.in b/Build/source/libs/teckit/docs/Makefile.in
index f6a66b9d4ef..eb23eba785c 100644
--- a/Build/source/libs/teckit/docs/Makefile.in
+++ b/Build/source/libs/teckit/docs/Makefile.in
@@ -80,6 +80,7 @@ F77 = @F77@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDZLIB = @LDZLIB@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
@@ -89,6 +90,8 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
+ZLIBDEP = @ZLIBDEP@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
@@ -106,7 +109,7 @@ all: all-am
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  docs/Makefile
+	  $(AUTOMAKE) --gnu  docs/Makefile
 Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 
diff --git a/Build/source/libs/teckit/lib/Makefile.am b/Build/source/libs/teckit/lib/Makefile.am
index 6edb909001e..3e6ef5dc171 100644
--- a/Build/source/libs/teckit/lib/Makefile.am
+++ b/Build/source/libs/teckit/lib/Makefile.am
@@ -1,6 +1,11 @@
 AUTOMAKE_OPTIONS = 1.6
 
-AM_CPPFLAGS  = -I$(top_srcdir)/source/Public-headers
+ZLIBDIR = $(top_builddir)/../zlib
+ZLIBSRCDIR = $(top_srcdir)/../zlib
+
+ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
+
+AM_CPPFLAGS  = -I$(top_srcdir)/source/Public-headers $(ZLIBCPPFLAGS)
 AM_CFLAGS    = $(AM_CPPFLAGS)
 
 lib_LTLIBRARIES = libTECkit_Compiler.la libTECkit.la
diff --git a/Build/source/libs/teckit/lib/Makefile.in b/Build/source/libs/teckit/lib/Makefile.in
index 8b09088a548..ae751d968ea 100644
--- a/Build/source/libs/teckit/lib/Makefile.in
+++ b/Build/source/libs/teckit/lib/Makefile.in
@@ -80,6 +80,7 @@ F77 = @F77@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDZLIB = @LDZLIB@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
@@ -89,12 +90,18 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
+
+ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
+ZLIBDEP = @ZLIBDEP@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
 AUTOMAKE_OPTIONS = 1.6
 
-AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers
+ZLIBDIR = $(top_builddir)/../zlib
+ZLIBSRCDIR = $(top_srcdir)/../zlib
+
+AM_CPPFLAGS = -I$(top_srcdir)/source/Public-headers $(ZLIBCPPFLAGS)
 AM_CFLAGS = $(AM_CPPFLAGS)
 
 lib_LTLIBRARIES = libTECkit_Compiler.la libTECkit.la
@@ -156,7 +163,7 @@ all: all-am
 .SUFFIXES: .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(srcdir)/../source/Makefile.am $(top_srcdir)/source/Public-headers/Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  lib/Makefile
+	  $(AUTOMAKE) --gnu  lib/Makefile
 Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 libLTLIBRARIES_INSTALL = $(INSTALL)
diff --git a/Build/source/libs/teckit/source/Sample-tools/TECkit_Compile.c b/Build/source/libs/teckit/source/Sample-tools/TECkit_Compile.cpp
index cda7d74e66e..cda7d74e66e 100644
--- a/Build/source/libs/teckit/source/Sample-tools/TECkit_Compile.c
+++ b/Build/source/libs/teckit/source/Sample-tools/TECkit_Compile.cpp
diff --git a/Build/source/libs/teckit/source/Sample-tools/TxtConv.c b/Build/source/libs/teckit/source/Sample-tools/TxtConv.cpp
index 55e8e9ddee5..55e8e9ddee5 100755
--- a/Build/source/libs/teckit/source/Sample-tools/TxtConv.c
+++ b/Build/source/libs/teckit/source/Sample-tools/TxtConv.cpp
diff --git a/Build/source/libs/teckit/test/Makefile.in b/Build/source/libs/teckit/test/Makefile.in
index 1e0fe538760..0ab71f00fb0 100644
--- a/Build/source/libs/teckit/test/Makefile.in
+++ b/Build/source/libs/teckit/test/Makefile.in
@@ -80,6 +80,7 @@ F77 = @F77@
 GCJ = @GCJ@
 GCJFLAGS = @GCJFLAGS@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDZLIB = @LDZLIB@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAINT = @MAINT@
@@ -89,6 +90,8 @@ RANLIB = @RANLIB@
 RC = @RC@
 STRIP = @STRIP@
 VERSION = @VERSION@
+ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
+ZLIBDEP = @ZLIBDEP@
 am__include = @am__include@
 am__quote = @am__quote@
 install_sh = @install_sh@
@@ -104,7 +107,7 @@ all: all-am
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  test/Makefile
+	  $(AUTOMAKE) --gnu  test/Makefile
 Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)