use native tk gif/png

4 files changed, 0 insertions, 813 deletions

diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in
index 29bb859..4378f80 100755
--- a/ds9/win/Makefile.in
+++ b/ds9/win/Makefile.in
@@ -17,14 +17,11 @@ TK_LIB_SPEC	= @TK_LIB_SPEC@
 TK_STUB_LIB_SPEC= @TK_STUB_LIB_SPEC@
 
 tifftcl_LIB_SPEC= @tifftcl_LIB_SPEC@
-pngtcl_LIB_SPEC	= @pngtcl_LIB_SPEC@
 jpegtcl_LIB_SPEC= @jpegtcl_LIB_SPEC@
 zlibtcl_LIB_SPEC= @zlibtcl_LIB_SPEC@
 
 tkimg_LIB_SPEC	= @tkimg_LIB_SPEC@
-tkimggif_LIB_SPEC= @tkimggif_LIB_SPEC@
 tkimgjpeg_LIB_SPEC= @tkimgjpeg_LIB_SPEC@
-tkimgpng_LIB_SPEC= @tkimgpng_LIB_SPEC@
 tkimgtiff_LIB_SPEC= @tkimgtiff_LIB_SPEC@
 tkimgwindow_LIB_SPEC= @tkimgwindow_LIB_SPEC@
 
@@ -80,7 +77,6 @@ space:=$(empty) $(empty)
 
 SPECS	= \
 	$(jpegtcl_LIB_SPEC) \
-	$(pngtcl_LIB_SPEC) \
 	$(tifftcl_LIB_SPEC) \
 	$(zlibtcl_LIB_SPEC) \
 	$(tcliis_LIB_SPEC) \
@@ -89,9 +85,7 @@ SPECS	= \
 	$(tkblt_LIB_SPEC) \
 	$(tkhtml1_LIB_SPEC) \
 	$(tkimg_LIB_SPEC) \
-	$(tkimggif_LIB_SPEC) \
 	$(tkimgjpeg_LIB_SPEC) \
-	$(tkimgpng_LIB_SPEC) \
 	$(tkimgtiff_LIB_SPEC) \
 	$(tkimgwindow_LIB_SPEC) \
 	$(tkmpeg_LIB_SPEC) \
diff --git a/ds9/win/configure b/ds9/win/configure
index 43df1df..ee85760 100755
--- a/ds9/win/configure
+++ b/ds9/win/configure
@@ -708,14 +708,6 @@ tkimgtiff_LIB_FILE
 tkimgtiff_SRC_DIR
 tkimgtiff_BIN_DIR
 tkimgtiff_VERSION
-tkimgpng_STUB_LIB_PATH
-tkimgpng_STUB_LIB_SPEC
-tkimgpng_STUB_LIB_FILE
-tkimgpng_LIB_SPEC
-tkimgpng_LIB_FILE
-tkimgpng_SRC_DIR
-tkimgpng_BIN_DIR
-tkimgpng_VERSION
 tkimgjpeg_STUB_LIB_PATH
 tkimgjpeg_STUB_LIB_SPEC
 tkimgjpeg_STUB_LIB_FILE
@@ -724,14 +716,6 @@ tkimgjpeg_LIB_FILE
 tkimgjpeg_SRC_DIR
 tkimgjpeg_BIN_DIR
 tkimgjpeg_VERSION
-tkimggif_STUB_LIB_PATH
-tkimggif_STUB_LIB_SPEC
-tkimggif_STUB_LIB_FILE
-tkimggif_LIB_SPEC
-tkimggif_LIB_FILE
-tkimggif_SRC_DIR
-tkimggif_BIN_DIR
-tkimggif_VERSION
 tkimg_STUB_LIB_PATH
 tkimg_STUB_LIB_SPEC
 tkimg_STUB_LIB_FILE
@@ -796,14 +780,6 @@ jpegtcl_LIB_FILE
 jpegtcl_SRC_DIR
 jpegtcl_BIN_DIR
 jpegtcl_VERSION
