update TEA 3.10

9 files changed, 790 insertions, 4 deletions

diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in
index 95f1a89..b18d896 100644
--- a/ds9/macosx/Makefile.in
+++ b/ds9/macosx/Makefile.in
@@ -29,6 +29,7 @@ tcliis_LIB_SPEC	= @tcliis_LIB_SPEC@
 tclsignal_LIB_SPEC= @tclsignal_LIB_SPEC@
 
 tkblt_LIB_SPEC	= @tkblt_LIB_SPEC@
+tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@
 tkmacosx_LIB_SPEC= @tkmacosx_LIB_SPEC@
 tkmpeg_LIB_SPEC	= @tkmpeg_LIB_SPEC@
 
@@ -69,7 +70,6 @@ LLIBS	= \
 	$(libdir)/libast_err.a \
 	$(libdir)/libast_pal.a \
 	$(libdir)/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
-	$(libdir)/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
 	$(libdir)/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \
 	$(libdir)/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \
 	$(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff$(TKIMGVER).a \
@@ -140,6 +140,7 @@ ds9base	: $(OBJS) $(LLIBS)
 	$(zlibtcl_LIB_SPEC) \
 	$(tkimg_LIB_SPEC) \
 	$(tkblt_LIB_SPEC) \
+	$(tkhtml1_LIB_SPEC) \
 	$(tkmacosx_LIB_SPEC) \
 	$(tkmpeg_LIB_SPEC) \
 	$(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \
diff --git a/ds9/macosx/configure b/ds9/macosx/configure
index 090a41e..1dcb4ee 100755
--- a/ds9/macosx/configure
+++ b/ds9/macosx/configure
@@ -668,6 +668,14 @@ tkmacosx_LIB_FILE
 tkmacosx_SRC_DIR
 tkmacosx_BIN_DIR
 tkmacosx_VERSION
+tkhtml1_STUB_LIB_PATH
+tkhtml1_STUB_LIB_SPEC
+tkhtml1_STUB_LIB_FILE
+tkhtml1_LIB_SPEC
+tkhtml1_LIB_FILE
+tkhtml1_SRC_DIR
+tkhtml1_BIN_DIR
+tkhtml1_VERSION
 tkblt_STUB_LIB_PATH
 tkblt_STUB_LIB_SPEC
 tkblt_STUB_LIB_FILE
@@ -836,6 +844,7 @@ with_jpegtcl
 with_zlibtcl
 with_tkimg
 with_tkblt
+with_tkhtml1
 with_tkmacosx
 with_tkmpeg
 with_tclinclude
@@ -1494,6 +1503,7 @@ Optional Packages:
   --with-zlibtcl              directory containing zlibtcl configuration (zlibtclConfig.sh)
   --with-tkimg              directory containing tkimg configuration (tkimgConfig.sh)
   --with-tkblt              directory containing tkblt configuration (tkbltConfig.sh)
+  --with-tkhtml1              directory containing tkhtml1 configuration (tkhtml1Config.sh)
   --with-tkmacosx              directory containing tkmacosx configuration (tkmacosxConfig.sh)
   --with-tkmpeg              directory containing tkmpeg configuration (tkmpegConfig.sh)
   --with-tclinclude       directory containing the public Tcl header files
@@ -5986,6 +5996,254 @@ fi
 
 
     #
+    # Ok, lets find the tkhtml1 configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tkhtml1
+    #
+
+    if test x"${no_tkhtml1}" = x ; then
+	# we reset no_tkhtml1 in case something fails here
+	no_tkhtml1=true
+
+# Check whether --with-tkhtml1 was given.
+if test "${with_tkhtml1+set}" = set; then :
+  withval=$with_tkhtml1; with_tkhtml1config=${withval}
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkhtml1 configuration" >&5
+$as_echo_n "checking for tkhtml1 configuration... " >&6; }
+	if ${ac_cv_c_tkhtml1config+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+	    # First check to see if --with-tkhtml1 was specified.
+	    if test x"${with_tkhtml1config}" != x ; then
+		case ${with_tkhtml1config} in
+		    */tkhtml1Config.sh )
+			if test -f ${with_tkhtml1config}; then
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkhtml1 argument should refer to directory containing tkhtml1Config.sh, not to tkhtml1Config.sh itself" >&5
+$as_echo "$as_me: WARNING: --with-tkhtml1 argument should refer to directory containing tkhtml1Config.sh, not to tkhtml1Config.sh itself" >&2;}
+			    with_tkhtml1config=`echo ${with_tkhtml1config} | sed 's!/tkhtml1Config\.sh$!!'`
+			fi;;
+		esac
+		if test -f "${with_tkhtml1config}/tkhtml1Config.sh" ; then
+		    ac_cv_c_tkhtml1config=`(cd ${with_tkhtml1config}; pwd)`
+		else
+		    as_fn_error $? "${with_tkhtml1config} directory doesn't contain tkhtml1Config.sh" "$LINENO" 5
+		fi
+	    fi
+
+	    # then check for a private tkhtml1 installation
+	    if test x"${ac_cv_c_tkhtml1config}" = x ; then
+		for i in \
+			../tkhtml1 \
+			`ls -dr ../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			../../tkhtml1 \
+			`ls -dr ../../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			../../../tkhtml1 \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			${srcdir}/../tkhtml1 \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			; do
+		    if test -f "$i/tkhtml1Config.sh" ; then
+			ac_cv_c_tkhtml1config=`(cd $i; pwd)`
+			break
+		    fi
+		    if test -f "$i/unix/tkhtml1Config.sh" ; then
+			ac_cv_c_tkhtml1config=`(cd $i/unix; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tkhtml1config}" = x ; then
+		for i in `ls -d ${libdir} 2>/dev/null` \
+			`ls -d ${exec_prefix}/lib 2>/dev/null` \
+			`ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` \
+			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
+			; do
+		    if test -f "$i/tkhtml1Config.sh" ; then
+			ac_cv_c_tkhtml1config=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+fi
+
+
+	if test x"${ac_cv_c_tkhtml1config}" = x ; then
+	    tkhtml1_BIN_DIR="# no tkhtml1 configs found"
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkhtml1 configuration definitions" >&5
+$as_echo "$as_me: WARNING: Cannot find tkhtml1 configuration definitions" >&2;}
+	    exit 0
+	else
+	    no_tkhtml1=
+	    tkhtml1_BIN_DIR=${ac_cv_c_tkhtml1config}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkhtml1_BIN_DIR/tkhtml1Config.sh" >&5
+$as_echo "found $tkhtml1_BIN_DIR/tkhtml1Config.sh" >&6; }
+	fi
+    fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkhtml1_BIN_DIR}/tkhtml1Config.sh" >&5
+$as_echo_n "checking for existence of ${tkhtml1_BIN_DIR}/tkhtml1Config.sh... " >&6; }
+
+    if test -f "${tkhtml1_BIN_DIR}/tkhtml1Config.sh" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
+	. "${tkhtml1_BIN_DIR}/tkhtml1Config.sh"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+    #
+    # If the tkhtml1_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable tkhtml1_LIB_SPEC will be set to the value
+    # of tkhtml1_BUILD_LIB_SPEC. An extension should make use of tkhtml1_LIB_SPEC
+    # instead of tkhtml1_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+
+    if test -f "${tkhtml1_BIN_DIR}/Makefile" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkhtml1" >&5
+$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkhtml1" >&2;}
+        tkhtml1_LIB_SPEC=${tkhtml1_BUILD_LIB_SPEC}
+        tkhtml1_STUB_LIB_SPEC=${tkhtml1_BUILD_STUB_LIB_SPEC}
+        tkhtml1_STUB_LIB_PATH=${tkhtml1_BUILD_STUB_LIB_PATH}
+        tkhtml1_INCLUDE_SPEC=${tkhtml1_BUILD_INCLUDE_SPEC}
+        tkhtml1_LIBRARY_PATH=${tkhtml1_LIBRARY_PATH}
+    fi
+
+
+
+
+
+
+
+
+
+
+
+
+    # Allow the caller to prevent this auto-check by specifying any 2nd arg
+    if test "x" = x; then :
+
+	# Check both upper and lower-case variants
+	# If a dev wanted non-stubs libs, this function could take an option
+	# to not use _STUB in the paths below
+	if test "x${tkhtml1_STUB_LIB_SPEC}" = x; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKHTML1_STUB library for LIBS" >&5
+$as_echo_n "checking For TKHTML1_STUB library for LIBS... " >&6; }
+    # This simplifies the use of stub libraries by automatically adding
+    # the stub lib to your path.  Normally this would add to SHLIB_LD_LIBS,
+    # but this is called before CONFIG_CFLAGS.  More importantly, this adds
+    # to PKG_LIBS, which becomes LIBS, and that is only used by SHLIB_LD.
+    if test "x${TKHTML1_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${TKHTML1_STUB_LIB_PATH}`\""
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKHTML1_STUB_LIB_PATH ${TKHTML1_STUB_LIB_PATH}" >&5
+$as_echo "using TKHTML1_STUB_LIB_PATH ${TKHTML1_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${TKHTML1_STUB_LIB_SPEC}"
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKHTML1_STUB_LIB_SPEC ${TKHTML1_STUB_LIB_SPEC}" >&5
+$as_echo "using TKHTML1_STUB_LIB_SPEC ${TKHTML1_STUB_LIB_SPEC}" >&6; }
+	fi
+    else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tkhtml1_STUB library for LIBS" >&5
+$as_echo_n "checking For tkhtml1_STUB library for LIBS... " >&6; }
+    # This simplifies the use of stub libraries by automatically adding
+    # the stub lib to your path.  Normally this would add to SHLIB_LD_LIBS,
+    # but this is called before CONFIG_CFLAGS.  More importantly, this adds
+    # to PKG_LIBS, which becomes LIBS, and that is only used by SHLIB_LD.
+    if test "x${tkhtml1_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${tkhtml1_STUB_LIB_PATH}`\""
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkhtml1_STUB_LIB_PATH ${tkhtml1_STUB_LIB_PATH}" >&5
+$as_echo "using tkhtml1_STUB_LIB_PATH ${tkhtml1_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${tkhtml1_STUB_LIB_SPEC}"
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkhtml1_STUB_LIB_SPEC ${tkhtml1_STUB_LIB_SPEC}" >&5
+$as_echo "using tkhtml1_STUB_LIB_SPEC ${tkhtml1_STUB_LIB_SPEC}" >&6; }
+	fi
+    else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+fi
+
+fi
+
+
+
+    #
     # Ok, lets find the tkmacosx configuration
     # First, look for one uninstalled.
     # the alternative search directory is invoked by --with-tkmacosx
