summaryrefslogtreecommitdiffstats
path: root/ds9/win
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-01-06 21:24:55 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-01-06 21:24:55 (GMT)
commitc333eec2f20c0bff08c2d483570912f963d109da (patch)
treefee8b9c1c98779aa978b3d34c87f569ca39957c5 /ds9/win
parent39395f46869cef613833d766c5831b78abdb4b1d (diff)
downloadblt-c333eec2f20c0bff08c2d483570912f963d109da.zip
blt-c333eec2f20c0bff08c2d483570912f963d109da.tar.gz
blt-c333eec2f20c0bff08c2d483570912f963d109da.tar.bz2
update TEA 3.10
Diffstat (limited to 'ds9/win')
-rwxr-xr-xds9/win/Makefile.in2
-rwxr-xr-xds9/win/configure258
-rwxr-xr-xds9/win/configure.in3
3 files changed, 0 insertions, 263 deletions
diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in
index b4a5799..343f54e 100755
--- a/ds9/win/Makefile.in
+++ b/ds9/win/Makefile.in
@@ -24,8 +24,6 @@ jpegtcl_LIB_SPEC= @jpegtcl_LIB_SPEC@
zlibtcl_LIB_SPEC= @zlibtcl_LIB_SPEC@
tkimg_LIB_SPEC = @tkimg_LIB_SPEC@
-tcliis_LIB_SPEC = @tcliis_LIB_SPEC@
-
tkblt_LIB_SPEC = @tkblt_LIB_SPEC@
tkmpeg_LIB_SPEC = @tkmpeg_LIB_SPEC@
diff --git a/ds9/win/configure b/ds9/win/configure
index 7e8de5a..8c3041c 100755
--- a/ds9/win/configure
+++ b/ds9/win/configure
@@ -707,14 +707,6 @@ tifftcl_LIB_FILE
tifftcl_SRC_DIR
tifftcl_BIN_DIR
tifftcl_VERSION
-tcliis_STUB_LIB_PATH
-tcliis_STUB_LIB_SPEC
-tcliis_STUB_LIB_FILE
-tcliis_LIB_SPEC
-tcliis_LIB_FILE
-tcliis_SRC_DIR
-tcliis_BIN_DIR
-tcliis_VERSION
TK_XINCLUDES
TK_LIBS
TK_STUB_LIB_SPEC
@@ -802,7 +794,6 @@ ac_user_opts='
enable_option_checking
with_tcl
with_tk
-with_tcliis
with_tifftcl
with_pngtcl
with_jpegtcl
@@ -1451,7 +1442,6 @@ Optional Packages:
--with-tcl directory containing tcl configuration
(tclConfig.sh)
--with-tk directory containing tk configuration (tkConfig.sh)
- --with-tcliis directory containing tcliis configuration (tcliisConfig.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)
@@ -3715,254 +3705,6 @@ $as_echo "#define MAC_OSX_TK 1" >>confdefs.h
#
- # Ok, lets find the tcliis configuration
- # First, look for one uninstalled.
- # the alternative search directory is invoked by --with-tcliis
- #
-
- if test x"${no_tcliis}" = x ; then
- # we reset no_tcliis in case something fails here
- no_tcliis=true
-
-# Check whether --with-tcliis was given.
-if test "${with_tcliis+set}" = set; then :
- withval=$with_tcliis; with_tcliisconfig=${withval}
-fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcliis configuration" >&5
-$as_echo_n "checking for tcliis configuration... " >&6; }
- if ${ac_cv_c_tcliisconfig+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-
- # First check to see if --with-tcliis was specified.
- if test x"${with_tcliisconfig}" != x ; then
- case ${with_tcliisconfig} in
- */tcliisConfig.sh )
- if test -f ${with_tcliisconfig}; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tcliis argument should refer to directory containing tcliisConfig.sh, not to tcliisConfig.sh itself" >&5
-$as_echo "$as_me: WARNING: --with-tcliis argument should refer to directory containing tcliisConfig.sh, not to tcliisConfig.sh itself" >&2;}
- with_tcliisconfig=`echo ${with_tcliisconfig} | sed 's!/tcliisConfig\.sh$!!'`
- fi;;
- esac
- if test -f "${with_tcliisconfig}/tcliisConfig.sh" ; then
- ac_cv_c_tcliisconfig=`(cd ${with_tcliisconfig}; pwd)`
- else
- as_fn_error $? "${with_tcliisconfig} directory doesn't contain tcliisConfig.sh" "$LINENO" 5
- fi
- fi
-
- # then check for a private tcliis installation
- if test x"${ac_cv_c_tcliisconfig}" = x ; then
- for i in \
- ../tcliis \
- `ls -dr ../tcliis*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
- `ls -dr ../tcliis*[0-9].[0-9][0-9] 2>/dev/null` \
- `ls -dr ../tcliis*[0-9].[0-9] 2>/dev/null` \
- `ls -dr ../tcliis*[0-9].[0-9]* 2>/dev/null` \
- ../../tcliis \
- `ls -dr ../../tcliis*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
- `ls -dr ../../tcliis*[0-9].[0-9][0-9] 2>/dev/null` \
- `ls -dr ../../tcliis*[0-9].[0-9] 2>/dev/null` \
- `ls -dr ../../tcliis*[0-9].[0-9]* 2>/dev/null` \
- ../../../tcliis \
- `ls -dr ../../../tcliis*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
- `ls -dr ../../../tcliis*[0-9].[0-9][0-9] 2>/dev/null` \
- `ls -dr ../../../tcliis*[0-9].[0-9] 2>/dev/null` \
- `ls -dr ../../../tcliis*[0-9].[0-9]* 2>/dev/null` \
- ${srcdir}/../tcliis \
- `ls -dr ${srcdir}/../tcliis*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
- `ls -dr ${srcdir}/../tcliis*[0-9].[0-9][0-9] 2>/dev/null` \
- `ls -dr ${srcdir}/../tcliis*[0-9].[0-9] 2>/dev/null` \
- `ls -dr ${srcdir}/../tcliis*[0-9].[0-9]* 2>/dev/null` \
- ; do
- if test -f "$i/tcliisConfig.sh" ; then
- ac_cv_c_tcliisconfig=`(cd $i; pwd)`
- break
- fi
- if test -f "$i/unix/tcliisConfig.sh" ; then
- ac_cv_c_tcliisconfig=`(cd $i/unix; pwd)`
- break
- fi
- done
- fi
-
- # check in a few common install locations
- if test x"${ac_cv_c_tcliisconfig}" = 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/tcliisConfig.sh" ; then
- ac_cv_c_tcliisconfig=`(cd $i; pwd)`
- break
- fi
- done
- fi
-
-fi
-
-
- if test x"${ac_cv_c_tcliisconfig}" = x ; then
- tcliis_BIN_DIR="# no tcliis configs found"
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tcliis configuration definitions" >&5
-$as_echo "$as_me: WARNING: Cannot find tcliis configuration definitions" >&2;}
- exit 0
- else
- no_tcliis=
- tcliis_BIN_DIR=${ac_cv_c_tcliisconfig}
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tcliis_BIN_DIR/tcliisConfig.sh" >&5
-$as_echo "found $tcliis_BIN_DIR/tcliisConfig.sh" >&6; }
- fi
- fi
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tcliis_BIN_DIR}/tcliisConfig.sh" >&5
-$as_echo_n "checking for existence of ${tcliis_BIN_DIR}/tcliisConfig.sh... " >&6; }
-
- if test -f "${tcliis_BIN_DIR}/tcliisConfig.sh" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
-$as_echo "loading" >&6; }
- . "${tcliis_BIN_DIR}/tcliisConfig.sh"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
-$as_echo "file not found" >&6; }
- fi
-
- #
- # If the tcliis_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 tcliis_LIB_SPEC will be set to the value
- # of tcliis_BUILD_LIB_SPEC. An extension should make use of tcliis_LIB_SPEC
- # instead of tcliis_BUILD_LIB_SPEC since it will work with both an
- # installed and uninstalled version of Tcl.
- #
-
- if test -f "${tcliis_BIN_DIR}/Makefile" ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tcliis" >&5
-$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tcliis" >&2;}
- tcliis_LIB_SPEC=${tcliis_BUILD_LIB_SPEC}
- tcliis_STUB_LIB_SPEC=${tcliis_BUILD_STUB_LIB_SPEC}
- tcliis_STUB_LIB_PATH=${tcliis_BUILD_STUB_LIB_PATH}
- tcliis_INCLUDE_SPEC=${tcliis_BUILD_INCLUDE_SPEC}
- tcliis_LIBRARY_PATH=${tcliis_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${tcliis_STUB_LIB_SPEC}" = x; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLIIS_STUB library for LIBS" >&5
-$as_echo_n "checking For TCLIIS_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${TCLIIS_STUB_LIB_SPEC}" != "x" ; then
- if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-
- vars="\"`${CYGPATH} ${TCLIIS_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 TCLIIS_STUB_LIB_PATH ${TCLIIS_STUB_LIB_PATH}" >&5
-$as_echo "using TCLIIS_STUB_LIB_PATH ${TCLIIS_STUB_LIB_PATH}" >&6; }
- else
-
- vars="${TCLIIS_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 TCLIIS_STUB_LIB_SPEC ${TCLIIS_STUB_LIB_SPEC}" >&5
-$as_echo "using TCLIIS_STUB_LIB_SPEC ${TCLIIS_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 tcliis_STUB library for LIBS" >&5
-$as_echo_n "checking For tcliis_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${tcliis_STUB_LIB_SPEC}" != "x" ; then
- if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-
- vars="\"`${CYGPATH} ${tcliis_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 tcliis_STUB_LIB_PATH ${tcliis_STUB_LIB_PATH}" >&5
-$as_echo "using tcliis_STUB_LIB_PATH ${tcliis_STUB_LIB_PATH}" >&6; }
- else
-
- vars="${tcliis_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 tcliis_STUB_LIB_SPEC ${tcliis_STUB_LIB_SPEC}" >&5
-$as_echo "using tcliis_STUB_LIB_SPEC ${tcliis_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 tifftcl configuration
# First, look for one uninstalled.
# the alternative search directory is invoked by --with-tifftcl
diff --git a/ds9/win/configure.in b/ds9/win/configure.in
index e1bb79e..4e6ead8 100755
--- a/ds9/win/configure.in
+++ b/ds9/win/configure.in
@@ -49,9 +49,6 @@ TEA_LOAD_TKCONFIG
# Load the *.sh file if necessary
#--------------------------------------------------------------------
-TEA_PATH_CONFIG(tcliis)
-TEA_LOAD_CONFIG(tcliis)
-
TEA_PATH_CONFIG(tifftcl)
TEA_LOAD_CONFIG(tifftcl)