-pngtcl_STUB_LIB_PATH
-pngtcl_STUB_LIB_SPEC
-pngtcl_STUB_LIB_FILE
-pngtcl_LIB_SPEC
-pngtcl_LIB_FILE
-pngtcl_SRC_DIR
-pngtcl_BIN_DIR
-pngtcl_VERSION
 tifftcl_STUB_LIB_PATH
 tifftcl_STUB_LIB_SPEC
 tifftcl_STUB_LIB_FILE
@@ -906,7 +882,6 @@ enable_option_checking
 with_tcl
 with_tk
 with_tifftcl
-with_pngtcl
 with_jpegtcl
 with_zlibtcl
 with_tcliis
@@ -915,9 +890,7 @@ with_tls
 with_tkblt
 with_tkhtml1
 with_tkimg
-with_tkimggif
 with_tkimgjpeg
-with_tkimgpng
 with_tkimgtiff
 with_tkimgwindow
 with_tkmpeg
@@ -1572,7 +1545,6 @@ Optional Packages:
                           (tclConfig.sh)
   --with-tk               directory containing tk configuration (tkConfig.sh)
   --with-tifftcl              directory containing tifftcl configuration (tifftclConfig.sh)
-  --with-pngtcl              directory containing pngtcl configuration (pngtclConfig.sh)
   --with-jpegtcl              directory containing jpegtcl configuration (jpegtclConfig.sh)
   --with-zlibtcl              directory containing zlibtcl configuration (zlibtclConfig.sh)
   --with-tcliis              directory containing tcliis configuration (tcliisConfig.sh)
@@ -1581,9 +1553,7 @@ Optional Packages:
   --with-tkblt              directory containing tkblt configuration (tkbltConfig.sh)
   --with-tkhtml1              directory containing tkhtml1 configuration (tkhtml1Config.sh)
   --with-tkimg              directory containing tkimg configuration (tkimgConfig.sh)
-  --with-tkimggif              directory containing tkimggif configuration (tkimggifConfig.sh)
   --with-tkimgjpeg              directory containing tkimgjpeg configuration (tkimgjpegConfig.sh)
-  --with-tkimgpng              directory containing tkimgpng configuration (tkimgpngConfig.sh)
   --with-tkimgtiff              directory containing tkimgtiff configuration (tkimgtiffConfig.sh)
   --with-tkimgwindow              directory containing tkimgwindow configuration (tkimgwindowConfig.sh)
   --with-tkmpeg              directory containing tkmpeg configuration (tkmpegConfig.sh)
@@ -4109,255 +4079,6 @@ fi
 
 
     #
