initial commit tclfitsy

12 files changed, 813 insertions, 0 deletions

diff --git a/ds9/macos/Makefile.in b/ds9/macos/Makefile.in
index e5f8486..de60a9f 100644
--- a/ds9/macos/Makefile.in
+++ b/ds9/macos/Makefile.in
@@ -28,6 +28,7 @@ tkimgtiff_LIB_SPEC= @tkimgtiff_LIB_SPEC@
 tkimgwindow_LIB_SPEC= @tkimgwindow_LIB_SPEC@
 
 tcliis_LIB_SPEC	= @tcliis_LIB_SPEC@
+tclfitsy_LIB_SPEC= @tclfitsy_LIB_SPEC@
 tclsignal_LIB_SPEC= @tclsignal_LIB_SPEC@
 tclxml_LIB_SPEC = @tclxml_LIB_SPEC@
 tls_LIB_SPEC=@tls_LIB_SPEC@
@@ -89,6 +90,7 @@ SPECS	= \
 	$(tifftcl_LIB_SPEC) \
 	$(zlibtcl_LIB_SPEC) \
 	$(tcliis_LIB_SPEC) \
+	$(tclfitsy_LIB_SPEC) \
 	$(tclsignal_LIB_SPEC) \
 	$(tclxml_LIB_SPEC) \
 	$(tls_LIB_SPEC) \
diff --git a/ds9/macos/configure b/ds9/macos/configure
index 7ea1070..b57b204 100755
--- a/ds9/macos/configure
+++ b/ds9/macos/configure
@@ -768,6 +768,14 @@ tclsignal_LIB_FILE
 tclsignal_SRC_DIR
 tclsignal_BIN_DIR
 tclsignal_VERSION
+tclfitsy_STUB_LIB_PATH
+tclfitsy_STUB_LIB_SPEC
+tclfitsy_STUB_LIB_FILE
+tclfitsy_LIB_SPEC
+tclfitsy_LIB_FILE
+tclfitsy_SRC_DIR
+tclfitsy_BIN_DIR
+tclfitsy_VERSION
 tcliis_STUB_LIB_PATH
 tcliis_STUB_LIB_SPEC
 tcliis_STUB_LIB_FILE
@@ -897,6 +905,7 @@ with_tifftcl
 with_jpegtcl
 with_zlibtcl
 with_tcliis
+with_tclfitsy
 with_tclsignal
 with_tclxml
 with_tls
@@ -1570,6 +1579,7 @@ Optional Packages:
   --with-jpegtcl              directory containing jpegtcl configuration (jpegtclConfig.sh)
   --with-zlibtcl              directory containing zlibtcl configuration (zlibtclConfig.sh)
   --with-tcliis              directory containing tcliis configuration (tcliisConfig.sh)
+  --with-tclfitsy              directory containing tclfitsy configuration (tclfitsyConfig.sh)
   --with-tclsignal              directory containing tclsignal configuration (tclsignalConfig.sh)
   --with-tclxml              directory containing tclxml configuration (tclxmlConfig.sh)
   --with-tls              directory containing tls configuration (tlsConfig.sh)
@@ -4891,6 +4901,255 @@ fi
 
 
     #