diff --git a/ds9/macosx/configure.in b/ds9/macosx/configure.in
index 9cf64f4..63b50a2 100755
--- a/ds9/macosx/configure.in
+++ b/ds9/macosx/configure.in
@@ -76,6 +76,9 @@ TEA_LOAD_CONFIG(tkimg)
 TEA_PATH_CONFIG(tkblt)
 TEA_LOAD_CONFIG(tkblt)
 
+TEA_PATH_CONFIG(tkhtml1)
+TEA_LOAD_CONFIG(tkhtml1)
+
 TEA_PATH_CONFIG(tkmacosx)
 TEA_LOAD_CONFIG(tkmacosx)
 
diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
index 78d6496..a7ee945 100644
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
@@ -1,4 +1,4 @@
-prefix		= @prefix@
+nprefix		= @prefix@
 exec_prefix	= @exec_prefix@
 
 bindir		= @bindir@
@@ -30,6 +30,7 @@ tclsignal_LIB_SPEC= @tclsignal_LIB_SPEC@
 tclzvfs_LIB_SPEC= @tclzvfs_LIB_SPEC@
 
 tkblt_LIB_SPEC	= @tkblt_LIB_SPEC@
+tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@
 tkmpeg_LIB_SPEC	= @tkmpeg_LIB_SPEC@
 
 CC		= @CC@