-    # Ok, lets find the pngtcl configuration
-    # First, look for one uninstalled.
-    # the alternative search directory is invoked by --with-pngtcl
-    #
-
-    if test x"${no_pngtcl}" = x ; then
-	# we reset no_pngtcl in case something fails here
-	no_pngtcl=true
-
-# Check whether --with-pngtcl was given.
-if test "${with_pngtcl+set}" = set; then :
-  withval=$with_pngtcl; with_pngtclconfig=${withval}
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pngtcl configuration" >&5
-$as_echo_n "checking for pngtcl configuration... " >&6; }
-	if ${ac_cv_c_pngtclconfig+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-	    # First check to see if --with-pngtcl was specified.
-	    if test x"${with_pngtclconfig}" != x ; then
-		case ${with_pngtclconfig} in
-		    */pngtclConfig.sh )
-			if test -f ${with_pngtclconfig}; then
-			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-pngtcl argument should refer to directory containing pngtclConfig.sh, not to pngtclConfig.sh itself" >&5
-$as_echo "$as_me: WARNING: --with-pngtcl argument should refer to directory containing pngtclConfig.sh, not to pngtclConfig.sh itself" >&2;}
-			    with_pngtclconfig=`echo ${with_pngtclconfig} | sed 's!/pngtclConfig\.sh$!!'`
-			fi;;
-		esac
-		if test -f "${with_pngtclconfig}/pngtclConfig.sh" ; then
-		    ac_cv_c_pngtclconfig=`(cd ${with_pngtclconfig}; pwd)`
-		else
-		    as_fn_error $? "${with_pngtclconfig} directory doesn't contain pngtclConfig.sh" "$LINENO" 5
-		fi
-	    fi
-
-	    # then check for a private pngtcl installation
-	    if test x"${ac_cv_c_pngtclconfig}" = x ; then
-		for i in \
-			../pngtcl \
-			`ls -dr ../pngtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ../pngtcl*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ../pngtcl*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ../pngtcl*[0-9].[0-9]* 2>/dev/null` \
-			../../pngtcl \
-			`ls -dr ../../pngtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ../../pngtcl*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ../../pngtcl*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ../../pngtcl*[0-9].[0-9]* 2>/dev/null` \
-			../../../pngtcl \
-			`ls -dr ../../../pngtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ../../../pngtcl*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ../../../pngtcl*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ../../../pngtcl*[0-9].[0-9]* 2>/dev/null` \
-			${srcdir}/../pngtcl \
-			`ls -dr ${srcdir}/../pngtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ${srcdir}/../pngtcl*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ${srcdir}/../pngtcl*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ${srcdir}/../pngtcl*[0-9].[0-9]* 2>/dev/null` \
-			; do
-		    if test -f "$i/pngtclConfig.sh" ; then
-			ac_cv_c_pngtclconfig=`(cd $i; pwd)`
-			break
-		    fi
-		    if test -f "$i/unix/pngtclConfig.sh" ; then
-			ac_cv_c_pngtclconfig=`(cd $i/unix; pwd)`
-			break
-		    fi
-		done
-	    fi
-
-	    # check in a few common install locations
-	    if test x"${ac_cv_c_pngtclconfig}" = 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/pngtclConfig.sh" ; then
-			ac_cv_c_pngtclconfig=`(cd $i; pwd)`
-			break
-		    fi
-		done
-	    fi
-
-fi
-
-
-	if test x"${ac_cv_c_pngtclconfig}" = x ; then
-	    pngtcl_BIN_DIR="# no pngtcl configs found"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find pngtcl configuration definitions" >&5
-$as_echo "$as_me: WARNING: Cannot find pngtcl configuration definitions" >&2;}
-	    exit 0
-	else
-	    no_pngtcl=
-	    pngtcl_BIN_DIR=${ac_cv_c_pngtclconfig}
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $pngtcl_BIN_DIR/pngtclConfig.sh" >&5
-$as_echo "found $pngtcl_BIN_DIR/pngtclConfig.sh" >&6; }
-	fi
-    fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${pngtcl_BIN_DIR}/pngtclConfig.sh" >&5
-$as_echo_n "checking for existence of ${pngtcl_BIN_DIR}/pngtclConfig.sh... " >&6; }
-
-    if test -f "${pngtcl_BIN_DIR}/pngtclConfig.sh" ; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
-$as_echo "loading" >&6; }
-	. "${pngtcl_BIN_DIR}/pngtclConfig.sh"
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
-$as_echo "file not found" >&6; }
-    fi
-
-    #
-    # If the pngtcl_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 pngtcl_LIB_SPEC will be set to the value
-    # of pngtcl_BUILD_LIB_SPEC. An extension should make use of pngtcl_LIB_SPEC
-    # instead of pngtcl_BUILD_LIB_SPEC since it will work with both an
-    # installed and uninstalled version of Tcl.
-    #
-
-    if test -f "${pngtcl_BIN_DIR}/Makefile" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for pngtcl" >&5
-$as_echo "$as_me: WARNING: Found Makefile - using build library specs for pngtcl" >&2;}
-        pngtcl_LIB_SPEC=${pngtcl_BUILD_LIB_SPEC}
-        pngtcl_STUB_LIB_SPEC=${pngtcl_BUILD_STUB_LIB_SPEC}
-        pngtcl_STUB_LIB_PATH=${pngtcl_BUILD_STUB_LIB_PATH}
-        pngtcl_INCLUDE_SPEC=${pngtcl_BUILD_INCLUDE_SPEC}
-        pngtcl_LIBRARY_PATH=${pngtcl_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${pngtcl_STUB_LIB_SPEC}" = x; then :
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For PNGTCL_STUB library for LIBS" >&5
-$as_echo_n "checking For PNGTCL_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${PNGTCL_STUB_LIB_SPEC}" != "x" ; then
-	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-
-    vars="\"`${CYGPATH} ${PNGTCL_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 PNGTCL_STUB_LIB_PATH ${PNGTCL_STUB_LIB_PATH}" >&5
-$as_echo "using PNGTCL_STUB_LIB_PATH ${PNGTCL_STUB_LIB_PATH}" >&6; }
-	else
-
-    vars="${PNGTCL_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 PNGTCL_STUB_LIB_SPEC ${PNGTCL_STUB_LIB_SPEC}" >&5
-$as_echo "using PNGTCL_STUB_LIB_SPEC ${PNGTCL_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 pngtcl_STUB library for LIBS" >&5
-$as_echo_n "checking For pngtcl_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${pngtcl_STUB_LIB_SPEC}" != "x" ; then
-	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-
-    vars="\"`${CYGPATH} ${pngtcl_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 pngtcl_STUB_LIB_PATH ${pngtcl_STUB_LIB_PATH}" >&5
-$as_echo "using pngtcl_STUB_LIB_PATH ${pngtcl_STUB_LIB_PATH}" >&6; }
-	else
-
-    vars="${pngtcl_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 pngtcl_STUB_LIB_SPEC ${pngtcl_STUB_LIB_SPEC}" >&5
-$as_echo "using pngtcl_STUB_LIB_SPEC ${pngtcl_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 jpegtcl configuration
     # First, look for one uninstalled.
     # the alternative search directory is invoked by --with-jpegtcl