+    # Ok, lets find the tclfitsy configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tclfitsy
+    #
+
+    if test x"${no_tclfitsy}" = x ; then
+	# we reset no_tclfitsy in case something fails here
+	no_tclfitsy=true
+
+# Check whether --with-tclfitsy was given.
+if test "${with_tclfitsy+set}" = set; then :
+  withval=$with_tclfitsy; with_tclfitsyconfig=${withval}
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclfitsy configuration" >&5
+$as_echo_n "checking for tclfitsy configuration... " >&6; }
+	if ${ac_cv_c_tclfitsyconfig+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+	    # First check to see if --with-tclfitsy was specified.
+	    if test x"${with_tclfitsyconfig}" != x ; then
+		case ${with_tclfitsyconfig} in
+		    */tclfitsyConfig.sh )
+			if test -f ${with_tclfitsyconfig}; then
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclfitsy argument should refer to directory containing tclfitsyConfig.sh, not to tclfitsyConfig.sh itself" >&5
+$as_echo "$as_me: WARNING: --with-tclfitsy argument should refer to directory containing tclfitsyConfig.sh, not to tclfitsyConfig.sh itself" >&2;}
+			    with_tclfitsyconfig=`echo ${with_tclfitsyconfig} | sed 's!/tclfitsyConfig\.sh$!!'`
+			fi;;
+		esac
+		if test -f "${with_tclfitsyconfig}/tclfitsyConfig.sh" ; then
+		    ac_cv_c_tclfitsyconfig=`(cd ${with_tclfitsyconfig}; pwd)`
+		else
+		    as_fn_error $? "${with_tclfitsyconfig} directory doesn't contain tclfitsyConfig.sh" "$LINENO" 5
+		fi
+	    fi
+
+	    # then check for a private tclfitsy installation
+	    if test x"${ac_cv_c_tclfitsyconfig}" = x ; then
+		for i in \
+			../tclfitsy \
+			`ls -dr ../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			../../tclfitsy \
+			`ls -dr ../../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			../../../tclfitsy \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			${srcdir}/../tclfitsy \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			; do
+		    if test -f "$i/tclfitsyConfig.sh" ; then
+			ac_cv_c_tclfitsyconfig=`(cd $i; pwd)`
+			break
+		    fi
+		    if test -f "$i/unix/tclfitsyConfig.sh" ; then
+			ac_cv_c_tclfitsyconfig=`(cd $i/unix; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tclfitsyconfig}" = 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/pkg/lib 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
+			; do
+		    if test -f "$i/tclfitsyConfig.sh" ; then
+			ac_cv_c_tclfitsyconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+fi
+
+
+	if test x"${ac_cv_c_tclfitsyconfig}" = x ; then
+	    tclfitsy_BIN_DIR="# no tclfitsy configs found"
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclfitsy configuration definitions" >&5
+$as_echo "$as_me: WARNING: Cannot find tclfitsy configuration definitions" >&2;}
+	    exit 0
+	else
+	    no_tclfitsy=
+	    tclfitsy_BIN_DIR=${ac_cv_c_tclfitsyconfig}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclfitsy_BIN_DIR/tclfitsyConfig.sh" >&5
+$as_echo "found $tclfitsy_BIN_DIR/tclfitsyConfig.sh" >&6; }
+	fi
+    fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclfitsy_BIN_DIR}/tclfitsyConfig.sh" >&5
+$as_echo_n "checking for existence of ${tclfitsy_BIN_DIR}/tclfitsyConfig.sh... " >&6; }
+
+    if test -f "${tclfitsy_BIN_DIR}/tclfitsyConfig.sh" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
+	. "${tclfitsy_BIN_DIR}/tclfitsyConfig.sh"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+    #
+    # If the tclfitsy_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 tclfitsy_LIB_SPEC will be set to the value
+    # of tclfitsy_BUILD_LIB_SPEC. An extension should make use of tclfitsy_LIB_SPEC
+    # instead of tclfitsy_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+
+    if test -f "${tclfitsy_BIN_DIR}/Makefile" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclfitsy" >&5
+$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclfitsy" >&2;}
+        tclfitsy_LIB_SPEC=${tclfitsy_BUILD_LIB_SPEC}
+        tclfitsy_STUB_LIB_SPEC=${tclfitsy_BUILD_STUB_LIB_SPEC}
+        tclfitsy_STUB_LIB_PATH=${tclfitsy_BUILD_STUB_LIB_PATH}
+        tclfitsy_INCLUDE_SPEC=${tclfitsy_BUILD_INCLUDE_SPEC}
+        tclfitsy_LIBRARY_PATH=${tclfitsy_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${tclfitsy_STUB_LIB_SPEC}" = x; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLFITSY_STUB library for LIBS" >&5
+$as_echo_n "checking For TCLFITSY_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${TCLFITSY_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${TCLFITSY_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 TCLFITSY_STUB_LIB_PATH ${TCLFITSY_STUB_LIB_PATH}" >&5
+$as_echo "using TCLFITSY_STUB_LIB_PATH ${TCLFITSY_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${TCLFITSY_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 TCLFITSY_STUB_LIB_SPEC ${TCLFITSY_STUB_LIB_SPEC}" >&5
+$as_echo "using TCLFITSY_STUB_LIB_SPEC ${TCLFITSY_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 tclfitsy_STUB library for LIBS" >&5
+$as_echo_n "checking For tclfitsy_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${tclfitsy_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${tclfitsy_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 tclfitsy_STUB_LIB_PATH ${tclfitsy_STUB_LIB_PATH}" >&5
+$as_echo "using tclfitsy_STUB_LIB_PATH ${tclfitsy_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${tclfitsy_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 tclfitsy_STUB_LIB_SPEC ${tclfitsy_STUB_LIB_SPEC}" >&5
+$as_echo "using tclfitsy_STUB_LIB_SPEC ${tclfitsy_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 tclsignal configuration
     # First, look for one uninstalled.
     # the alternative search directory is invoked by --with-tclsignal
diff --git a/ds9/macos/configure.ac b/ds9/macos/configure.ac
index 7d969d5..2b3e2da 100644
--- a/ds9/macos/configure.ac
+++ b/ds9/macos/configure.ac
@@ -61,6 +61,9 @@ TEA_LOAD_CONFIG(zlibtcl)
 TEA_PATH_CONFIG(tcliis)
 TEA_LOAD_CONFIG(tcliis)
 
+TEA_PATH_CONFIG(tclfitsy)
+TEA_LOAD_CONFIG(tclfitsy)
+
 TEA_PATH_CONFIG(tclsignal)
 TEA_LOAD_CONFIG(tclsignal)
 
diff --git a/ds9/macos/ds9.C b/ds9/macos/ds9.C
index 76fc6f5..3cab1de 100644
--- a/ds9/macos/ds9.C
+++ b/ds9/macos/ds9.C
@@ -36,6 +36,7 @@ extern "C" {
 
   int Tclxpa_Init(Tcl_Interp*);
   int Tcliis_Init(Tcl_Interp*);
+  int Tclfitsy_Init(Tcl_Interp*);
 
   int Tls_Init(Tcl_Interp*);
   int Tclxml_Init(Tcl_Interp*);
@@ -135,6 +136,12 @@ int SAOAppInit(Tcl_Interp *interp)
   Tcl_StaticPackage (interp, "tcliis", Tcliis_Init, 
 		     (Tcl_PackageInitProc*)NULL);
 
+  // Tclfitsy
+  if (Tclfitsy_Init(interp) == TCL_ERROR)
+    return TCL_ERROR;
+  Tcl_StaticPackage (interp, "tclfitsy", Tclfitsy_Init, 
+		     (Tcl_PackageInitProc*)NULL);
+
   // Tkmpeg
   if (Tkmpeg_Init(interp) == TCL_ERROR)
     return TCL_ERROR;
diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
index 83253e6..7d3ac70 100644
--- a/ds9/unix/Makefile.in
+++ b/ds9/unix/Makefile.in
@@ -28,6 +28,7 @@ tkimgtiff_LIB_SPEC= @tkimgtiff_LIB_SPEC@
 tkimgwindow_LIB_SPEC= @tkimgwindow_LIB_SPEC@
 
 tcliis_LIB_SPEC	= @tcliis_LIB_SPEC@
+tclfitsy_LIB_SPEC= @tclfitsy_LIB_SPEC@
 tclsignal_LIB_SPEC= @tclsignal_LIB_SPEC@
 tclxml_LIB_SPEC	= @tclxml_LIB_SPEC@
 tclzipfs_LIB_SPEC= @tclzipfs_LIB_SPEC@
@@ -86,6 +87,7 @@ SPECS	= \
 	$(tifftcl_LIB_SPEC) \
 	$(zlibtcl_LIB_SPEC) \
 	$(tcliis_LIB_SPEC) \
+	$(tclfitsy_LIB_SPEC) \
 	$(tclsignal_LIB_SPEC) \
 	$(tclxml_LIB_SPEC) \
 	$(tclzipfs_LIB_SPEC) \
diff --git a/ds9/unix/configure b/ds9/unix/configure
index 1555107..84aaff5 100755
--- a/ds9/unix/configure
+++ b/ds9/unix/configure
@@ -769,6 +769,14 @@ tclsignal_LIB_FILE
 tclsignal_SRC_DIR
 tclsignal_BIN_DIR
 tclsignal_VERSION
+tclfitsy_STUB_LIB_PATH
+tclfitsy_STUB_LIB_SPEC
+tclfitsy_STUB_LIB_FILE
+tclfitsy_LIB_SPEC
+tclfitsy_LIB_FILE
+tclfitsy_SRC_DIR
+tclfitsy_BIN_DIR
+tclfitsy_VERSION
 tcliis_STUB_LIB_PATH
 tcliis_STUB_LIB_SPEC
 tcliis_STUB_LIB_FILE
@@ -898,6 +906,7 @@ with_tifftcl
 with_jpegtcl
 with_zlibtcl
 with_tcliis
+with_tclfitsy
 with_tclsignal
 with_tclxml
 with_tclzipfs
@@ -1571,6 +1580,7 @@ Optional Packages:
   --with-jpegtcl              directory containing jpegtcl configuration (jpegtclConfig.sh)
   --with-zlibtcl              directory containing zlibtcl configuration (zlibtclConfig.sh)
   --with-tcliis              directory containing tcliis configuration (tcliisConfig.sh)
+  --with-tclfitsy              directory containing tclfitsy configuration (tclfitsyConfig.sh)
   --with-tclsignal              directory containing tclsignal configuration (tclsignalConfig.sh)
   --with-tclxml              directory containing tclxml configuration (tclxmlConfig.sh)
   --with-tclzipfs              directory containing tclzipfs configuration (tclzipfsConfig.sh)
@@ -4892,6 +4902,255 @@ fi
 
 
     #
+    # Ok, lets find the tclfitsy configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tclfitsy
+    #
+
+    if test x"${no_tclfitsy}" = x ; then
+	# we reset no_tclfitsy in case something fails here
+	no_tclfitsy=true
+
+# Check whether --with-tclfitsy was given.
+if test "${with_tclfitsy+set}" = set; then :
+  withval=$with_tclfitsy; with_tclfitsyconfig=${withval}
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclfitsy configuration" >&5
+$as_echo_n "checking for tclfitsy configuration... " >&6; }
+	if ${ac_cv_c_tclfitsyconfig+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+	    # First check to see if --with-tclfitsy was specified.
+	    if test x"${with_tclfitsyconfig}" != x ; then
+		case ${with_tclfitsyconfig} in
+		    */tclfitsyConfig.sh )
+			if test -f ${with_tclfitsyconfig}; then
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclfitsy argument should refer to directory containing tclfitsyConfig.sh, not to tclfitsyConfig.sh itself" >&5
+$as_echo "$as_me: WARNING: --with-tclfitsy argument should refer to directory containing tclfitsyConfig.sh, not to tclfitsyConfig.sh itself" >&2;}
+			    with_tclfitsyconfig=`echo ${with_tclfitsyconfig} | sed 's!/tclfitsyConfig\.sh$!!'`
+			fi;;
+		esac
+		if test -f "${with_tclfitsyconfig}/tclfitsyConfig.sh" ; then
+		    ac_cv_c_tclfitsyconfig=`(cd ${with_tclfitsyconfig}; pwd)`
+		else
+		    as_fn_error $? "${with_tclfitsyconfig} directory doesn't contain tclfitsyConfig.sh" "$LINENO" 5
+		fi
+	    fi
+
+	    # then check for a private tclfitsy installation
+	    if test x"${ac_cv_c_tclfitsyconfig}" = x ; then
+		for i in \
+			../tclfitsy \
+			`ls -dr ../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			../../tclfitsy \
+			`ls -dr ../../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			../../../tclfitsy \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			${srcdir}/../tclfitsy \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			; do
+		    if test -f "$i/tclfitsyConfig.sh" ; then
+			ac_cv_c_tclfitsyconfig=`(cd $i; pwd)`
+			break
+		    fi
+		    if test -f "$i/unix/tclfitsyConfig.sh" ; then
+			ac_cv_c_tclfitsyconfig=`(cd $i/unix; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tclfitsyconfig}" = 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/pkg/lib 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
+			; do
+		    if test -f "$i/tclfitsyConfig.sh" ; then
+			ac_cv_c_tclfitsyconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+fi
+
+
+	if test x"${ac_cv_c_tclfitsyconfig}" = x ; then
+	    tclfitsy_BIN_DIR="# no tclfitsy configs found"
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclfitsy configuration definitions" >&5
+$as_echo "$as_me: WARNING: Cannot find tclfitsy configuration definitions" >&2;}
+	    exit 0
+	else
+	    no_tclfitsy=
+	    tclfitsy_BIN_DIR=${ac_cv_c_tclfitsyconfig}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclfitsy_BIN_DIR/tclfitsyConfig.sh" >&5
+$as_echo "found $tclfitsy_BIN_DIR/tclfitsyConfig.sh" >&6; }
+	fi
+    fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclfitsy_BIN_DIR}/tclfitsyConfig.sh" >&5
+$as_echo_n "checking for existence of ${tclfitsy_BIN_DIR}/tclfitsyConfig.sh... " >&6; }
+
+    if test -f "${tclfitsy_BIN_DIR}/tclfitsyConfig.sh" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
+	. "${tclfitsy_BIN_DIR}/tclfitsyConfig.sh"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+    #
+    # If the tclfitsy_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 tclfitsy_LIB_SPEC will be set to the value
+    # of tclfitsy_BUILD_LIB_SPEC. An extension should make use of tclfitsy_LIB_SPEC
+    # instead of tclfitsy_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+
+    if test -f "${tclfitsy_BIN_DIR}/Makefile" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclfitsy" >&5
+$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclfitsy" >&2;}
+        tclfitsy_LIB_SPEC=${tclfitsy_BUILD_LIB_SPEC}
+        tclfitsy_STUB_LIB_SPEC=${tclfitsy_BUILD_STUB_LIB_SPEC}
+        tclfitsy_STUB_LIB_PATH=${tclfitsy_BUILD_STUB_LIB_PATH}
+        tclfitsy_INCLUDE_SPEC=${tclfitsy_BUILD_INCLUDE_SPEC}
+        tclfitsy_LIBRARY_PATH=${tclfitsy_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${tclfitsy_STUB_LIB_SPEC}" = x; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLFITSY_STUB library for LIBS" >&5
+$as_echo_n "checking For TCLFITSY_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${TCLFITSY_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${TCLFITSY_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 TCLFITSY_STUB_LIB_PATH ${TCLFITSY_STUB_LIB_PATH}" >&5
+$as_echo "using TCLFITSY_STUB_LIB_PATH ${TCLFITSY_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${TCLFITSY_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 TCLFITSY_STUB_LIB_SPEC ${TCLFITSY_STUB_LIB_SPEC}" >&5
+$as_echo "using TCLFITSY_STUB_LIB_SPEC ${TCLFITSY_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 tclfitsy_STUB library for LIBS" >&5
+$as_echo_n "checking For tclfitsy_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${tclfitsy_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${tclfitsy_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 tclfitsy_STUB_LIB_PATH ${tclfitsy_STUB_LIB_PATH}" >&5
+$as_echo "using tclfitsy_STUB_LIB_PATH ${tclfitsy_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${tclfitsy_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 tclfitsy_STUB_LIB_SPEC ${tclfitsy_STUB_LIB_SPEC}" >&5
+$as_echo "using tclfitsy_STUB_LIB_SPEC ${tclfitsy_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 tclsignal configuration
     # First, look for one uninstalled.
     # the alternative search directory is invoked by --with-tclsignal
diff --git a/ds9/unix/configure.ac b/ds9/unix/configure.ac
index f384f8f..bcd8e99 100644
--- a/ds9/unix/configure.ac
+++ b/ds9/unix/configure.ac
@@ -61,6 +61,9 @@ TEA_LOAD_CONFIG(zlibtcl)
 TEA_PATH_CONFIG(tcliis)
 TEA_LOAD_CONFIG(tcliis)
 
+TEA_PATH_CONFIG(tclfitsy)
+TEA_LOAD_CONFIG(tclfitsy)
+
 TEA_PATH_CONFIG(tclsignal)
 TEA_LOAD_CONFIG(tclsignal)
 
diff --git a/ds9/unix/ds9.C b/ds9/unix/ds9.C
index 6642cec..6a66785 100644
--- a/ds9/unix/ds9.C
+++ b/ds9/unix/ds9.C
@@ -38,6 +38,7 @@ extern "C" {
 
   int Tclxpa_Init(Tcl_Interp*);
   int Tcliis_Init(Tcl_Interp*);
+  int Tclfitsy_Init(Tcl_Interp*);
 
   int Tls_Init(Tcl_Interp*);
   int Tclxml_Init(Tcl_Interp*);
@@ -151,6 +152,12 @@ int SAOAppInit(Tcl_Interp *interp)
   Tcl_StaticPackage (interp, "Tcliis", Tcliis_Init, 
 		     (Tcl_PackageInitProc*)NULL);
 
+  // Tclfitsy
+  if (Tclfitsy_Init(interp) == TCL_ERROR)
+    return TCL_ERROR;
+  Tcl_StaticPackage (interp, "Tclfitsy", Tclfitsy_Init, 
+		     (Tcl_PackageInitProc*)NULL);
+
   // Tkmpeg
   if (Tkmpeg_Init(interp) == TCL_ERROR)
     return TCL_ERROR;
diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in
index 39603b2..e3099cc 100755
--- a/ds9/win/Makefile.in
+++ b/ds9/win/Makefile.in
@@ -26,6 +26,7 @@ tkimgtiff_LIB_SPEC= @tkimgtiff_LIB_SPEC@
 tkimgwindow_LIB_SPEC= @tkimgwindow_LIB_SPEC@
 
 tcliis_LIB_SPEC	= @tcliis_LIB_SPEC@
+tclfitsy_LIB_SPEC= @tclfitsy_LIB_SPEC@
 tclxml_LIB_SPEC	= @tclxml_LIB_SPEC@
 
 tls_LIB_SPEC	= @tls_LIB_SPEC@
@@ -83,6 +84,7 @@ SPECS	= \
 	$(tifftcl_LIB_SPEC) \
 	$(zlibtcl_LIB_SPEC) \
 	$(tcliis_LIB_SPEC) \
+	$(tclfitsy_LIB_SPEC) \
 	$(tclxml_LIB_SPEC) \
 	$(tls_LIB_SPEC) \
 	$(tkblt_LIB_SPEC) \
diff --git a/ds9/win/configure b/ds9/win/configure
index 62d6645..d9d20e6 100755
--- a/ds9/win/configure
+++ b/ds9/win/configure
@@ -758,6 +758,14 @@ tclxml_LIB_FILE
 tclxml_SRC_DIR
 tclxml_BIN_DIR
 tclxml_VERSION
+tclfitsy_STUB_LIB_PATH
+tclfitsy_STUB_LIB_SPEC
+tclfitsy_STUB_LIB_FILE
+tclfitsy_LIB_SPEC
+tclfitsy_LIB_FILE
+tclfitsy_SRC_DIR
+tclfitsy_BIN_DIR
+tclfitsy_VERSION
 tcliis_STUB_LIB_PATH
 tcliis_STUB_LIB_SPEC
 tcliis_STUB_LIB_FILE
@@ -887,6 +895,7 @@ with_tifftcl
 with_jpegtcl
 with_zlibtcl
 with_tcliis
+with_tclfitsy
 with_tclxml
 with_tls
 with_tkblt
@@ -1550,6 +1559,7 @@ Optional Packages:
   --with-jpegtcl              directory containing jpegtcl configuration (jpegtclConfig.sh)
   --with-zlibtcl              directory containing zlibtcl configuration (zlibtclConfig.sh)
   --with-tcliis              directory containing tcliis configuration (tcliisConfig.sh)
+  --with-tclfitsy              directory containing tclfitsy configuration (tclfitsyConfig.sh)
   --with-tclxml              directory containing tclxml configuration (tclxmlConfig.sh)
   --with-tls              directory containing tls configuration (tlsConfig.sh)
   --with-tkblt              directory containing tkblt configuration (tkbltConfig.sh)
@@ -4828,6 +4838,255 @@ fi
 
 
     #
+    # Ok, lets find the tclfitsy configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tclfitsy
+    #
+
+    if test x"${no_tclfitsy}" = x ; then
+	# we reset no_tclfitsy in case something fails here
+	no_tclfitsy=true
+
+# Check whether --with-tclfitsy was given.
+if test "${with_tclfitsy+set}" = set; then :
+  withval=$with_tclfitsy; with_tclfitsyconfig=${withval}
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclfitsy configuration" >&5
+$as_echo_n "checking for tclfitsy configuration... " >&6; }
+	if ${ac_cv_c_tclfitsyconfig+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+	    # First check to see if --with-tclfitsy was specified.
+	    if test x"${with_tclfitsyconfig}" != x ; then
+		case ${with_tclfitsyconfig} in
+		    */tclfitsyConfig.sh )
+			if test -f ${with_tclfitsyconfig}; then
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclfitsy argument should refer to directory containing tclfitsyConfig.sh, not to tclfitsyConfig.sh itself" >&5
+$as_echo "$as_me: WARNING: --with-tclfitsy argument should refer to directory containing tclfitsyConfig.sh, not to tclfitsyConfig.sh itself" >&2;}
+			    with_tclfitsyconfig=`echo ${with_tclfitsyconfig} | sed 's!/tclfitsyConfig\.sh$!!'`
+			fi;;
+		esac
+		if test -f "${with_tclfitsyconfig}/tclfitsyConfig.sh" ; then
+		    ac_cv_c_tclfitsyconfig=`(cd ${with_tclfitsyconfig}; pwd)`
+		else
+		    as_fn_error $? "${with_tclfitsyconfig} directory doesn't contain tclfitsyConfig.sh" "$LINENO" 5
+		fi
+	    fi
+
+	    # then check for a private tclfitsy installation
+	    if test x"${ac_cv_c_tclfitsyconfig}" = x ; then
+		for i in \
+			../tclfitsy \
+			`ls -dr ../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			../../tclfitsy \
+			`ls -dr ../../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			../../../tclfitsy \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			${srcdir}/../tclfitsy \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tclfitsy*[0-9].[0-9]* 2>/dev/null` \
+			; do
+		    if test -f "$i/tclfitsyConfig.sh" ; then
+			ac_cv_c_tclfitsyconfig=`(cd $i; pwd)`
+			break
+		    fi
+		    if test -f "$i/unix/tclfitsyConfig.sh" ; then
+			ac_cv_c_tclfitsyconfig=`(cd $i/unix; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tclfitsyconfig}" = 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/pkg/lib 2>/dev/null` \
+			`ls -d /usr/lib 2>/dev/null` \
+			`ls -d /usr/lib64 2>/dev/null` \
+			; do
+		    if test -f "$i/tclfitsyConfig.sh" ; then
+			ac_cv_c_tclfitsyconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+fi
+
+
+	if test x"${ac_cv_c_tclfitsyconfig}" = x ; then
+	    tclfitsy_BIN_DIR="# no tclfitsy configs found"
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclfitsy configuration definitions" >&5
+$as_echo "$as_me: WARNING: Cannot find tclfitsy configuration definitions" >&2;}
+	    exit 0
+	else
+	    no_tclfitsy=
+	    tclfitsy_BIN_DIR=${ac_cv_c_tclfitsyconfig}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclfitsy_BIN_DIR/tclfitsyConfig.sh" >&5
+$as_echo "found $tclfitsy_BIN_DIR/tclfitsyConfig.sh" >&6; }
+	fi
+    fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclfitsy_BIN_DIR}/tclfitsyConfig.sh" >&5
+$as_echo_n "checking for existence of ${tclfitsy_BIN_DIR}/tclfitsyConfig.sh... " >&6; }
+
+    if test -f "${tclfitsy_BIN_DIR}/tclfitsyConfig.sh" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
+	. "${tclfitsy_BIN_DIR}/tclfitsyConfig.sh"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+    #
+    # If the tclfitsy_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 tclfitsy_LIB_SPEC will be set to the value
+    # of tclfitsy_BUILD_LIB_SPEC. An extension should make use of tclfitsy_LIB_SPEC
+    # instead of tclfitsy_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+
+    if test -f "${tclfitsy_BIN_DIR}/Makefile" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclfitsy" >&5
+$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclfitsy" >&2;}
+        tclfitsy_LIB_SPEC=${tclfitsy_BUILD_LIB_SPEC}
+        tclfitsy_STUB_LIB_SPEC=${tclfitsy_BUILD_STUB_LIB_SPEC}
+        tclfitsy_STUB_LIB_PATH=${tclfitsy_BUILD_STUB_LIB_PATH}
+        tclfitsy_INCLUDE_SPEC=${tclfitsy_BUILD_INCLUDE_SPEC}
+        tclfitsy_LIBRARY_PATH=${tclfitsy_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${tclfitsy_STUB_LIB_SPEC}" = x; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLFITSY_STUB library for LIBS" >&5
+$as_echo_n "checking For TCLFITSY_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${TCLFITSY_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${TCLFITSY_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 TCLFITSY_STUB_LIB_PATH ${TCLFITSY_STUB_LIB_PATH}" >&5
+$as_echo "using TCLFITSY_STUB_LIB_PATH ${TCLFITSY_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${TCLFITSY_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 TCLFITSY_STUB_LIB_SPEC ${TCLFITSY_STUB_LIB_SPEC}" >&5
+$as_echo "using TCLFITSY_STUB_LIB_SPEC ${TCLFITSY_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 tclfitsy_STUB library for LIBS" >&5
+$as_echo_n "checking For tclfitsy_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${tclfitsy_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${tclfitsy_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 tclfitsy_STUB_LIB_PATH ${tclfitsy_STUB_LIB_PATH}" >&5
+$as_echo "using tclfitsy_STUB_LIB_PATH ${tclfitsy_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${tclfitsy_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 tclfitsy_STUB_LIB_SPEC ${tclfitsy_STUB_LIB_SPEC}" >&5
+$as_echo "using tclfitsy_STUB_LIB_SPEC ${tclfitsy_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 tclxml configuration
     # First, look for one uninstalled.
     # the alternative search directory is invoked by --with-tclxml
diff --git a/ds9/win/configure.ac b/ds9/win/configure.ac
index f67960e..50e2b7f 100644
--- a/ds9/win/configure.ac
+++ b/ds9/win/configure.ac
@@ -61,6 +61,9 @@ TEA_LOAD_CONFIG(zlibtcl)
 TEA_PATH_CONFIG(tcliis)
 TEA_LOAD_CONFIG(tcliis)
 
+TEA_PATH_CONFIG(tclfitsy)
+TEA_LOAD_CONFIG(tclfitsy)
+
 TEA_PATH_CONFIG(tclxml)
 TEA_LOAD_CONFIG(tclxml)
 
diff --git a/ds9/win/ds9.C b/ds9/win/ds9.C
index 058ae5a..784761a 100644
--- a/ds9/win/ds9.C
+++ b/ds9/win/ds9.C
@@ -37,6 +37,7 @@ extern "C" {
 
   int Tclxpa_Init(Tcl_Interp*);
   int Tcliis_Init(Tcl_Interp*);
+  int Tclfitsy_Init(Tcl_Interp*);
 
   int Tls_Init(Tcl_Interp*);
   int Tclxml_Init(Tcl_Interp*);
@@ -151,6 +152,12 @@ int SAOAppInit(Tcl_Interp *interp)
   Tcl_StaticPackage (interp, "tcliis", Tcliis_Init, 
   		     (Tcl_PackageInitProc*)NULL);
 
+  // Tclfitsy
+  if (Tclfitsy_Init(interp) == TCL_ERROR)
+    return TCL_ERROR;
+  Tcl_StaticPackage (interp, "tclfitsy", Tclfitsy_Init, 
+  		     (Tcl_PackageInitProc*)NULL);
+
   // Tkmpeg
   if (Tkmpeg_Init(interp) == TCL_ERROR)
     return TCL_ERROR;