@@ -85,7 +86,6 @@ LLIBS	= \
 	$(libdir)/libast_err.a \
 	$(libdir)/libast_pal.a \
 	$(libdir)/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
-	$(libdir)/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
 	$(libdir)/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \
 	$(libdir)/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \
 	$(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff$(TKIMGVER).a \
@@ -153,6 +153,7 @@ ds9base	: $(OBJS) $(LLIBS)
 	$(zlibtcl_LIB_SPEC) \
 	$(tkimg_LIB_SPEC) \
 	$(tkblt_LIB_SPEC) \
+	$(tkhtml1_LIB_SPEC) \
 	$(tkmpeg_LIB_SPEC) \
 	$(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \
 	$(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \
diff --git a/ds9/unix/configure b/ds9/unix/configure
index fdfd7a3..06e38bd 100755
--- a/ds9/unix/configure
+++ b/ds9/unix/configure
@@ -661,6 +661,14 @@ tkmpeg_LIB_FILE
 tkmpeg_SRC_DIR
 tkmpeg_BIN_DIR
 tkmpeg_VERSION
+tkhtml1_STUB_LIB_PATH
+tkhtml1_STUB_LIB_SPEC
+tkhtml1_STUB_LIB_FILE
+tkhtml1_LIB_SPEC
+tkhtml1_LIB_FILE
+tkhtml1_SRC_DIR
+tkhtml1_BIN_DIR
+tkhtml1_VERSION
 tkblt_STUB_LIB_PATH
 tkblt_STUB_LIB_SPEC
 tkblt_STUB_LIB_FILE
@@ -838,6 +846,7 @@ with_jpegtcl
 with_zlibtcl
 with_tkimg
 with_tkblt
+with_tkhtml1
 with_tkmpeg
 with_tclinclude
 with_tkinclude
@@ -1496,6 +1505,7 @@ Optional Packages:
   --with-zlibtcl              directory containing zlibtcl configuration (zlibtclConfig.sh)
   --with-tkimg              directory containing tkimg configuration (tkimgConfig.sh)
   --with-tkblt              directory containing tkblt configuration (tkbltConfig.sh)
+  --with-tkhtml1              directory containing tkhtml1 configuration (tkhtml1Config.sh)
   --with-tkmpeg              directory containing tkmpeg configuration (tkmpegConfig.sh)
   --with-tclinclude       directory containing the public Tcl header files
   --with-tkinclude        directory containing the public Tk header files
@@ -6235,6 +6245,254 @@ fi
 
 
     #
+    # Ok, lets find the tkhtml1 configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tkhtml1
+    #
+
+    if test x"${no_tkhtml1}" = x ; then
+	# we reset no_tkhtml1 in case something fails here
+	no_tkhtml1=true
+
+# Check whether --with-tkhtml1 was given.
+if test "${with_tkhtml1+set}" = set; then :
+  withval=$with_tkhtml1; with_tkhtml1config=${withval}
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkhtml1 configuration" >&5
+$as_echo_n "checking for tkhtml1 configuration... " >&6; }
+	if ${ac_cv_c_tkhtml1config+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+	    # First check to see if --with-tkhtml1 was specified.
+	    if test x"${with_tkhtml1config}" != x ; then
+		case ${with_tkhtml1config} in
+		    */tkhtml1Config.sh )
+			if test -f ${with_tkhtml1config}; then
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkhtml1 argument should refer to directory containing tkhtml1Config.sh, not to tkhtml1Config.sh itself" >&5
+$as_echo "$as_me: WARNING: --with-tkhtml1 argument should refer to directory containing tkhtml1Config.sh, not to tkhtml1Config.sh itself" >&2;}
+			    with_tkhtml1config=`echo ${with_tkhtml1config} | sed 's!/tkhtml1Config\.sh$!!'`
+			fi;;
+		esac
+		if test -f "${with_tkhtml1config}/tkhtml1Config.sh" ; then
+		    ac_cv_c_tkhtml1config=`(cd ${with_tkhtml1config}; pwd)`
+		else
+		    as_fn_error $? "${with_tkhtml1config} directory doesn't contain tkhtml1Config.sh" "$LINENO" 5
+		fi
+	    fi
+
+	    # then check for a private tkhtml1 installation
+	    if test x"${ac_cv_c_tkhtml1config}" = x ; then
+		for i in \
+			../tkhtml1 \
+			`ls -dr ../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			../../tkhtml1 \
+			`ls -dr ../../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			../../../tkhtml1 \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			${srcdir}/../tkhtml1 \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			; do
+		    if test -f "$i/tkhtml1Config.sh" ; then
+			ac_cv_c_tkhtml1config=`(cd $i; pwd)`
+			break
+		    fi
+		    if test -f "$i/unix/tkhtml1Config.sh" ; then
+			ac_cv_c_tkhtml1config=`(cd $i/unix; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tkhtml1config}" = x ; then
+		for i in `ls -d ${libdir} 2>/dev/null` \
+			`ls -d ${exec_prefix}/lib 2>/dev/null` \
+			`ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` \
+			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
+			; do
+		    if test -f "$i/tkhtml1Config.sh" ; then
+			ac_cv_c_tkhtml1config=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+fi
+
+
+	if test x"${ac_cv_c_tkhtml1config}" = x ; then
+	    tkhtml1_BIN_DIR="# no tkhtml1 configs found"
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkhtml1 configuration definitions" >&5
+$as_echo "$as_me: WARNING: Cannot find tkhtml1 configuration definitions" >&2;}
+	    exit 0
+	else
+	    no_tkhtml1=
+	    tkhtml1_BIN_DIR=${ac_cv_c_tkhtml1config}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkhtml1_BIN_DIR/tkhtml1Config.sh" >&5
+$as_echo "found $tkhtml1_BIN_DIR/tkhtml1Config.sh" >&6; }
+	fi
+    fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkhtml1_BIN_DIR}/tkhtml1Config.sh" >&5
+$as_echo_n "checking for existence of ${tkhtml1_BIN_DIR}/tkhtml1Config.sh... " >&6; }
+
+    if test -f "${tkhtml1_BIN_DIR}/tkhtml1Config.sh" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
+	. "${tkhtml1_BIN_DIR}/tkhtml1Config.sh"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+    #
+    # If the tkhtml1_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable tkhtml1_LIB_SPEC will be set to the value
+    # of tkhtml1_BUILD_LIB_SPEC. An extension should make use of tkhtml1_LIB_SPEC
+    # instead of tkhtml1_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+
+    if test -f "${tkhtml1_BIN_DIR}/Makefile" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkhtml1" >&5
+$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkhtml1" >&2;}
+        tkhtml1_LIB_SPEC=${tkhtml1_BUILD_LIB_SPEC}
+        tkhtml1_STUB_LIB_SPEC=${tkhtml1_BUILD_STUB_LIB_SPEC}
+        tkhtml1_STUB_LIB_PATH=${tkhtml1_BUILD_STUB_LIB_PATH}
+        tkhtml1_INCLUDE_SPEC=${tkhtml1_BUILD_INCLUDE_SPEC}
+        tkhtml1_LIBRARY_PATH=${tkhtml1_LIBRARY_PATH}
+    fi
+
+
+
+
+
+
+
+
+
+
+
+
+    # Allow the caller to prevent this auto-check by specifying any 2nd arg
+    if test "x" = x; then :
+
+	# Check both upper and lower-case variants
+	# If a dev wanted non-stubs libs, this function could take an option
+	# to not use _STUB in the paths below
+	if test "x${tkhtml1_STUB_LIB_SPEC}" = x; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKHTML1_STUB library for LIBS" >&5
+$as_echo_n "checking For TKHTML1_STUB library for LIBS... " >&6; }
+    # This simplifies the use of stub libraries by automatically adding
+    # the stub lib to your path.  Normally this would add to SHLIB_LD_LIBS,
+    # but this is called before CONFIG_CFLAGS.  More importantly, this adds
+    # to PKG_LIBS, which becomes LIBS, and that is only used by SHLIB_LD.
+    if test "x${TKHTML1_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${TKHTML1_STUB_LIB_PATH}`\""
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKHTML1_STUB_LIB_PATH ${TKHTML1_STUB_LIB_PATH}" >&5
+$as_echo "using TKHTML1_STUB_LIB_PATH ${TKHTML1_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${TKHTML1_STUB_LIB_SPEC}"
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKHTML1_STUB_LIB_SPEC ${TKHTML1_STUB_LIB_SPEC}" >&5
+$as_echo "using TKHTML1_STUB_LIB_SPEC ${TKHTML1_STUB_LIB_SPEC}" >&6; }
+	fi
+    else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tkhtml1_STUB library for LIBS" >&5
+$as_echo_n "checking For tkhtml1_STUB library for LIBS... " >&6; }
+    # This simplifies the use of stub libraries by automatically adding
+    # the stub lib to your path.  Normally this would add to SHLIB_LD_LIBS,
+    # but this is called before CONFIG_CFLAGS.  More importantly, this adds
+    # to PKG_LIBS, which becomes LIBS, and that is only used by SHLIB_LD.
+    if test "x${tkhtml1_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${tkhtml1_STUB_LIB_PATH}`\""
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkhtml1_STUB_LIB_PATH ${tkhtml1_STUB_LIB_PATH}" >&5
+$as_echo "using tkhtml1_STUB_LIB_PATH ${tkhtml1_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${tkhtml1_STUB_LIB_SPEC}"
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkhtml1_STUB_LIB_SPEC ${tkhtml1_STUB_LIB_SPEC}" >&5
+$as_echo "using tkhtml1_STUB_LIB_SPEC ${tkhtml1_STUB_LIB_SPEC}" >&6; }
+	fi
+    else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+fi
+
+fi
+
+
+
+    #
     # Ok, lets find the tkmpeg configuration
     # First, look for one uninstalled.
     # the alternative search directory is invoked by --with-tkmpeg