@@ -6350,255 +6071,6 @@ fi
 
 
     #
-    # Ok, lets find the tkimggif configuration
-    # First, look for one uninstalled.
-    # the alternative search directory is invoked by --with-tkimggif
-    #
-
-    if test x"${no_tkimggif}" = x ; then
-	# we reset no_tkimggif in case something fails here
-	no_tkimggif=true
-
-# Check whether --with-tkimggif was given.
-if test "${with_tkimggif+set}" = set; then :
-  withval=$with_tkimggif; with_tkimggifconfig=${withval}
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkimggif configuration" >&5
-$as_echo_n "checking for tkimggif configuration... " >&6; }
-	if ${ac_cv_c_tkimggifconfig+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-	    # First check to see if --with-tkimggif was specified.
-	    if test x"${with_tkimggifconfig}" != x ; then
-		case ${with_tkimggifconfig} in
-		    */tkimggifConfig.sh )
-			if test -f ${with_tkimggifconfig}; then
-			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkimggif argument should refer to directory containing tkimggifConfig.sh, not to tkimggifConfig.sh itself" >&5
-$as_echo "$as_me: WARNING: --with-tkimggif argument should refer to directory containing tkimggifConfig.sh, not to tkimggifConfig.sh itself" >&2;}
-			    with_tkimggifconfig=`echo ${with_tkimggifconfig} | sed 's!/tkimggifConfig\.sh$!!'`
-			fi;;
-		esac
-		if test -f "${with_tkimggifconfig}/tkimggifConfig.sh" ; then
-		    ac_cv_c_tkimggifconfig=`(cd ${with_tkimggifconfig}; pwd)`
-		else
-		    as_fn_error $? "${with_tkimggifconfig} directory doesn't contain tkimggifConfig.sh" "$LINENO" 5
-		fi
-	    fi
-
-	    # then check for a private tkimggif installation
-	    if test x"${ac_cv_c_tkimggifconfig}" = x ; then
-		for i in \
-			../tkimggif \
-			`ls -dr ../tkimggif*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ../tkimggif*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ../tkimggif*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ../tkimggif*[0-9].[0-9]* 2>/dev/null` \
-			../../tkimggif \
-			`ls -dr ../../tkimggif*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ../../tkimggif*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ../../tkimggif*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ../../tkimggif*[0-9].[0-9]* 2>/dev/null` \
-			../../../tkimggif \
-			`ls -dr ../../../tkimggif*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ../../../tkimggif*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ../../../tkimggif*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ../../../tkimggif*[0-9].[0-9]* 2>/dev/null` \
-			${srcdir}/../tkimggif \
-			`ls -dr ${srcdir}/../tkimggif*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ${srcdir}/../tkimggif*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ${srcdir}/../tkimggif*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ${srcdir}/../tkimggif*[0-9].[0-9]* 2>/dev/null` \
-			; do
-		    if test -f "$i/tkimggifConfig.sh" ; then
-			ac_cv_c_tkimggifconfig=`(cd $i; pwd)`
-			break
-		    fi
-		    if test -f "$i/unix/tkimggifConfig.sh" ; then
-			ac_cv_c_tkimggifconfig=`(cd $i/unix; pwd)`
-			break
-		    fi
-		done
-	    fi
-
-	    # check in a few common install locations
-	    if test x"${ac_cv_c_tkimggifconfig}" = 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/tkimggifConfig.sh" ; then
-			ac_cv_c_tkimggifconfig=`(cd $i; pwd)`
-			break
-		    fi
-		done
-	    fi
-
-fi
-
-
-	if test x"${ac_cv_c_tkimggifconfig}" = x ; then
-	    tkimggif_BIN_DIR="# no tkimggif configs found"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkimggif configuration definitions" >&5
-$as_echo "$as_me: WARNING: Cannot find tkimggif configuration definitions" >&2;}
-	    exit 0
-	else
-	    no_tkimggif=
-	    tkimggif_BIN_DIR=${ac_cv_c_tkimggifconfig}
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkimggif_BIN_DIR/tkimggifConfig.sh" >&5
-$as_echo "found $tkimggif_BIN_DIR/tkimggifConfig.sh" >&6; }
-	fi
-    fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkimggif_BIN_DIR}/tkimggifConfig.sh" >&5
-$as_echo_n "checking for existence of ${tkimggif_BIN_DIR}/tkimggifConfig.sh... " >&6; }
-
-    if test -f "${tkimggif_BIN_DIR}/tkimggifConfig.sh" ; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
-$as_echo "loading" >&6; }
-	. "${tkimggif_BIN_DIR}/tkimggifConfig.sh"
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
-$as_echo "file not found" >&6; }
-    fi
-
-    #
-    # If the tkimggif_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 tkimggif_LIB_SPEC will be set to the value
-    # of tkimggif_BUILD_LIB_SPEC. An extension should make use of tkimggif_LIB_SPEC
-    # instead of tkimggif_BUILD_LIB_SPEC since it will work with both an
-    # installed and uninstalled version of Tcl.
-    #
-
-    if test -f "${tkimggif_BIN_DIR}/Makefile" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkimggif" >&5
-$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimggif" >&2;}
-        tkimggif_LIB_SPEC=${tkimggif_BUILD_LIB_SPEC}
-        tkimggif_STUB_LIB_SPEC=${tkimggif_BUILD_STUB_LIB_SPEC}
-        tkimggif_STUB_LIB_PATH=${tkimggif_BUILD_STUB_LIB_PATH}
-        tkimggif_INCLUDE_SPEC=${tkimggif_BUILD_INCLUDE_SPEC}
-        tkimggif_LIBRARY_PATH=${tkimggif_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${tkimggif_STUB_LIB_SPEC}" = x; then :
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKIMGGIF_STUB library for LIBS" >&5
-$as_echo_n "checking For TKIMGGIF_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${TKIMGGIF_STUB_LIB_SPEC}" != "x" ; then
-	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-
-    vars="\"`${CYGPATH} ${TKIMGGIF_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 TKIMGGIF_STUB_LIB_PATH ${TKIMGGIF_STUB_LIB_PATH}" >&5
-$as_echo "using TKIMGGIF_STUB_LIB_PATH ${TKIMGGIF_STUB_LIB_PATH}" >&6; }
-	else
-
-    vars="${TKIMGGIF_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 TKIMGGIF_STUB_LIB_SPEC ${TKIMGGIF_STUB_LIB_SPEC}" >&5
-$as_echo "using TKIMGGIF_STUB_LIB_SPEC ${TKIMGGIF_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 tkimggif_STUB library for LIBS" >&5
-$as_echo_n "checking For tkimggif_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${tkimggif_STUB_LIB_SPEC}" != "x" ; then
-	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-
-    vars="\"`${CYGPATH} ${tkimggif_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 tkimggif_STUB_LIB_PATH ${tkimggif_STUB_LIB_PATH}" >&5
-$as_echo "using tkimggif_STUB_LIB_PATH ${tkimggif_STUB_LIB_PATH}" >&6; }
-	else
-
-    vars="${tkimggif_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 tkimggif_STUB_LIB_SPEC ${tkimggif_STUB_LIB_SPEC}" >&5
-$as_echo "using tkimggif_STUB_LIB_SPEC ${tkimggif_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 tkimgjpeg configuration
     # First, look for one uninstalled.
     # the alternative search directory is invoked by --with-tkimgjpeg
@@ -6848,255 +6320,6 @@ fi
 
 
     #
-    # Ok, lets find the tkimgpng configuration
-    # First, look for one uninstalled.
-    # the alternative search directory is invoked by --with-tkimgpng
-    #
-
-    if test x"${no_tkimgpng}" = x ; then
-	# we reset no_tkimgpng in case something fails here
-	no_tkimgpng=true
-
-# Check whether --with-tkimgpng was given.
-if test "${with_tkimgpng+set}" = set; then :
-  withval=$with_tkimgpng; with_tkimgpngconfig=${withval}
-fi
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkimgpng configuration" >&5
-$as_echo_n "checking for tkimgpng configuration... " >&6; }
-	if ${ac_cv_c_tkimgpngconfig+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-
-	    # First check to see if --with-tkimgpng was specified.
-	    if test x"${with_tkimgpngconfig}" != x ; then
-		case ${with_tkimgpngconfig} in
-		    */tkimgpngConfig.sh )
-			if test -f ${with_tkimgpngconfig}; then
-			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkimgpng argument should refer to directory containing tkimgpngConfig.sh, not to tkimgpngConfig.sh itself" >&5
-$as_echo "$as_me: WARNING: --with-tkimgpng argument should refer to directory containing tkimgpngConfig.sh, not to tkimgpngConfig.sh itself" >&2;}
-			    with_tkimgpngconfig=`echo ${with_tkimgpngconfig} | sed 's!/tkimgpngConfig\.sh$!!'`
-			fi;;
-		esac
-		if test -f "${with_tkimgpngconfig}/tkimgpngConfig.sh" ; then
-		    ac_cv_c_tkimgpngconfig=`(cd ${with_tkimgpngconfig}; pwd)`
-		else
-		    as_fn_error $? "${with_tkimgpngconfig} directory doesn't contain tkimgpngConfig.sh" "$LINENO" 5
-		fi
-	    fi
-
-	    # then check for a private tkimgpng installation
-	    if test x"${ac_cv_c_tkimgpngconfig}" = x ; then
-		for i in \
-			../tkimgpng \
-			`ls -dr ../tkimgpng*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ../tkimgpng*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ../tkimgpng*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ../tkimgpng*[0-9].[0-9]* 2>/dev/null` \
-			../../tkimgpng \
-			`ls -dr ../../tkimgpng*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ../../tkimgpng*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ../../tkimgpng*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ../../tkimgpng*[0-9].[0-9]* 2>/dev/null` \
-			../../../tkimgpng \
-			`ls -dr ../../../tkimgpng*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ../../../tkimgpng*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ../../../tkimgpng*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ../../../tkimgpng*[0-9].[0-9]* 2>/dev/null` \
-			${srcdir}/../tkimgpng \
-			`ls -dr ${srcdir}/../tkimgpng*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
-			`ls -dr ${srcdir}/../tkimgpng*[0-9].[0-9][0-9] 2>/dev/null` \
-			`ls -dr ${srcdir}/../tkimgpng*[0-9].[0-9] 2>/dev/null` \
-			`ls -dr ${srcdir}/../tkimgpng*[0-9].[0-9]* 2>/dev/null` \
-			; do
-		    if test -f "$i/tkimgpngConfig.sh" ; then
-			ac_cv_c_tkimgpngconfig=`(cd $i; pwd)`
-			break
-		    fi
-		    if test -f "$i/unix/tkimgpngConfig.sh" ; then
-			ac_cv_c_tkimgpngconfig=`(cd $i/unix; pwd)`
-			break
-		    fi
-		done
-	    fi
-
-	    # check in a few common install locations
-	    if test x"${ac_cv_c_tkimgpngconfig}" = 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/tkimgpngConfig.sh" ; then
-			ac_cv_c_tkimgpngconfig=`(cd $i; pwd)`
-			break
-		    fi
-		done
-	    fi
-
-fi
-
-
-	if test x"${ac_cv_c_tkimgpngconfig}" = x ; then
-	    tkimgpng_BIN_DIR="# no tkimgpng configs found"
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkimgpng configuration definitions" >&5
-$as_echo "$as_me: WARNING: Cannot find tkimgpng configuration definitions" >&2;}
-	    exit 0
-	else
-	    no_tkimgpng=
-	    tkimgpng_BIN_DIR=${ac_cv_c_tkimgpngconfig}
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkimgpng_BIN_DIR/tkimgpngConfig.sh" >&5
-$as_echo "found $tkimgpng_BIN_DIR/tkimgpngConfig.sh" >&6; }
-	fi
-    fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkimgpng_BIN_DIR}/tkimgpngConfig.sh" >&5
-$as_echo_n "checking for existence of ${tkimgpng_BIN_DIR}/tkimgpngConfig.sh... " >&6; }
-
-    if test -f "${tkimgpng_BIN_DIR}/tkimgpngConfig.sh" ; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
-$as_echo "loading" >&6; }
-	. "${tkimgpng_BIN_DIR}/tkimgpngConfig.sh"
-    else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
-$as_echo "file not found" >&6; }
-    fi
-
-    #
-    # If the tkimgpng_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 tkimgpng_LIB_SPEC will be set to the value
-    # of tkimgpng_BUILD_LIB_SPEC. An extension should make use of tkimgpng_LIB_SPEC
-    # instead of tkimgpng_BUILD_LIB_SPEC since it will work with both an
-    # installed and uninstalled version of Tcl.
-    #
-
-    if test -f "${tkimgpng_BIN_DIR}/Makefile" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkimgpng" >&5
-$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimgpng" >&2;}
-        tkimgpng_LIB_SPEC=${tkimgpng_BUILD_LIB_SPEC}
-        tkimgpng_STUB_LIB_SPEC=${tkimgpng_BUILD_STUB_LIB_SPEC}
-        tkimgpng_STUB_LIB_PATH=${tkimgpng_BUILD_STUB_LIB_PATH}
-        tkimgpng_INCLUDE_SPEC=${tkimgpng_BUILD_INCLUDE_SPEC}
-        tkimgpng_LIBRARY_PATH=${tkimgpng_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${tkimgpng_STUB_LIB_SPEC}" = x; then :
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKIMGPNG_STUB library for LIBS" >&5
-$as_echo_n "checking For TKIMGPNG_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${TKIMGPNG_STUB_LIB_SPEC}" != "x" ; then
-	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-
-    vars="\"`${CYGPATH} ${TKIMGPNG_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 TKIMGPNG_STUB_LIB_PATH ${TKIMGPNG_STUB_LIB_PATH}" >&5
-$as_echo "using TKIMGPNG_STUB_LIB_PATH ${TKIMGPNG_STUB_LIB_PATH}" >&6; }
-	else
-
-    vars="${TKIMGPNG_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 TKIMGPNG_STUB_LIB_SPEC ${TKIMGPNG_STUB_LIB_SPEC}" >&5
-$as_echo "using TKIMGPNG_STUB_LIB_SPEC ${TKIMGPNG_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 tkimgpng_STUB library for LIBS" >&5
-$as_echo_n "checking For tkimgpng_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${tkimgpng_STUB_LIB_SPEC}" != "x" ; then
-	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-
-    vars="\"`${CYGPATH} ${tkimgpng_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 tkimgpng_STUB_LIB_PATH ${tkimgpng_STUB_LIB_PATH}" >&5
-$as_echo "using tkimgpng_STUB_LIB_PATH ${tkimgpng_STUB_LIB_PATH}" >&6; }
-	else
-
-    vars="${tkimgpng_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 tkimgpng_STUB_LIB_SPEC ${tkimgpng_STUB_LIB_SPEC}" >&5
-$as_echo "using tkimgpng_STUB_LIB_SPEC ${tkimgpng_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 tkimgtiff configuration
     # First, look for one uninstalled.
     # the alternative search directory is invoked by --with-tkimgtiff