diff --git a/ds9/unix/configure.in b/ds9/unix/configure.in
index 02f14e3..891e303 100755
--- a/ds9/unix/configure.in
+++ b/ds9/unix/configure.in
@@ -79,6 +79,9 @@ TEA_LOAD_CONFIG(tkimg)
 TEA_PATH_CONFIG(tkblt)
 TEA_LOAD_CONFIG(tkblt)
 
+TEA_PATH_CONFIG(tkhtml1)
+TEA_LOAD_CONFIG(tkhtml1)
+
 TEA_PATH_CONFIG(tkmpeg)
 TEA_LOAD_CONFIG(tkmpeg)
 
diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in
index 72bb736..ad7096f 100755
--- a/ds9/win/Makefile.in
+++ b/ds9/win/Makefile.in
@@ -25,6 +25,7 @@ zlibtcl_LIB_SPEC= @zlibtcl_LIB_SPEC@
 tkimg_LIB_SPEC	= @tkimg_LIB_SPEC@
 
 tkblt_LIB_SPEC	= @tkblt_LIB_SPEC@
+tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@
 tkmpeg_LIB_SPEC	= @tkmpeg_LIB_SPEC@
 tkwin_LIB_SPEC	= @tkwin_LIB_SPEC@
 
@@ -65,7 +66,6 @@ LLIBS	= \
 	$(libdir)/libast_err.a \
 	$(libdir)/libast_pal.a \
 	$(libdir)/tksao$(TKSAOVER)/tksao10.a \