diff --git a/ds9/win/configure.ac b/ds9/win/configure.ac
index 3169c36..98c4ad7 100644
--- a/ds9/win/configure.ac
+++ b/ds9/win/configure.ac
@@ -52,9 +52,6 @@ TEA_LOAD_TKCONFIG
 TEA_PATH_CONFIG(tifftcl)
 TEA_LOAD_CONFIG(tifftcl)
 
-TEA_PATH_CONFIG(pngtcl)
-TEA_LOAD_CONFIG(pngtcl)
-
 TEA_PATH_CONFIG(jpegtcl)
 TEA_LOAD_CONFIG(jpegtcl)
 
@@ -79,15 +76,9 @@ TEA_LOAD_CONFIG(tkhtml1)
 TEA_PATH_CONFIG(tkimg)
 TEA_LOAD_CONFIG(tkimg)
 
-TEA_PATH_CONFIG(tkimggif)
-TEA_LOAD_CONFIG(tkimggif)
-
 TEA_PATH_CONFIG(tkimgjpeg)
 TEA_LOAD_CONFIG(tkimgjpeg)
 
-TEA_PATH_CONFIG(tkimgpng)
-TEA_LOAD_CONFIG(tkimgpng)
-
 TEA_PATH_CONFIG(tkimgtiff)
 TEA_LOAD_CONFIG(tkimgtiff)
 