-	$(libdir)/tkhtml1$(TKHTMLVER)/tkhtml110.a \
 	$(libdir)/Tclxml$(TCLXMLVER)/Tclxml32.a \
 	$(libdir)/Tktable$(TKTABLEVER)/Tktable210.a \
 	$(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff146.a \
@@ -105,6 +105,7 @@ ds9Base$(EXEEXT): $(OBJS) $(LLIBS)
 	$(zlibtcl_LIB_SPEC) \
 	$(tkimg_LIB_SPEC) \
 	$(tkblt_LIB_SPEC) \
+	$(tkhtml1_LIB_SPEC) \
 	$(tkmpeg_LIB_SPEC) \
 	$(tkwin_LIB_SPEC) \
 	$(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \
diff --git a/ds9/win/configure b/ds9/win/configure
index cd95de8..4d3d905 100755
--- a/ds9/win/configure
+++ b/ds9/win/configure
@@ -659,6 +659,14 @@ tkwin_LIB_FILE
 tkwin_SRC_DIR
 tkwin_BIN_DIR
 tkwin_VERSION
+tkhtml1_STUB_LIB_PATH
+tkhtml1_STUB_LIB_SPEC
+tkhtml1_STUB_LIB_FILE
+tkhtml1_LIB_SPEC
+tkhtml1_LIB_FILE
+tkhtml1_SRC_DIR
+tkhtml1_BIN_DIR
+tkhtml1_VERSION
 tkmpeg_STUB_LIB_PATH
 tkmpeg_STUB_LIB_SPEC
 tkmpeg_STUB_LIB_FILE
@@ -809,6 +817,7 @@ with_zlibtcl
 with_tkimg
 with_tkblt
 with_tkmpeg
+with_tkhtml1
 with_tkwin
 with_tclinclude
 with_tkinclude
@@ -1458,6 +1467,7 @@ Optional Packages:
   --with-tkimg              directory containing tkimg configuration (tkimgConfig.sh)
   --with-tkblt              directory containing tkblt configuration (tkbltConfig.sh)
   --with-tkmpeg              directory containing tkmpeg configuration (tkmpegConfig.sh)
+  --with-tkhtml1              directory containing tkhtml1 configuration (tkhtml1Config.sh)
   --with-tkwin              directory containing tkwin configuration (tkwinConfig.sh)
   --with-tclinclude       directory containing the public Tcl header files
   --with-tkinclude        directory containing the public Tk header files
@@ -5451,6 +5461,254 @@ fi
 
 
     #
+    # Ok, lets find the tkhtml1 configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tkhtml1
+    #
+
+    if test x"${no_tkhtml1}" = x ; then
+	# we reset no_tkhtml1 in case something fails here
+	no_tkhtml1=true
+
+# Check whether --with-tkhtml1 was given.
+if test "${with_tkhtml1+set}" = set; then :
+  withval=$with_tkhtml1; with_tkhtml1config=${withval}
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkhtml1 configuration" >&5
+$as_echo_n "checking for tkhtml1 configuration... " >&6; }
+	if ${ac_cv_c_tkhtml1config+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+	    # First check to see if --with-tkhtml1 was specified.
+	    if test x"${with_tkhtml1config}" != x ; then
+		case ${with_tkhtml1config} in
+		    */tkhtml1Config.sh )
+			if test -f ${with_tkhtml1config}; then
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkhtml1 argument should refer to directory containing tkhtml1Config.sh, not to tkhtml1Config.sh itself" >&5
+$as_echo "$as_me: WARNING: --with-tkhtml1 argument should refer to directory containing tkhtml1Config.sh, not to tkhtml1Config.sh itself" >&2;}
+			    with_tkhtml1config=`echo ${with_tkhtml1config} | sed 's!/tkhtml1Config\.sh$!!'`
+			fi;;
+		esac
+		if test -f "${with_tkhtml1config}/tkhtml1Config.sh" ; then
+		    ac_cv_c_tkhtml1config=`(cd ${with_tkhtml1config}; pwd)`
+		else
+		    as_fn_error $? "${with_tkhtml1config} directory doesn't contain tkhtml1Config.sh" "$LINENO" 5
+		fi
+	    fi
+
+	    # then check for a private tkhtml1 installation
+	    if test x"${ac_cv_c_tkhtml1config}" = x ; then
+		for i in \
+			../tkhtml1 \
+			`ls -dr ../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			../../tkhtml1 \
+			`ls -dr ../../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			../../../tkhtml1 \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			${srcdir}/../tkhtml1 \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkhtml1*[0-9].[0-9]* 2>/dev/null` \
+			; do
+		    if test -f "$i/tkhtml1Config.sh" ; then
+			ac_cv_c_tkhtml1config=`(cd $i; pwd)`
+			break
+		    fi
+		    if test -f "$i/unix/tkhtml1Config.sh" ; then
+			ac_cv_c_tkhtml1config=`(cd $i/unix; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tkhtml1config}" = x ; then
+		for i in `ls -d ${libdir} 2>/dev/null` \
+			`ls -d ${exec_prefix}/lib 2>/dev/null` \
+			`ls -d ${prefix}/lib 2>/dev/null` \
+			`ls -d /usr/local/lib 2>/dev/null` \
+			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
+			; do
+		    if test -f "$i/tkhtml1Config.sh" ; then
+			ac_cv_c_tkhtml1config=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+fi
+
+
+	if test x"${ac_cv_c_tkhtml1config}" = x ; then
+	    tkhtml1_BIN_DIR="# no tkhtml1 configs found"
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkhtml1 configuration definitions" >&5
+$as_echo "$as_me: WARNING: Cannot find tkhtml1 configuration definitions" >&2;}
+	    exit 0
+	else
+	    no_tkhtml1=
+	    tkhtml1_BIN_DIR=${ac_cv_c_tkhtml1config}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkhtml1_BIN_DIR/tkhtml1Config.sh" >&5
+$as_echo "found $tkhtml1_BIN_DIR/tkhtml1Config.sh" >&6; }
+	fi
+    fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkhtml1_BIN_DIR}/tkhtml1Config.sh" >&5
+$as_echo_n "checking for existence of ${tkhtml1_BIN_DIR}/tkhtml1Config.sh... " >&6; }
+
+    if test -f "${tkhtml1_BIN_DIR}/tkhtml1Config.sh" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
+	. "${tkhtml1_BIN_DIR}/tkhtml1Config.sh"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+    #
+    # If the tkhtml1_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable tkhtml1_LIB_SPEC will be set to the value
+    # of tkhtml1_BUILD_LIB_SPEC. An extension should make use of tkhtml1_LIB_SPEC
+    # instead of tkhtml1_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+
+    if test -f "${tkhtml1_BIN_DIR}/Makefile" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkhtml1" >&5
+$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkhtml1" >&2;}
+        tkhtml1_LIB_SPEC=${tkhtml1_BUILD_LIB_SPEC}
+        tkhtml1_STUB_LIB_SPEC=${tkhtml1_BUILD_STUB_LIB_SPEC}
+        tkhtml1_STUB_LIB_PATH=${tkhtml1_BUILD_STUB_LIB_PATH}
+        tkhtml1_INCLUDE_SPEC=${tkhtml1_BUILD_INCLUDE_SPEC}
+        tkhtml1_LIBRARY_PATH=${tkhtml1_LIBRARY_PATH}
+    fi
+
+
+
+
+
+
+
+
+
+
+
+
+    # Allow the caller to prevent this auto-check by specifying any 2nd arg
+    if test "x" = x; then :
+
+	# Check both upper and lower-case variants
+	# If a dev wanted non-stubs libs, this function could take an option
+	# to not use _STUB in the paths below
+	if test "x${tkhtml1_STUB_LIB_SPEC}" = x; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKHTML1_STUB library for LIBS" >&5
+$as_echo_n "checking For TKHTML1_STUB library for LIBS... " >&6; }
+    # This simplifies the use of stub libraries by automatically adding
+    # the stub lib to your path.  Normally this would add to SHLIB_LD_LIBS,
+    # but this is called before CONFIG_CFLAGS.  More importantly, this adds
+    # to PKG_LIBS, which becomes LIBS, and that is only used by SHLIB_LD.
+    if test "x${TKHTML1_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${TKHTML1_STUB_LIB_PATH}`\""
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKHTML1_STUB_LIB_PATH ${TKHTML1_STUB_LIB_PATH}" >&5
+$as_echo "using TKHTML1_STUB_LIB_PATH ${TKHTML1_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${TKHTML1_STUB_LIB_SPEC}"
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKHTML1_STUB_LIB_SPEC ${TKHTML1_STUB_LIB_SPEC}" >&5
+$as_echo "using TKHTML1_STUB_LIB_SPEC ${TKHTML1_STUB_LIB_SPEC}" >&6; }
+	fi
+    else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tkhtml1_STUB library for LIBS" >&5
+$as_echo_n "checking For tkhtml1_STUB library for LIBS... " >&6; }
+    # This simplifies the use of stub libraries by automatically adding
+    # the stub lib to your path.  Normally this would add to SHLIB_LD_LIBS,
+    # but this is called before CONFIG_CFLAGS.  More importantly, this adds
+    # to PKG_LIBS, which becomes LIBS, and that is only used by SHLIB_LD.
+    if test "x${tkhtml1_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${tkhtml1_STUB_LIB_PATH}`\""
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkhtml1_STUB_LIB_PATH ${tkhtml1_STUB_LIB_PATH}" >&5
+$as_echo "using tkhtml1_STUB_LIB_PATH ${tkhtml1_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${tkhtml1_STUB_LIB_SPEC}"
+    for i in $vars; do
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then
+	    # Convert foo.lib to -lfoo for GCC.  No-op if not *.lib
+	    i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'`
+	fi
+	PKG_LIBS="$PKG_LIBS $i"
+    done
+
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkhtml1_STUB_LIB_SPEC ${tkhtml1_STUB_LIB_SPEC}" >&5
+$as_echo "using tkhtml1_STUB_LIB_SPEC ${tkhtml1_STUB_LIB_SPEC}" >&6; }
+	fi
+    else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+fi
+
+fi
+
+
+
+    #
     # Ok, lets find the tkwin configuration
     # First, look for one uninstalled.
     # the alternative search directory is invoked by --with-tkwin
diff --git a/ds9/win/configure.in b/ds9/win/configure.in
index 250a64f..3429a67 100755
--- a/ds9/win/configure.in
+++ b/ds9/win/configure.in
@@ -70,6 +70,9 @@ TEA_LOAD_CONFIG(tkblt)
 TEA_PATH_CONFIG(tkmpeg)
 TEA_LOAD_CONFIG(tkmpeg)
 
+TEA_PATH_CONFIG(tkhtml1)
+TEA_LOAD_CONFIG(tkhtml1)
+
 TEA_PATH_CONFIG(tkwin)
 TEA_LOAD_CONFIG(tkwin)