diff --git a/ds9/win/ds9.C b/ds9/win/ds9.C
index 748fc76..058ae5a 100644
--- a/ds9/win/ds9.C
+++ b/ds9/win/ds9.C
@@ -33,9 +33,6 @@ extern "C" {
   int Tkimgjpeg_Init(Tcl_Interp*);
   int Tifftcl_Init(Tcl_Interp*);
   int Tkimgtiff_Init(Tcl_Interp*);
-  int Pngtcl_Init(Tcl_Interp*);
-  int Tkimgpng_Init(Tcl_Interp*);
-  int Tkimggif_Init(Tcl_Interp*);
   int Tkimgwindow_Init(Tcl_Interp*);
 
   int Tclxpa_Init(Tcl_Interp*);
@@ -206,24 +203,6 @@ int SAOAppInit(Tcl_Interp *interp)
   Tcl_StaticPackage (interp, "tiff", Tkimgtiff_Init,
 		     (Tcl_PackageInitProc*)NULL);
 
-  // Pngtcl
-  if (Pngtcl_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "pngtcl", Pngtcl_Init,
-  		     (Tcl_PackageInitProc*)NULL);
-
-  // Tkimgpng
-  if (Tkimgpng_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "png", Tkimgpng_Init,
-  		     (Tcl_PackageInitProc*)NULL);
-
-  // Tkimggif
-  if (Tkimggif_Init(interp) == TCL_ERROR)
-    return TCL_ERROR;
-  Tcl_StaticPackage (interp, "gif", Tkimggif_Init,
-		     (Tcl_PackageInitProc*)NULL);
-
   // Tkimgwindow
   if (Tkimgwindow_Init(interp) == TCL_ERROR)
     return TCL_ERROR;