diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-11 21:33:41 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-11 21:33:41 (GMT) |
commit | c17786a561a6e7c95cdfcefb1b8f62385ad6bd60 (patch) | |
tree | f489e03de35ed5c37cf9855c9618c2113cce167a | |
parent | be98a88a9a78e0b4035acc227148487ae5424aa8 (diff) | |
download | blt-c17786a561a6e7c95cdfcefb1b8f62385ad6bd60.zip blt-c17786a561a6e7c95cdfcefb1b8f62385ad6bd60.tar.gz blt-c17786a561a6e7c95cdfcefb1b8f62385ad6bd60.tar.bz2 |
update TEA 3.10
-rw-r--r-- | ds9/macosx/Makefile.in | 11 | ||||
-rwxr-xr-x | ds9/macosx/configure | 2126 | ||||
-rw-r--r-- | ds9/macosx/configure.ac | 25 | ||||
-rw-r--r-- | ds9/unix/Makefile.in | 13 | ||||
-rwxr-xr-x | ds9/unix/configure | 2406 | ||||
-rw-r--r-- | ds9/unix/configure.ac | 31 | ||||
-rwxr-xr-x | ds9/win/Makefile.in | 5 | ||||
-rwxr-xr-x | ds9/win/configure | 1274 | ||||
-rw-r--r-- | ds9/win/configure.ac | 19 |
9 files changed, 3372 insertions, 2538 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index ea49b0f..793c095 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -33,6 +33,7 @@ tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@ tkmacosx_LIB_SPEC= @tkmacosx_LIB_SPEC@ tkmpeg_LIB_SPEC = @tkmpeg_LIB_SPEC@ tksao_LIB_SPEC = @tksao_LIB_SPEC@ +tktable_LIB_SPEC= @tktable_LIB_SPEC@ CC = @CC@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ @@ -70,7 +71,6 @@ LLIBS = \ $(libdir)/libast_err.a \ $(libdir)/libast_pal.a \ $(libdir)/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \ - $(libdir)/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \ $(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff$(TKIMGVER).a \ $(libdir)/tkimgpng$(TKIMGVER)/libtkimgpng$(TKIMGVER).a \ $(libdir)/tkimgjpeg$(TKIMGVER)/libtkimgjpeg$(TKIMGVER).a \ @@ -130,19 +130,20 @@ ds9base : $(OBJS) $(LLIBS) $(OBJS) \ $(LLIBS) \ $(LIBS) \ - $(tclcheckdns_LIB_SPEC) \ - $(tcliis_LIB_SPEC) \ - $(tclsignal_LIB_SPEC) \ $(tifftcl_LIB_SPEC) \ $(pngtcl_LIB_SPEC) \ $(jpegtcl_LIB_SPEC) \ $(zlibtcl_LIB_SPEC) \ - $(tkimg_LIB_SPEC) \ + $(tclcheckdns_LIB_SPEC) \ + $(tcliis_LIB_SPEC) \ + $(tclsignal_LIB_SPEC) \ $(tkblt_LIB_SPEC) \ $(tkhtml1_LIB_SPEC) \ + $(tkimg_LIB_SPEC) \ $(tkmacosx_LIB_SPEC) \ $(tkmpeg_LIB_SPEC) \ $(tksao_LIB_SPEC) \ + $(tktable_LIB_SPEC) \ $(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \ $(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \ $(TK_LIBS) diff --git a/ds9/macosx/configure b/ds9/macosx/configure index 8d231ba..7d4ee3f 100755 --- a/ds9/macosx/configure +++ b/ds9/macosx/configure @@ -666,6 +666,14 @@ INSTALL_DATA INSTALL_DATA_DIR INSTALL CPP +tktable_STUB_LIB_PATH +tktable_STUB_LIB_SPEC +tktable_STUB_LIB_FILE +tktable_LIB_SPEC +tktable_LIB_FILE +tktable_SRC_DIR +tktable_BIN_DIR +tktable_VERSION tksao_STUB_LIB_PATH tksao_STUB_LIB_SPEC tksao_STUB_LIB_FILE @@ -690,6 +698,14 @@ tkmacosx_LIB_FILE tkmacosx_SRC_DIR tkmacosx_BIN_DIR tkmacosx_VERSION +tkimg_STUB_LIB_PATH +tkimg_STUB_LIB_SPEC +tkimg_STUB_LIB_FILE +tkimg_LIB_SPEC +tkimg_LIB_FILE +tkimg_SRC_DIR +tkimg_BIN_DIR +tkimg_VERSION tkhtml1_STUB_LIB_PATH tkhtml1_STUB_LIB_SPEC tkhtml1_STUB_LIB_FILE @@ -706,14 +722,30 @@ tkblt_LIB_FILE tkblt_SRC_DIR tkblt_BIN_DIR tkblt_VERSION -tkimg_STUB_LIB_PATH -tkimg_STUB_LIB_SPEC -tkimg_STUB_LIB_FILE -tkimg_LIB_SPEC -tkimg_LIB_FILE -tkimg_SRC_DIR -tkimg_BIN_DIR -tkimg_VERSION +tclsignal_STUB_LIB_PATH +tclsignal_STUB_LIB_SPEC +tclsignal_STUB_LIB_FILE +tclsignal_LIB_SPEC +tclsignal_LIB_FILE +tclsignal_SRC_DIR +tclsignal_BIN_DIR +tclsignal_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 +tclcheckdns_STUB_LIB_PATH +tclcheckdns_STUB_LIB_SPEC +tclcheckdns_STUB_LIB_FILE +tclcheckdns_LIB_SPEC +tclcheckdns_LIB_FILE +tclcheckdns_SRC_DIR +tclcheckdns_BIN_DIR +tclcheckdns_VERSION zlibtcl_STUB_LIB_PATH zlibtcl_STUB_LIB_SPEC zlibtcl_STUB_LIB_FILE @@ -746,30 +778,6 @@ tifftcl_LIB_FILE tifftcl_SRC_DIR tifftcl_BIN_DIR tifftcl_VERSION -tclsignal_STUB_LIB_PATH -tclsignal_STUB_LIB_SPEC -tclsignal_STUB_LIB_FILE -tclsignal_LIB_SPEC -tclsignal_LIB_FILE -tclsignal_SRC_DIR -tclsignal_BIN_DIR -tclsignal_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 -tclcheckdns_STUB_LIB_PATH -tclcheckdns_STUB_LIB_SPEC -tclcheckdns_STUB_LIB_FILE -tclcheckdns_LIB_SPEC -tclcheckdns_LIB_FILE -tclcheckdns_SRC_DIR -tclcheckdns_BIN_DIR -tclcheckdns_VERSION PRACTCL_WINDOWINGSYSTEM TK_XINCLUDES TK_LIBS @@ -859,19 +867,20 @@ ac_user_opts=' enable_option_checking with_tcl with_tk -with_tclcheckdns -with_tcliis -with_tclsignal with_tifftcl with_pngtcl with_jpegtcl with_zlibtcl -with_tkimg +with_tclcheckdns +with_tcliis +with_tclsignal with_tkblt with_tkhtml1 +with_tkimg with_tkmacosx with_tkmpeg with_tksao +with_tktable with_tclinclude with_tkinclude with_x @@ -1519,19 +1528,20 @@ Optional Packages: --with-tcl directory containing tcl configuration (tclConfig.sh) --with-tk directory containing tk configuration (tkConfig.sh) - --with-tclcheckdns directory containing tclcheckdns configuration (tclcheckdnsConfig.sh) - --with-tcliis directory containing tcliis configuration (tcliisConfig.sh) - --with-tclsignal directory containing tclsignal configuration (tclsignalConfig.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-tkimg directory containing tkimg configuration (tkimgConfig.sh) + --with-tclcheckdns directory containing tclcheckdns configuration (tclcheckdnsConfig.sh) + --with-tcliis directory containing tcliis configuration (tcliisConfig.sh) + --with-tclsignal directory containing tclsignal configuration (tclsignalConfig.sh) --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-tkmacosx directory containing tkmacosx configuration (tkmacosxConfig.sh) --with-tkmpeg directory containing tkmpeg configuration (tkmpegConfig.sh) --with-tksao directory containing tksao configuration (tksaoConfig.sh) + --with-tktable directory containing tktable configuration (tktableConfig.sh) --with-tclinclude directory containing the public Tcl header files --with-tkinclude directory containing the public Tk header files --with-x use the X Window System @@ -3862,798 +3872,6 @@ $as_echo "#define MAC_OSX_TK 1" >>confdefs.h # - # Ok, lets find the tclcheckdns configuration - # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tclcheckdns - # - - if test x"${no_tclcheckdns}" = x ; then - # we reset no_tclcheckdns in case something fails here - no_tclcheckdns=true - -# Check whether --with-tclcheckdns was given. -if test "${with_tclcheckdns+set}" = set; then : - withval=$with_tclcheckdns; with_tclcheckdnsconfig=${withval} -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclcheckdns configuration" >&5 -$as_echo_n "checking for tclcheckdns configuration... " >&6; } - if ${ac_cv_c_tclcheckdnsconfig+:} false; then : - $as_echo_n "(cached) " >&6 -else - - - # First check to see if --with-tclcheckdns was specified. - if test x"${with_tclcheckdnsconfig}" != x ; then - case ${with_tclcheckdnsconfig} in - */tclcheckdnsConfig.sh ) - if test -f ${with_tclcheckdnsconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclcheckdns argument should refer to directory containing tclcheckdnsConfig.sh, not to tclcheckdnsConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tclcheckdns argument should refer to directory containing tclcheckdnsConfig.sh, not to tclcheckdnsConfig.sh itself" >&2;} - with_tclcheckdnsconfig=`echo ${with_tclcheckdnsconfig} | sed 's!/tclcheckdnsConfig\.sh$!!'` - fi;; - esac - if test -f "${with_tclcheckdnsconfig}/tclcheckdnsConfig.sh" ; then - ac_cv_c_tclcheckdnsconfig=`(cd ${with_tclcheckdnsconfig}; pwd)` - else - as_fn_error $? "${with_tclcheckdnsconfig} directory doesn't contain tclcheckdnsConfig.sh" "$LINENO" 5 - fi - fi - - # then check for a private tclcheckdns installation - if test x"${ac_cv_c_tclcheckdnsconfig}" = x ; then - for i in \ - ../tclcheckdns \ - `ls -dr ../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ - ../../tclcheckdns \ - `ls -dr ../../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ - ../../../tclcheckdns \ - `ls -dr ../../../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tclcheckdns \ - `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ - ; do - if test -f "$i/tclcheckdnsConfig.sh" ; then - ac_cv_c_tclcheckdnsconfig=`(cd $i; pwd)` - break - fi - if test -f "$i/unix/tclcheckdnsConfig.sh" ; then - ac_cv_c_tclcheckdnsconfig=`(cd $i/unix; pwd)` - break - fi - done - fi - - # check in a few common install locations - if test x"${ac_cv_c_tclcheckdnsconfig}" = 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/tclcheckdnsConfig.sh" ; then - ac_cv_c_tclcheckdnsconfig=`(cd $i; pwd)` - break - fi - done - fi - -fi - - - if test x"${ac_cv_c_tclcheckdnsconfig}" = x ; then - tclcheckdns_BIN_DIR="# no tclcheckdns configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclcheckdns configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tclcheckdns configuration definitions" >&2;} - exit 0 - else - no_tclcheckdns= - tclcheckdns_BIN_DIR=${ac_cv_c_tclcheckdnsconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclcheckdns_BIN_DIR/tclcheckdnsConfig.sh" >&5 -$as_echo "found $tclcheckdns_BIN_DIR/tclcheckdnsConfig.sh" >&6; } - fi - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" >&5 -$as_echo_n "checking for existence of ${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh... " >&6; } - - if test -f "${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 -$as_echo "loading" >&6; } - . "${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 -$as_echo "file not found" >&6; } - fi - - # - # If the tclcheckdns_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 tclcheckdns_LIB_SPEC will be set to the value - # of tclcheckdns_BUILD_LIB_SPEC. An extension should make use of tclcheckdns_LIB_SPEC - # instead of tclcheckdns_BUILD_LIB_SPEC since it will work with both an - # installed and uninstalled version of Tcl. - # - - if test -f "${tclcheckdns_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclcheckdns" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclcheckdns" >&2;} - tclcheckdns_LIB_SPEC=${tclcheckdns_BUILD_LIB_SPEC} - tclcheckdns_STUB_LIB_SPEC=${tclcheckdns_BUILD_STUB_LIB_SPEC} - tclcheckdns_STUB_LIB_PATH=${tclcheckdns_BUILD_STUB_LIB_PATH} - tclcheckdns_INCLUDE_SPEC=${tclcheckdns_BUILD_INCLUDE_SPEC} - tclcheckdns_LIBRARY_PATH=${tclcheckdns_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${tclcheckdns_STUB_LIB_SPEC}" = x; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLCHECKDNS_STUB library for LIBS" >&5 -$as_echo_n "checking For TCLCHECKDNS_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${TCLCHECKDNS_STUB_LIB_SPEC}" != "x" ; then - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - - vars="\"`${CYGPATH} ${TCLCHECKDNS_STUB_LIB_PATH}`\"" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLCHECKDNS_STUB_LIB_PATH ${TCLCHECKDNS_STUB_LIB_PATH}" >&5 -$as_echo "using TCLCHECKDNS_STUB_LIB_PATH ${TCLCHECKDNS_STUB_LIB_PATH}" >&6; } - else - - vars="${TCLCHECKDNS_STUB_LIB_SPEC}" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLCHECKDNS_STUB_LIB_SPEC ${TCLCHECKDNS_STUB_LIB_SPEC}" >&5 -$as_echo "using TCLCHECKDNS_STUB_LIB_SPEC ${TCLCHECKDNS_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 tclcheckdns_STUB library for LIBS" >&5 -$as_echo_n "checking For tclcheckdns_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${tclcheckdns_STUB_LIB_SPEC}" != "x" ; then - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - - vars="\"`${CYGPATH} ${tclcheckdns_STUB_LIB_PATH}`\"" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclcheckdns_STUB_LIB_PATH ${tclcheckdns_STUB_LIB_PATH}" >&5 -$as_echo "using tclcheckdns_STUB_LIB_PATH ${tclcheckdns_STUB_LIB_PATH}" >&6; } - else - - vars="${tclcheckdns_STUB_LIB_SPEC}" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclcheckdns_STUB_LIB_SPEC ${tclcheckdns_STUB_LIB_SPEC}" >&5 -$as_echo "using tclcheckdns_STUB_LIB_SPEC ${tclcheckdns_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 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 - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - 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 - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - 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 - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - 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 - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - 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 tclsignal configuration - # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tclsignal - # - - if test x"${no_tclsignal}" = x ; then - # we reset no_tclsignal in case something fails here - no_tclsignal=true - -# Check whether --with-tclsignal was given. -if test "${with_tclsignal+set}" = set; then : - withval=$with_tclsignal; with_tclsignalconfig=${withval} -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsignal configuration" >&5 -$as_echo_n "checking for tclsignal configuration... " >&6; } - if ${ac_cv_c_tclsignalconfig+:} false; then : - $as_echo_n "(cached) " >&6 -else - - - # First check to see if --with-tclsignal was specified. - if test x"${with_tclsignalconfig}" != x ; then - case ${with_tclsignalconfig} in - */tclsignalConfig.sh ) - if test -f ${with_tclsignalconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclsignal argument should refer to directory containing tclsignalConfig.sh, not to tclsignalConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tclsignal argument should refer to directory containing tclsignalConfig.sh, not to tclsignalConfig.sh itself" >&2;} - with_tclsignalconfig=`echo ${with_tclsignalconfig} | sed 's!/tclsignalConfig\.sh$!!'` - fi;; - esac - if test -f "${with_tclsignalconfig}/tclsignalConfig.sh" ; then - ac_cv_c_tclsignalconfig=`(cd ${with_tclsignalconfig}; pwd)` - else - as_fn_error $? "${with_tclsignalconfig} directory doesn't contain tclsignalConfig.sh" "$LINENO" 5 - fi - fi - - # then check for a private tclsignal installation - if test x"${ac_cv_c_tclsignalconfig}" = x ; then - for i in \ - ../tclsignal \ - `ls -dr ../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tclsignal*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tclsignal*[0-9].[0-9]* 2>/dev/null` \ - ../../tclsignal \ - `ls -dr ../../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tclsignal*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tclsignal*[0-9].[0-9]* 2>/dev/null` \ - ../../../tclsignal \ - `ls -dr ../../../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tclsignal*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tclsignal*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tclsignal \ - `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9]* 2>/dev/null` \ - ; do - if test -f "$i/tclsignalConfig.sh" ; then - ac_cv_c_tclsignalconfig=`(cd $i; pwd)` - break - fi - if test -f "$i/unix/tclsignalConfig.sh" ; then - ac_cv_c_tclsignalconfig=`(cd $i/unix; pwd)` - break - fi - done - fi - - # check in a few common install locations - if test x"${ac_cv_c_tclsignalconfig}" = 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/tclsignalConfig.sh" ; then - ac_cv_c_tclsignalconfig=`(cd $i; pwd)` - break - fi - done - fi - -fi - - - if test x"${ac_cv_c_tclsignalconfig}" = x ; then - tclsignal_BIN_DIR="# no tclsignal configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclsignal configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tclsignal configuration definitions" >&2;} - exit 0 - else - no_tclsignal= - tclsignal_BIN_DIR=${ac_cv_c_tclsignalconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclsignal_BIN_DIR/tclsignalConfig.sh" >&5 -$as_echo "found $tclsignal_BIN_DIR/tclsignalConfig.sh" >&6; } - fi - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclsignal_BIN_DIR}/tclsignalConfig.sh" >&5 -$as_echo_n "checking for existence of ${tclsignal_BIN_DIR}/tclsignalConfig.sh... " >&6; } - - if test -f "${tclsignal_BIN_DIR}/tclsignalConfig.sh" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 -$as_echo "loading" >&6; } - . "${tclsignal_BIN_DIR}/tclsignalConfig.sh" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 -$as_echo "file not found" >&6; } - fi - - # - # If the tclsignal_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 tclsignal_LIB_SPEC will be set to the value - # of tclsignal_BUILD_LIB_SPEC. An extension should make use of tclsignal_LIB_SPEC - # instead of tclsignal_BUILD_LIB_SPEC since it will work with both an - # installed and uninstalled version of Tcl. - # - - if test -f "${tclsignal_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclsignal" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclsignal" >&2;} - tclsignal_LIB_SPEC=${tclsignal_BUILD_LIB_SPEC} - tclsignal_STUB_LIB_SPEC=${tclsignal_BUILD_STUB_LIB_SPEC} - tclsignal_STUB_LIB_PATH=${tclsignal_BUILD_STUB_LIB_PATH} - tclsignal_INCLUDE_SPEC=${tclsignal_BUILD_INCLUDE_SPEC} - tclsignal_LIBRARY_PATH=${tclsignal_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${tclsignal_STUB_LIB_SPEC}" = x; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLSIGNAL_STUB library for LIBS" >&5 -$as_echo_n "checking For TCLSIGNAL_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${TCLSIGNAL_STUB_LIB_SPEC}" != "x" ; then - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - - vars="\"`${CYGPATH} ${TCLSIGNAL_STUB_LIB_PATH}`\"" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLSIGNAL_STUB_LIB_PATH ${TCLSIGNAL_STUB_LIB_PATH}" >&5 -$as_echo "using TCLSIGNAL_STUB_LIB_PATH ${TCLSIGNAL_STUB_LIB_PATH}" >&6; } - else - - vars="${TCLSIGNAL_STUB_LIB_SPEC}" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLSIGNAL_STUB_LIB_SPEC ${TCLSIGNAL_STUB_LIB_SPEC}" >&5 -$as_echo "using TCLSIGNAL_STUB_LIB_SPEC ${TCLSIGNAL_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 tclsignal_STUB library for LIBS" >&5 -$as_echo_n "checking For tclsignal_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${tclsignal_STUB_LIB_SPEC}" != "x" ; then - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - - vars="\"`${CYGPATH} ${tclsignal_STUB_LIB_PATH}`\"" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclsignal_STUB_LIB_PATH ${tclsignal_STUB_LIB_PATH}" >&5 -$as_echo "using tclsignal_STUB_LIB_PATH ${tclsignal_STUB_LIB_PATH}" >&6; } - else - - vars="${tclsignal_STUB_LIB_SPEC}" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclsignal_STUB_LIB_SPEC ${tclsignal_STUB_LIB_SPEC}" >&5 -$as_echo "using tclsignal_STUB_LIB_SPEC ${tclsignal_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 @@ -5710,81 +4928,81 @@ fi # - # Ok, lets find the tkimg configuration + # Ok, lets find the tclcheckdns configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tkimg + # the alternative search directory is invoked by --with-tclcheckdns # - if test x"${no_tkimg}" = x ; then - # we reset no_tkimg in case something fails here - no_tkimg=true + if test x"${no_tclcheckdns}" = x ; then + # we reset no_tclcheckdns in case something fails here + no_tclcheckdns=true -# Check whether --with-tkimg was given. -if test "${with_tkimg+set}" = set; then : - withval=$with_tkimg; with_tkimgconfig=${withval} +# Check whether --with-tclcheckdns was given. +if test "${with_tclcheckdns+set}" = set; then : + withval=$with_tclcheckdns; with_tclcheckdnsconfig=${withval} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkimg configuration" >&5 -$as_echo_n "checking for tkimg configuration... " >&6; } - if ${ac_cv_c_tkimgconfig+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclcheckdns configuration" >&5 +$as_echo_n "checking for tclcheckdns configuration... " >&6; } + if ${ac_cv_c_tclcheckdnsconfig+:} false; then : $as_echo_n "(cached) " >&6 else - # First check to see if --with-tkimg was specified. - if test x"${with_tkimgconfig}" != x ; then - case ${with_tkimgconfig} in - */tkimgConfig.sh ) - if test -f ${with_tkimgconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&2;} - with_tkimgconfig=`echo ${with_tkimgconfig} | sed 's!/tkimgConfig\.sh$!!'` + # First check to see if --with-tclcheckdns was specified. + if test x"${with_tclcheckdnsconfig}" != x ; then + case ${with_tclcheckdnsconfig} in + */tclcheckdnsConfig.sh ) + if test -f ${with_tclcheckdnsconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclcheckdns argument should refer to directory containing tclcheckdnsConfig.sh, not to tclcheckdnsConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tclcheckdns argument should refer to directory containing tclcheckdnsConfig.sh, not to tclcheckdnsConfig.sh itself" >&2;} + with_tclcheckdnsconfig=`echo ${with_tclcheckdnsconfig} | sed 's!/tclcheckdnsConfig\.sh$!!'` fi;; esac - if test -f "${with_tkimgconfig}/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd ${with_tkimgconfig}; pwd)` + if test -f "${with_tclcheckdnsconfig}/tclcheckdnsConfig.sh" ; then + ac_cv_c_tclcheckdnsconfig=`(cd ${with_tclcheckdnsconfig}; pwd)` else - as_fn_error $? "${with_tkimgconfig} directory doesn't contain tkimgConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_tclcheckdnsconfig} directory doesn't contain tclcheckdnsConfig.sh" "$LINENO" 5 fi fi - # then check for a private tkimg installation - if test x"${ac_cv_c_tkimgconfig}" = x ; then + # then check for a private tclcheckdns installation + if test x"${ac_cv_c_tclcheckdnsconfig}" = x ; then for i in \ - ../tkimg \ - `ls -dr ../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tkimg*[0-9].[0-9]* 2>/dev/null` \ - ../../tkimg \ - `ls -dr ../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tkimg*[0-9].[0-9]* 2>/dev/null` \ - ../../../tkimg \ - `ls -dr ../../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tkimg*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tkimg \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ../tclcheckdns \ + `ls -dr ../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ + ../../tclcheckdns \ + `ls -dr ../../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ + ../../../tclcheckdns \ + `ls -dr ../../../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tclcheckdns \ + `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd $i; pwd)` + if test -f "$i/tclcheckdnsConfig.sh" ; then + ac_cv_c_tclcheckdnsconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd $i/unix; pwd)` + if test -f "$i/unix/tclcheckdnsConfig.sh" ; then + ac_cv_c_tclcheckdnsconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_tkimgconfig}" = x ; then + if test x"${ac_cv_c_tclcheckdnsconfig}" = 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` \ @@ -5793,8 +5011,8 @@ $as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory conta `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd $i; pwd)` + if test -f "$i/tclcheckdnsConfig.sh" ; then + ac_cv_c_tclcheckdnsconfig=`(cd $i; pwd)` break fi done @@ -5803,49 +5021,49 @@ $as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory conta fi - if test x"${ac_cv_c_tkimgconfig}" = x ; then - tkimg_BIN_DIR="# no tkimg configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkimg configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tkimg configuration definitions" >&2;} + if test x"${ac_cv_c_tclcheckdnsconfig}" = x ; then + tclcheckdns_BIN_DIR="# no tclcheckdns configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclcheckdns configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tclcheckdns configuration definitions" >&2;} exit 0 else - no_tkimg= - tkimg_BIN_DIR=${ac_cv_c_tkimgconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkimg_BIN_DIR/tkimgConfig.sh" >&5 -$as_echo "found $tkimg_BIN_DIR/tkimgConfig.sh" >&6; } + no_tclcheckdns= + tclcheckdns_BIN_DIR=${ac_cv_c_tclcheckdnsconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclcheckdns_BIN_DIR/tclcheckdnsConfig.sh" >&5 +$as_echo "found $tclcheckdns_BIN_DIR/tclcheckdnsConfig.sh" >&6; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh" >&5 -$as_echo_n "checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" >&5 +$as_echo_n "checking for existence of ${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh... " >&6; } - if test -f "${tkimg_BIN_DIR}/tkimgConfig.sh" ; then + if test -f "${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tkimg_BIN_DIR}/tkimgConfig.sh" + . "${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 $as_echo "file not found" >&6; } fi # - # If the tkimg_BIN_DIR is the build directory (not the install directory), + # If the tclcheckdns_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 tkimg_LIB_SPEC will be set to the value - # of tkimg_BUILD_LIB_SPEC. An extension should make use of tkimg_LIB_SPEC - # instead of tkimg_BUILD_LIB_SPEC since it will work with both an + # For example, the variable tclcheckdns_LIB_SPEC will be set to the value + # of tclcheckdns_BUILD_LIB_SPEC. An extension should make use of tclcheckdns_LIB_SPEC + # instead of tclcheckdns_BUILD_LIB_SPEC since it will work with both an # installed and uninstalled version of Tcl. # - if test -f "${tkimg_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkimg" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimg" >&2;} - tkimg_LIB_SPEC=${tkimg_BUILD_LIB_SPEC} - tkimg_STUB_LIB_SPEC=${tkimg_BUILD_STUB_LIB_SPEC} - tkimg_STUB_LIB_PATH=${tkimg_BUILD_STUB_LIB_PATH} - tkimg_INCLUDE_SPEC=${tkimg_BUILD_INCLUDE_SPEC} - tkimg_LIBRARY_PATH=${tkimg_LIBRARY_PATH} + if test -f "${tclcheckdns_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclcheckdns" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclcheckdns" >&2;} + tclcheckdns_LIB_SPEC=${tclcheckdns_BUILD_LIB_SPEC} + tclcheckdns_STUB_LIB_SPEC=${tclcheckdns_BUILD_STUB_LIB_SPEC} + tclcheckdns_STUB_LIB_PATH=${tclcheckdns_BUILD_STUB_LIB_PATH} + tclcheckdns_INCLUDE_SPEC=${tclcheckdns_BUILD_INCLUDE_SPEC} + tclcheckdns_LIBRARY_PATH=${tclcheckdns_LIBRARY_PATH} fi @@ -5865,18 +5083,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimg" # 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${tkimg_STUB_LIB_SPEC}" = x; then : + if test "x${tclcheckdns_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKIMG_STUB library for LIBS" >&5 -$as_echo_n "checking For TKIMG_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLCHECKDNS_STUB library for LIBS" >&5 +$as_echo_n "checking For TCLCHECKDNS_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${TKIMG_STUB_LIB_SPEC}" != "x" ; then + if test "x${TCLCHECKDNS_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TKIMG_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TCLCHECKDNS_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5890,11 +5108,11 @@ $as_echo_n "checking For TKIMG_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&5 -$as_echo "using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLCHECKDNS_STUB_LIB_PATH ${TCLCHECKDNS_STUB_LIB_PATH}" >&5 +$as_echo "using TCLCHECKDNS_STUB_LIB_PATH ${TCLCHECKDNS_STUB_LIB_PATH}" >&6; } else - vars="${TKIMG_STUB_LIB_SPEC}" + vars="${TCLCHECKDNS_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5908,8 +5126,8 @@ $as_echo "using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_SPEC ${TKIMG_STUB_LIB_SPEC}" >&5 -$as_echo "using TKIMG_STUB_LIB_SPEC ${TKIMG_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLCHECKDNS_STUB_LIB_SPEC ${TCLCHECKDNS_STUB_LIB_SPEC}" >&5 +$as_echo "using TCLCHECKDNS_STUB_LIB_SPEC ${TCLCHECKDNS_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5918,16 +5136,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tkimg_STUB library for LIBS" >&5 -$as_echo_n "checking For tkimg_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tclcheckdns_STUB library for LIBS" >&5 +$as_echo_n "checking For tclcheckdns_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${tkimg_STUB_LIB_SPEC}" != "x" ; then + if test "x${tclcheckdns_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tkimg_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tclcheckdns_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5941,11 +5159,11 @@ $as_echo_n "checking For tkimg_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&5 -$as_echo "using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclcheckdns_STUB_LIB_PATH ${tclcheckdns_STUB_LIB_PATH}" >&5 +$as_echo "using tclcheckdns_STUB_LIB_PATH ${tclcheckdns_STUB_LIB_PATH}" >&6; } else - vars="${tkimg_STUB_LIB_SPEC}" + vars="${tclcheckdns_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5959,8 +5177,536 @@ $as_echo "using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_SPEC ${tkimg_STUB_LIB_SPEC}" >&5 -$as_echo "using tkimg_STUB_LIB_SPEC ${tkimg_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclcheckdns_STUB_LIB_SPEC ${tclcheckdns_STUB_LIB_SPEC}" >&5 +$as_echo "using tclcheckdns_STUB_LIB_SPEC ${tclcheckdns_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 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 + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + 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 + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + 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 + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + 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 + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + 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 tclsignal configuration + # First, look for one uninstalled. + # the alternative search directory is invoked by --with-tclsignal + # + + if test x"${no_tclsignal}" = x ; then + # we reset no_tclsignal in case something fails here + no_tclsignal=true + +# Check whether --with-tclsignal was given. +if test "${with_tclsignal+set}" = set; then : + withval=$with_tclsignal; with_tclsignalconfig=${withval} +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsignal configuration" >&5 +$as_echo_n "checking for tclsignal configuration... " >&6; } + if ${ac_cv_c_tclsignalconfig+:} false; then : + $as_echo_n "(cached) " >&6 +else + + + # First check to see if --with-tclsignal was specified. + if test x"${with_tclsignalconfig}" != x ; then + case ${with_tclsignalconfig} in + */tclsignalConfig.sh ) + if test -f ${with_tclsignalconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclsignal argument should refer to directory containing tclsignalConfig.sh, not to tclsignalConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tclsignal argument should refer to directory containing tclsignalConfig.sh, not to tclsignalConfig.sh itself" >&2;} + with_tclsignalconfig=`echo ${with_tclsignalconfig} | sed 's!/tclsignalConfig\.sh$!!'` + fi;; + esac + if test -f "${with_tclsignalconfig}/tclsignalConfig.sh" ; then + ac_cv_c_tclsignalconfig=`(cd ${with_tclsignalconfig}; pwd)` + else + as_fn_error $? "${with_tclsignalconfig} directory doesn't contain tclsignalConfig.sh" "$LINENO" 5 + fi + fi + + # then check for a private tclsignal installation + if test x"${ac_cv_c_tclsignalconfig}" = x ; then + for i in \ + ../tclsignal \ + `ls -dr ../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tclsignal*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tclsignal*[0-9].[0-9]* 2>/dev/null` \ + ../../tclsignal \ + `ls -dr ../../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tclsignal*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tclsignal*[0-9].[0-9]* 2>/dev/null` \ + ../../../tclsignal \ + `ls -dr ../../../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tclsignal*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tclsignal*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tclsignal \ + `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9]* 2>/dev/null` \ + ; do + if test -f "$i/tclsignalConfig.sh" ; then + ac_cv_c_tclsignalconfig=`(cd $i; pwd)` + break + fi + if test -f "$i/unix/tclsignalConfig.sh" ; then + ac_cv_c_tclsignalconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + + # check in a few common install locations + if test x"${ac_cv_c_tclsignalconfig}" = 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/tclsignalConfig.sh" ; then + ac_cv_c_tclsignalconfig=`(cd $i; pwd)` + break + fi + done + fi + +fi + + + if test x"${ac_cv_c_tclsignalconfig}" = x ; then + tclsignal_BIN_DIR="# no tclsignal configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclsignal configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tclsignal configuration definitions" >&2;} + exit 0 + else + no_tclsignal= + tclsignal_BIN_DIR=${ac_cv_c_tclsignalconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclsignal_BIN_DIR/tclsignalConfig.sh" >&5 +$as_echo "found $tclsignal_BIN_DIR/tclsignalConfig.sh" >&6; } + fi + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclsignal_BIN_DIR}/tclsignalConfig.sh" >&5 +$as_echo_n "checking for existence of ${tclsignal_BIN_DIR}/tclsignalConfig.sh... " >&6; } + + if test -f "${tclsignal_BIN_DIR}/tclsignalConfig.sh" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } + . "${tclsignal_BIN_DIR}/tclsignalConfig.sh" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 +$as_echo "file not found" >&6; } + fi + + # + # If the tclsignal_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 tclsignal_LIB_SPEC will be set to the value + # of tclsignal_BUILD_LIB_SPEC. An extension should make use of tclsignal_LIB_SPEC + # instead of tclsignal_BUILD_LIB_SPEC since it will work with both an + # installed and uninstalled version of Tcl. + # + + if test -f "${tclsignal_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclsignal" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclsignal" >&2;} + tclsignal_LIB_SPEC=${tclsignal_BUILD_LIB_SPEC} + tclsignal_STUB_LIB_SPEC=${tclsignal_BUILD_STUB_LIB_SPEC} + tclsignal_STUB_LIB_PATH=${tclsignal_BUILD_STUB_LIB_PATH} + tclsignal_INCLUDE_SPEC=${tclsignal_BUILD_INCLUDE_SPEC} + tclsignal_LIBRARY_PATH=${tclsignal_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${tclsignal_STUB_LIB_SPEC}" = x; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLSIGNAL_STUB library for LIBS" >&5 +$as_echo_n "checking For TCLSIGNAL_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${TCLSIGNAL_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${TCLSIGNAL_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLSIGNAL_STUB_LIB_PATH ${TCLSIGNAL_STUB_LIB_PATH}" >&5 +$as_echo "using TCLSIGNAL_STUB_LIB_PATH ${TCLSIGNAL_STUB_LIB_PATH}" >&6; } + else + + vars="${TCLSIGNAL_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLSIGNAL_STUB_LIB_SPEC ${TCLSIGNAL_STUB_LIB_SPEC}" >&5 +$as_echo "using TCLSIGNAL_STUB_LIB_SPEC ${TCLSIGNAL_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 tclsignal_STUB library for LIBS" >&5 +$as_echo_n "checking For tclsignal_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${tclsignal_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${tclsignal_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclsignal_STUB_LIB_PATH ${tclsignal_STUB_LIB_PATH}" >&5 +$as_echo "using tclsignal_STUB_LIB_PATH ${tclsignal_STUB_LIB_PATH}" >&6; } + else + + vars="${tclsignal_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclsignal_STUB_LIB_SPEC ${tclsignal_STUB_LIB_SPEC}" >&5 +$as_echo "using tclsignal_STUB_LIB_SPEC ${tclsignal_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -6502,6 +6248,270 @@ fi # + # Ok, lets find the tkimg configuration + # First, look for one uninstalled. + # the alternative search directory is invoked by --with-tkimg + # + + if test x"${no_tkimg}" = x ; then + # we reset no_tkimg in case something fails here + no_tkimg=true + +# Check whether --with-tkimg was given. +if test "${with_tkimg+set}" = set; then : + withval=$with_tkimg; with_tkimgconfig=${withval} +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkimg configuration" >&5 +$as_echo_n "checking for tkimg configuration... " >&6; } + if ${ac_cv_c_tkimgconfig+:} false; then : + $as_echo_n "(cached) " >&6 +else + + + # First check to see if --with-tkimg was specified. + if test x"${with_tkimgconfig}" != x ; then + case ${with_tkimgconfig} in + */tkimgConfig.sh ) + if test -f ${with_tkimgconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&2;} + with_tkimgconfig=`echo ${with_tkimgconfig} | sed 's!/tkimgConfig\.sh$!!'` + fi;; + esac + if test -f "${with_tkimgconfig}/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd ${with_tkimgconfig}; pwd)` + else + as_fn_error $? "${with_tkimgconfig} directory doesn't contain tkimgConfig.sh" "$LINENO" 5 + fi + fi + + # then check for a private tkimg installation + if test x"${ac_cv_c_tkimgconfig}" = x ; then + for i in \ + ../tkimg \ + `ls -dr ../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ../../tkimg \ + `ls -dr ../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ../../../tkimg \ + `ls -dr ../../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tkimg \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ; do + if test -f "$i/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd $i; pwd)` + break + fi + if test -f "$i/unix/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + + # check in a few common install locations + if test x"${ac_cv_c_tkimgconfig}" = 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/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd $i; pwd)` + break + fi + done + fi + +fi + + + if test x"${ac_cv_c_tkimgconfig}" = x ; then + tkimg_BIN_DIR="# no tkimg configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkimg configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tkimg configuration definitions" >&2;} + exit 0 + else + no_tkimg= + tkimg_BIN_DIR=${ac_cv_c_tkimgconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkimg_BIN_DIR/tkimgConfig.sh" >&5 +$as_echo "found $tkimg_BIN_DIR/tkimgConfig.sh" >&6; } + fi + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh" >&5 +$as_echo_n "checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh... " >&6; } + + if test -f "${tkimg_BIN_DIR}/tkimgConfig.sh" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } + . "${tkimg_BIN_DIR}/tkimgConfig.sh" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 +$as_echo "file not found" >&6; } + fi + + # + # If the tkimg_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 tkimg_LIB_SPEC will be set to the value + # of tkimg_BUILD_LIB_SPEC. An extension should make use of tkimg_LIB_SPEC + # instead of tkimg_BUILD_LIB_SPEC since it will work with both an + # installed and uninstalled version of Tcl. + # + + if test -f "${tkimg_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkimg" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimg" >&2;} + tkimg_LIB_SPEC=${tkimg_BUILD_LIB_SPEC} + tkimg_STUB_LIB_SPEC=${tkimg_BUILD_STUB_LIB_SPEC} + tkimg_STUB_LIB_PATH=${tkimg_BUILD_STUB_LIB_PATH} + tkimg_INCLUDE_SPEC=${tkimg_BUILD_INCLUDE_SPEC} + tkimg_LIBRARY_PATH=${tkimg_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${tkimg_STUB_LIB_SPEC}" = x; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKIMG_STUB library for LIBS" >&5 +$as_echo_n "checking For TKIMG_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${TKIMG_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${TKIMG_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&5 +$as_echo "using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&6; } + else + + vars="${TKIMG_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_SPEC ${TKIMG_STUB_LIB_SPEC}" >&5 +$as_echo "using TKIMG_STUB_LIB_SPEC ${TKIMG_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 tkimg_STUB library for LIBS" >&5 +$as_echo_n "checking For tkimg_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${tkimg_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${tkimg_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&5 +$as_echo "using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&6; } + else + + vars="${tkimg_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_SPEC ${tkimg_STUB_LIB_SPEC}" >&5 +$as_echo "using tkimg_STUB_LIB_SPEC ${tkimg_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 @@ -7292,6 +7302,270 @@ fi fi + + # + # Ok, lets find the tktable configuration + # First, look for one uninstalled. + # the alternative search directory is invoked by --with-tktable + # + + if test x"${no_tktable}" = x ; then + # we reset no_tktable in case something fails here + no_tktable=true + +# Check whether --with-tktable was given. +if test "${with_tktable+set}" = set; then : + withval=$with_tktable; with_tktableconfig=${withval} +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tktable configuration" >&5 +$as_echo_n "checking for tktable configuration... " >&6; } + if ${ac_cv_c_tktableconfig+:} false; then : + $as_echo_n "(cached) " >&6 +else + + + # First check to see if --with-tktable was specified. + if test x"${with_tktableconfig}" != x ; then + case ${with_tktableconfig} in + */tktableConfig.sh ) + if test -f ${with_tktableconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tktable argument should refer to directory containing tktableConfig.sh, not to tktableConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tktable argument should refer to directory containing tktableConfig.sh, not to tktableConfig.sh itself" >&2;} + with_tktableconfig=`echo ${with_tktableconfig} | sed 's!/tktableConfig\.sh$!!'` + fi;; + esac + if test -f "${with_tktableconfig}/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd ${with_tktableconfig}; pwd)` + else + as_fn_error $? "${with_tktableconfig} directory doesn't contain tktableConfig.sh" "$LINENO" 5 + fi + fi + + # then check for a private tktable installation + if test x"${ac_cv_c_tktableconfig}" = x ; then + for i in \ + ../tktable \ + `ls -dr ../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tktable*[0-9].[0-9]* 2>/dev/null` \ + ../../tktable \ + `ls -dr ../../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tktable*[0-9].[0-9]* 2>/dev/null` \ + ../../../tktable \ + `ls -dr ../../../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tktable*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tktable \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9]* 2>/dev/null` \ + ; do + if test -f "$i/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd $i; pwd)` + break + fi + if test -f "$i/unix/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + + # check in a few common install locations + if test x"${ac_cv_c_tktableconfig}" = 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/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd $i; pwd)` + break + fi + done + fi + +fi + + + if test x"${ac_cv_c_tktableconfig}" = x ; then + tktable_BIN_DIR="# no tktable configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tktable configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tktable configuration definitions" >&2;} + exit 0 + else + no_tktable= + tktable_BIN_DIR=${ac_cv_c_tktableconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tktable_BIN_DIR/tktableConfig.sh" >&5 +$as_echo "found $tktable_BIN_DIR/tktableConfig.sh" >&6; } + fi + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tktable_BIN_DIR}/tktableConfig.sh" >&5 +$as_echo_n "checking for existence of ${tktable_BIN_DIR}/tktableConfig.sh... " >&6; } + + if test -f "${tktable_BIN_DIR}/tktableConfig.sh" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } + . "${tktable_BIN_DIR}/tktableConfig.sh" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 +$as_echo "file not found" >&6; } + fi + + # + # If the tktable_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 tktable_LIB_SPEC will be set to the value + # of tktable_BUILD_LIB_SPEC. An extension should make use of tktable_LIB_SPEC + # instead of tktable_BUILD_LIB_SPEC since it will work with both an + # installed and uninstalled version of Tcl. + # + + if test -f "${tktable_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tktable" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tktable" >&2;} + tktable_LIB_SPEC=${tktable_BUILD_LIB_SPEC} + tktable_STUB_LIB_SPEC=${tktable_BUILD_STUB_LIB_SPEC} + tktable_STUB_LIB_PATH=${tktable_BUILD_STUB_LIB_PATH} + tktable_INCLUDE_SPEC=${tktable_BUILD_INCLUDE_SPEC} + tktable_LIBRARY_PATH=${tktable_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${tktable_STUB_LIB_SPEC}" = x; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKTABLE_STUB library for LIBS" >&5 +$as_echo_n "checking For TKTABLE_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${TKTABLE_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${TKTABLE_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKTABLE_STUB_LIB_PATH ${TKTABLE_STUB_LIB_PATH}" >&5 +$as_echo "using TKTABLE_STUB_LIB_PATH ${TKTABLE_STUB_LIB_PATH}" >&6; } + else + + vars="${TKTABLE_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKTABLE_STUB_LIB_SPEC ${TKTABLE_STUB_LIB_SPEC}" >&5 +$as_echo "using TKTABLE_STUB_LIB_SPEC ${TKTABLE_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 tktable_STUB library for LIBS" >&5 +$as_echo_n "checking For tktable_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${tktable_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${tktable_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tktable_STUB_LIB_PATH ${tktable_STUB_LIB_PATH}" >&5 +$as_echo "using tktable_STUB_LIB_PATH ${tktable_STUB_LIB_PATH}" >&6; } + else + + vars="${tktable_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tktable_STUB_LIB_SPEC ${tktable_STUB_LIB_SPEC}" >&5 +$as_echo "using tktable_STUB_LIB_SPEC ${tktable_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 + + #----------------------------------------------------------------------- # Handle the --prefix=... option by defaulting to what Tcl gave. # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER. diff --git a/ds9/macosx/configure.ac b/ds9/macosx/configure.ac index 98bb72a..9a4939e 100644 --- a/ds9/macosx/configure.ac +++ b/ds9/macosx/configure.ac @@ -49,15 +49,6 @@ TEA_LOAD_TKCONFIG # Load the *.sh file if necessary #-------------------------------------------------------------------- -TEA_PATH_CONFIG(tclcheckdns) -TEA_LOAD_CONFIG(tclcheckdns) - -TEA_PATH_CONFIG(tcliis) -TEA_LOAD_CONFIG(tcliis) - -TEA_PATH_CONFIG(tclsignal) -TEA_LOAD_CONFIG(tclsignal) - TEA_PATH_CONFIG(tifftcl) TEA_LOAD_CONFIG(tifftcl) @@ -70,8 +61,14 @@ TEA_LOAD_CONFIG(jpegtcl) TEA_PATH_CONFIG(zlibtcl) TEA_LOAD_CONFIG(zlibtcl) -TEA_PATH_CONFIG(tkimg) -TEA_LOAD_CONFIG(tkimg) +TEA_PATH_CONFIG(tclcheckdns) +TEA_LOAD_CONFIG(tclcheckdns) + +TEA_PATH_CONFIG(tcliis) +TEA_LOAD_CONFIG(tcliis) + +TEA_PATH_CONFIG(tclsignal) +TEA_LOAD_CONFIG(tclsignal) TEA_PATH_CONFIG(tkblt) TEA_LOAD_CONFIG(tkblt) @@ -79,6 +76,9 @@ TEA_LOAD_CONFIG(tkblt) TEA_PATH_CONFIG(tkhtml1) TEA_LOAD_CONFIG(tkhtml1) +TEA_PATH_CONFIG(tkimg) +TEA_LOAD_CONFIG(tkimg) + TEA_PATH_CONFIG(tkmacosx) TEA_LOAD_CONFIG(tkmacosx) @@ -88,6 +88,9 @@ TEA_LOAD_CONFIG(tkmpeg) TEA_PATH_CONFIG(tksao) TEA_LOAD_CONFIG(tksao) +TEA_PATH_CONFIG(tktable) +TEA_LOAD_CONFIG(tktable) + #----------------------------------------------------------------------- # Handle the --prefix=... option by defaulting to what Tcl gave. # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER. diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index cb1dcca..6723311 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -33,6 +33,7 @@ tkblt_LIB_SPEC = @tkblt_LIB_SPEC@ tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@ tkmpeg_LIB_SPEC = @tkmpeg_LIB_SPEC@ tksao_LIB_SPEC = @tksao_LIB_SPEC@ +tktable_LIB_SPEC= @tktable_LIB_SPEC@ CC = @CC@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ @@ -86,7 +87,6 @@ LLIBS = \ $(libdir)/libast_err.a \ $(libdir)/libast_pal.a \ $(libdir)/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \ - $(libdir)/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \ $(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff$(TKIMGVER).a \ $(libdir)/tkimgpng$(TKIMGVER)/libtkimgpng$(TKIMGVER).a \ $(libdir)/tkimgjpeg$(TKIMGVER)/libtkimgjpeg$(TKIMGVER).a \ @@ -141,19 +141,20 @@ ds9base : $(OBJS) $(LLIBS) $(OBJS) \ $(LLIBS) \ $(LIBS) \ - $(tclcheckdns_LIB_SPEC) \ - $(tcliis_LIB_SPEC) \ - $(tclsignal_LIB_SPEC) \ - $(tclzvfs_LIB_SPEC) \ $(tifftcl_LIB_SPEC) \ $(pngtcl_LIB_SPEC) \ $(jpegtcl_LIB_SPEC) \ $(zlibtcl_LIB_SPEC) \ - $(tkimg_LIB_SPEC) \ + $(tclcheckdns_LIB_SPEC) \ + $(tcliis_LIB_SPEC) \ + $(tclsignal_LIB_SPEC) \ + $(tclzvfs_LIB_SPEC) \ $(tkblt_LIB_SPEC) \ $(tkhtml1_LIB_SPEC) \ + $(tkimg_LIB_SPEC) \ $(tkmpeg_LIB_SPEC) \ $(tksao_LIB_SPEC) \ + $(tktable_LIB_SPEC) \ $(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \ $(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \ $(TK_LIBS) diff --git a/ds9/unix/configure b/ds9/unix/configure index ebdbbdc..cef5944 100755 --- a/ds9/unix/configure +++ b/ds9/unix/configure @@ -667,6 +667,14 @@ INSTALL_DATA INSTALL_DATA_DIR INSTALL CPP +tktable_STUB_LIB_PATH +tktable_STUB_LIB_SPEC +tktable_STUB_LIB_FILE +tktable_LIB_SPEC +tktable_LIB_FILE +tktable_SRC_DIR +tktable_BIN_DIR +tktable_VERSION tksao_STUB_LIB_PATH tksao_STUB_LIB_SPEC tksao_STUB_LIB_FILE @@ -683,6 +691,14 @@ tkmpeg_LIB_FILE tkmpeg_SRC_DIR tkmpeg_BIN_DIR tkmpeg_VERSION +tkimg_STUB_LIB_PATH +tkimg_STUB_LIB_SPEC +tkimg_STUB_LIB_FILE +tkimg_LIB_SPEC +tkimg_LIB_FILE +tkimg_SRC_DIR +tkimg_BIN_DIR +tkimg_VERSION tkhtml1_STUB_LIB_PATH tkhtml1_STUB_LIB_SPEC tkhtml1_STUB_LIB_FILE @@ -699,46 +715,6 @@ tkblt_LIB_FILE tkblt_SRC_DIR tkblt_BIN_DIR tkblt_VERSION -tkimg_STUB_LIB_PATH -tkimg_STUB_LIB_SPEC -tkimg_STUB_LIB_FILE -tkimg_LIB_SPEC -tkimg_LIB_FILE -tkimg_SRC_DIR -tkimg_BIN_DIR -tkimg_VERSION -zlibtcl_STUB_LIB_PATH -zlibtcl_STUB_LIB_SPEC -zlibtcl_STUB_LIB_FILE -zlibtcl_LIB_SPEC -zlibtcl_LIB_FILE -zlibtcl_SRC_DIR -zlibtcl_BIN_DIR -zlibtcl_VERSION -jpegtcl_STUB_LIB_PATH -jpegtcl_STUB_LIB_SPEC -jpegtcl_STUB_LIB_FILE -jpegtcl_LIB_SPEC -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 -tifftcl_LIB_SPEC -tifftcl_LIB_FILE -tifftcl_SRC_DIR -tifftcl_BIN_DIR -tifftcl_VERSION tclzvfs_STUB_LIB_PATH tclzvfs_STUB_LIB_SPEC tclzvfs_STUB_LIB_FILE @@ -771,6 +747,38 @@ tclcheckdns_LIB_FILE tclcheckdns_SRC_DIR tclcheckdns_BIN_DIR tclcheckdns_VERSION +zlibtcl_STUB_LIB_PATH +zlibtcl_STUB_LIB_SPEC +zlibtcl_STUB_LIB_FILE +zlibtcl_LIB_SPEC +zlibtcl_LIB_FILE +zlibtcl_SRC_DIR +zlibtcl_BIN_DIR +zlibtcl_VERSION +jpegtcl_STUB_LIB_PATH +jpegtcl_STUB_LIB_SPEC +jpegtcl_STUB_LIB_FILE +jpegtcl_LIB_SPEC +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 +tifftcl_LIB_SPEC +tifftcl_LIB_FILE +tifftcl_SRC_DIR +tifftcl_BIN_DIR +tifftcl_VERSION PRACTCL_WINDOWINGSYSTEM TK_XINCLUDES TK_LIBS @@ -860,19 +868,20 @@ ac_user_opts=' enable_option_checking with_tcl with_tk -with_tclcheckdns -with_tcliis -with_tclsignal -with_tclzvfs with_tifftcl with_pngtcl with_jpegtcl with_zlibtcl -with_tkimg +with_tclcheckdns +with_tcliis +with_tclsignal +with_tclzvfs with_tkblt with_tkhtml1 +with_tkimg with_tkmpeg with_tksao +with_tktable with_tclinclude with_tkinclude with_x @@ -1520,19 +1529,20 @@ Optional Packages: --with-tcl directory containing tcl configuration (tclConfig.sh) --with-tk directory containing tk configuration (tkConfig.sh) - --with-tclcheckdns directory containing tclcheckdns configuration (tclcheckdnsConfig.sh) - --with-tcliis directory containing tcliis configuration (tcliisConfig.sh) - --with-tclsignal directory containing tclsignal configuration (tclsignalConfig.sh) - --with-tclzvfs directory containing tclzvfs configuration (tclzvfsConfig.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-tkimg directory containing tkimg configuration (tkimgConfig.sh) + --with-tclcheckdns directory containing tclcheckdns configuration (tclcheckdnsConfig.sh) + --with-tcliis directory containing tcliis configuration (tcliisConfig.sh) + --with-tclsignal directory containing tclsignal configuration (tclsignalConfig.sh) + --with-tclzvfs directory containing tclzvfs configuration (tclzvfsConfig.sh) --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-tkmpeg directory containing tkmpeg configuration (tkmpegConfig.sh) --with-tksao directory containing tksao configuration (tksaoConfig.sh) + --with-tktable directory containing tktable configuration (tktableConfig.sh) --with-tclinclude directory containing the public Tcl header files --with-tkinclude directory containing the public Tk header files --with-x use the X Window System @@ -3863,345 +3873,81 @@ $as_echo "#define MAC_OSX_TK 1" >>confdefs.h # - # Ok, lets find the tclcheckdns configuration - # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tclcheckdns - # - - if test x"${no_tclcheckdns}" = x ; then - # we reset no_tclcheckdns in case something fails here - no_tclcheckdns=true - -# Check whether --with-tclcheckdns was given. -if test "${with_tclcheckdns+set}" = set; then : - withval=$with_tclcheckdns; with_tclcheckdnsconfig=${withval} -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclcheckdns configuration" >&5 -$as_echo_n "checking for tclcheckdns configuration... " >&6; } - if ${ac_cv_c_tclcheckdnsconfig+:} false; then : - $as_echo_n "(cached) " >&6 -else - - - # First check to see if --with-tclcheckdns was specified. - if test x"${with_tclcheckdnsconfig}" != x ; then - case ${with_tclcheckdnsconfig} in - */tclcheckdnsConfig.sh ) - if test -f ${with_tclcheckdnsconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclcheckdns argument should refer to directory containing tclcheckdnsConfig.sh, not to tclcheckdnsConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tclcheckdns argument should refer to directory containing tclcheckdnsConfig.sh, not to tclcheckdnsConfig.sh itself" >&2;} - with_tclcheckdnsconfig=`echo ${with_tclcheckdnsconfig} | sed 's!/tclcheckdnsConfig\.sh$!!'` - fi;; - esac - if test -f "${with_tclcheckdnsconfig}/tclcheckdnsConfig.sh" ; then - ac_cv_c_tclcheckdnsconfig=`(cd ${with_tclcheckdnsconfig}; pwd)` - else - as_fn_error $? "${with_tclcheckdnsconfig} directory doesn't contain tclcheckdnsConfig.sh" "$LINENO" 5 - fi - fi - - # then check for a private tclcheckdns installation - if test x"${ac_cv_c_tclcheckdnsconfig}" = x ; then - for i in \ - ../tclcheckdns \ - `ls -dr ../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ - ../../tclcheckdns \ - `ls -dr ../../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ - ../../../tclcheckdns \ - `ls -dr ../../../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tclcheckdns \ - `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ - ; do - if test -f "$i/tclcheckdnsConfig.sh" ; then - ac_cv_c_tclcheckdnsconfig=`(cd $i; pwd)` - break - fi - if test -f "$i/unix/tclcheckdnsConfig.sh" ; then - ac_cv_c_tclcheckdnsconfig=`(cd $i/unix; pwd)` - break - fi - done - fi - - # check in a few common install locations - if test x"${ac_cv_c_tclcheckdnsconfig}" = 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/tclcheckdnsConfig.sh" ; then - ac_cv_c_tclcheckdnsconfig=`(cd $i; pwd)` - break - fi - done - fi - -fi - - - if test x"${ac_cv_c_tclcheckdnsconfig}" = x ; then - tclcheckdns_BIN_DIR="# no tclcheckdns configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclcheckdns configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tclcheckdns configuration definitions" >&2;} - exit 0 - else - no_tclcheckdns= - tclcheckdns_BIN_DIR=${ac_cv_c_tclcheckdnsconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclcheckdns_BIN_DIR/tclcheckdnsConfig.sh" >&5 -$as_echo "found $tclcheckdns_BIN_DIR/tclcheckdnsConfig.sh" >&6; } - fi - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" >&5 -$as_echo_n "checking for existence of ${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh... " >&6; } - - if test -f "${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 -$as_echo "loading" >&6; } - . "${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 -$as_echo "file not found" >&6; } - fi - - # - # If the tclcheckdns_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 tclcheckdns_LIB_SPEC will be set to the value - # of tclcheckdns_BUILD_LIB_SPEC. An extension should make use of tclcheckdns_LIB_SPEC - # instead of tclcheckdns_BUILD_LIB_SPEC since it will work with both an - # installed and uninstalled version of Tcl. - # - - if test -f "${tclcheckdns_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclcheckdns" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclcheckdns" >&2;} - tclcheckdns_LIB_SPEC=${tclcheckdns_BUILD_LIB_SPEC} - tclcheckdns_STUB_LIB_SPEC=${tclcheckdns_BUILD_STUB_LIB_SPEC} - tclcheckdns_STUB_LIB_PATH=${tclcheckdns_BUILD_STUB_LIB_PATH} - tclcheckdns_INCLUDE_SPEC=${tclcheckdns_BUILD_INCLUDE_SPEC} - tclcheckdns_LIBRARY_PATH=${tclcheckdns_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${tclcheckdns_STUB_LIB_SPEC}" = x; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLCHECKDNS_STUB library for LIBS" >&5 -$as_echo_n "checking For TCLCHECKDNS_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${TCLCHECKDNS_STUB_LIB_SPEC}" != "x" ; then - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - - vars="\"`${CYGPATH} ${TCLCHECKDNS_STUB_LIB_PATH}`\"" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLCHECKDNS_STUB_LIB_PATH ${TCLCHECKDNS_STUB_LIB_PATH}" >&5 -$as_echo "using TCLCHECKDNS_STUB_LIB_PATH ${TCLCHECKDNS_STUB_LIB_PATH}" >&6; } - else - - vars="${TCLCHECKDNS_STUB_LIB_SPEC}" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLCHECKDNS_STUB_LIB_SPEC ${TCLCHECKDNS_STUB_LIB_SPEC}" >&5 -$as_echo "using TCLCHECKDNS_STUB_LIB_SPEC ${TCLCHECKDNS_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 tclcheckdns_STUB library for LIBS" >&5 -$as_echo_n "checking For tclcheckdns_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${tclcheckdns_STUB_LIB_SPEC}" != "x" ; then - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - - vars="\"`${CYGPATH} ${tclcheckdns_STUB_LIB_PATH}`\"" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclcheckdns_STUB_LIB_PATH ${tclcheckdns_STUB_LIB_PATH}" >&5 -$as_echo "using tclcheckdns_STUB_LIB_PATH ${tclcheckdns_STUB_LIB_PATH}" >&6; } - else - - vars="${tclcheckdns_STUB_LIB_SPEC}" - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - case $i in - *.lib) - # Convert foo.lib to -lfoo for GCC - i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` - ;; - esac - fi - PKG_LIBS="$PKG_LIBS $i" - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclcheckdns_STUB_LIB_SPEC ${tclcheckdns_STUB_LIB_SPEC}" >&5 -$as_echo "using tclcheckdns_STUB_LIB_SPEC ${tclcheckdns_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 tcliis configuration + # Ok, lets find the tifftcl configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tcliis + # the alternative search directory is invoked by --with-tifftcl # - if test x"${no_tcliis}" = x ; then - # we reset no_tcliis in case something fails here - no_tcliis=true + if test x"${no_tifftcl}" = x ; then + # we reset no_tifftcl in case something fails here + no_tifftcl=true -# Check whether --with-tcliis was given. -if test "${with_tcliis+set}" = set; then : - withval=$with_tcliis; with_tcliisconfig=${withval} +# Check whether --with-tifftcl was given. +if test "${with_tifftcl+set}" = set; then : + withval=$with_tifftcl; with_tifftclconfig=${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 "$as_me:${as_lineno-$LINENO}: checking for tifftcl configuration" >&5 +$as_echo_n "checking for tifftcl configuration... " >&6; } + if ${ac_cv_c_tifftclconfig+:} 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$!!'` + # First check to see if --with-tifftcl was specified. + if test x"${with_tifftclconfig}" != x ; then + case ${with_tifftclconfig} in + */tifftclConfig.sh ) + if test -f ${with_tifftclconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tifftcl argument should refer to directory containing tifftclConfig.sh, not to tifftclConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tifftcl argument should refer to directory containing tifftclConfig.sh, not to tifftclConfig.sh itself" >&2;} + with_tifftclconfig=`echo ${with_tifftclconfig} | sed 's!/tifftclConfig\.sh$!!'` fi;; esac - if test -f "${with_tcliisconfig}/tcliisConfig.sh" ; then - ac_cv_c_tcliisconfig=`(cd ${with_tcliisconfig}; pwd)` + if test -f "${with_tifftclconfig}/tifftclConfig.sh" ; then + ac_cv_c_tifftclconfig=`(cd ${with_tifftclconfig}; pwd)` else - as_fn_error $? "${with_tcliisconfig} directory doesn't contain tcliisConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_tifftclconfig} directory doesn't contain tifftclConfig.sh" "$LINENO" 5 fi fi - # then check for a private tcliis installation - if test x"${ac_cv_c_tcliisconfig}" = x ; then + # then check for a private tifftcl installation + if test x"${ac_cv_c_tifftclconfig}" = 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` \ + ../tifftcl \ + `ls -dr ../tifftcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tifftcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tifftcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tifftcl*[0-9].[0-9]* 2>/dev/null` \ + ../../tifftcl \ + `ls -dr ../../tifftcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tifftcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tifftcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tifftcl*[0-9].[0-9]* 2>/dev/null` \ + ../../../tifftcl \ + `ls -dr ../../../tifftcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tifftcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tifftcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tifftcl*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tifftcl \ + `ls -dr ${srcdir}/../tifftcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tifftcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tifftcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tifftcl*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/tcliisConfig.sh" ; then - ac_cv_c_tcliisconfig=`(cd $i; pwd)` + if test -f "$i/tifftclConfig.sh" ; then + ac_cv_c_tifftclconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/tcliisConfig.sh" ; then - ac_cv_c_tcliisconfig=`(cd $i/unix; pwd)` + if test -f "$i/unix/tifftclConfig.sh" ; then + ac_cv_c_tifftclconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_tcliisconfig}" = x ; then + if test x"${ac_cv_c_tifftclconfig}" = 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` \ @@ -4210,8 +3956,8 @@ $as_echo "$as_me: WARNING: --with-tcliis argument should refer to directory cont `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)` + if test -f "$i/tifftclConfig.sh" ; then + ac_cv_c_tifftclconfig=`(cd $i; pwd)` break fi done @@ -4220,49 +3966,49 @@ $as_echo "$as_me: WARNING: --with-tcliis argument should refer to directory cont 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;} + if test x"${ac_cv_c_tifftclconfig}" = x ; then + tifftcl_BIN_DIR="# no tifftcl configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tifftcl configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tifftcl 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; } + no_tifftcl= + tifftcl_BIN_DIR=${ac_cv_c_tifftclconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tifftcl_BIN_DIR/tifftclConfig.sh" >&5 +$as_echo "found $tifftcl_BIN_DIR/tifftclConfig.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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tifftcl_BIN_DIR}/tifftclConfig.sh" >&5 +$as_echo_n "checking for existence of ${tifftcl_BIN_DIR}/tifftclConfig.sh... " >&6; } - if test -f "${tcliis_BIN_DIR}/tcliisConfig.sh" ; then + if test -f "${tifftcl_BIN_DIR}/tifftclConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tcliis_BIN_DIR}/tcliisConfig.sh" + . "${tifftcl_BIN_DIR}/tifftclConfig.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), + # If the tifftcl_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 + # For example, the variable tifftcl_LIB_SPEC will be set to the value + # of tifftcl_BUILD_LIB_SPEC. An extension should make use of tifftcl_LIB_SPEC + # instead of tifftcl_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} + if test -f "${tifftcl_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tifftcl" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tifftcl" >&2;} + tifftcl_LIB_SPEC=${tifftcl_BUILD_LIB_SPEC} + tifftcl_STUB_LIB_SPEC=${tifftcl_BUILD_STUB_LIB_SPEC} + tifftcl_STUB_LIB_PATH=${tifftcl_BUILD_STUB_LIB_PATH} + tifftcl_INCLUDE_SPEC=${tifftcl_BUILD_INCLUDE_SPEC} + tifftcl_LIBRARY_PATH=${tifftcl_LIBRARY_PATH} fi @@ -4282,18 +4028,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tcliis # 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 : + if test "x${tifftcl_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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TIFFTCL_STUB library for LIBS" >&5 +$as_echo_n "checking For TIFFTCL_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 "x${TIFFTCL_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TCLIIS_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TIFFTCL_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4307,11 +4053,11 @@ $as_echo_n "checking For TCLIIS_STUB library for LIBS... " >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TIFFTCL_STUB_LIB_PATH ${TIFFTCL_STUB_LIB_PATH}" >&5 +$as_echo "using TIFFTCL_STUB_LIB_PATH ${TIFFTCL_STUB_LIB_PATH}" >&6; } else - vars="${TCLIIS_STUB_LIB_SPEC}" + vars="${TIFFTCL_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4325,8 +4071,8 @@ $as_echo "using TCLIIS_STUB_LIB_PATH ${TCLIIS_STUB_LIB_PATH}" >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TIFFTCL_STUB_LIB_SPEC ${TIFFTCL_STUB_LIB_SPEC}" >&5 +$as_echo "using TIFFTCL_STUB_LIB_SPEC ${TIFFTCL_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -4335,16 +4081,16 @@ $as_echo "file not found" >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tifftcl_STUB library for LIBS" >&5 +$as_echo_n "checking For tifftcl_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 "x${tifftcl_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tcliis_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tifftcl_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4358,11 +4104,11 @@ $as_echo_n "checking For tcliis_STUB library for LIBS... " >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tifftcl_STUB_LIB_PATH ${tifftcl_STUB_LIB_PATH}" >&5 +$as_echo "using tifftcl_STUB_LIB_PATH ${tifftcl_STUB_LIB_PATH}" >&6; } else - vars="${tcliis_STUB_LIB_SPEC}" + vars="${tifftcl_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4376,8 +4122,8 @@ $as_echo "using tcliis_STUB_LIB_PATH ${tcliis_STUB_LIB_PATH}" >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tifftcl_STUB_LIB_SPEC ${tifftcl_STUB_LIB_SPEC}" >&5 +$as_echo "using tifftcl_STUB_LIB_SPEC ${tifftcl_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -4391,81 +4137,81 @@ fi # - # Ok, lets find the tclsignal configuration + # Ok, lets find the pngtcl configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tclsignal + # the alternative search directory is invoked by --with-pngtcl # - if test x"${no_tclsignal}" = x ; then - # we reset no_tclsignal in case something fails here - no_tclsignal=true + if test x"${no_pngtcl}" = x ; then + # we reset no_pngtcl in case something fails here + no_pngtcl=true -# Check whether --with-tclsignal was given. -if test "${with_tclsignal+set}" = set; then : - withval=$with_tclsignal; with_tclsignalconfig=${withval} +# 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 tclsignal configuration" >&5 -$as_echo_n "checking for tclsignal configuration... " >&6; } - if ${ac_cv_c_tclsignalconfig+:} false; then : + { $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-tclsignal was specified. - if test x"${with_tclsignalconfig}" != x ; then - case ${with_tclsignalconfig} in - */tclsignalConfig.sh ) - if test -f ${with_tclsignalconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclsignal argument should refer to directory containing tclsignalConfig.sh, not to tclsignalConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tclsignal argument should refer to directory containing tclsignalConfig.sh, not to tclsignalConfig.sh itself" >&2;} - with_tclsignalconfig=`echo ${with_tclsignalconfig} | sed 's!/tclsignalConfig\.sh$!!'` + # 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_tclsignalconfig}/tclsignalConfig.sh" ; then - ac_cv_c_tclsignalconfig=`(cd ${with_tclsignalconfig}; pwd)` + if test -f "${with_pngtclconfig}/pngtclConfig.sh" ; then + ac_cv_c_pngtclconfig=`(cd ${with_pngtclconfig}; pwd)` else - as_fn_error $? "${with_tclsignalconfig} directory doesn't contain tclsignalConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_pngtclconfig} directory doesn't contain pngtclConfig.sh" "$LINENO" 5 fi fi - # then check for a private tclsignal installation - if test x"${ac_cv_c_tclsignalconfig}" = x ; then + # then check for a private pngtcl installation + if test x"${ac_cv_c_pngtclconfig}" = x ; then for i in \ - ../tclsignal \ - `ls -dr ../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tclsignal*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tclsignal*[0-9].[0-9]* 2>/dev/null` \ - ../../tclsignal \ - `ls -dr ../../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tclsignal*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tclsignal*[0-9].[0-9]* 2>/dev/null` \ - ../../../tclsignal \ - `ls -dr ../../../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tclsignal*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tclsignal*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tclsignal \ - `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tclsignal*[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` \ + ../../../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/tclsignalConfig.sh" ; then - ac_cv_c_tclsignalconfig=`(cd $i; pwd)` + if test -f "$i/pngtclConfig.sh" ; then + ac_cv_c_pngtclconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/tclsignalConfig.sh" ; then - ac_cv_c_tclsignalconfig=`(cd $i/unix; pwd)` + 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_tclsignalconfig}" = x ; then + 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` \ @@ -4474,8 +4220,8 @@ $as_echo "$as_me: WARNING: --with-tclsignal argument should refer to directory c `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/tclsignalConfig.sh" ; then - ac_cv_c_tclsignalconfig=`(cd $i; pwd)` + if test -f "$i/pngtclConfig.sh" ; then + ac_cv_c_pngtclconfig=`(cd $i; pwd)` break fi done @@ -4484,49 +4230,49 @@ $as_echo "$as_me: WARNING: --with-tclsignal argument should refer to directory c fi - if test x"${ac_cv_c_tclsignalconfig}" = x ; then - tclsignal_BIN_DIR="# no tclsignal configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclsignal configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tclsignal configuration definitions" >&2;} + 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_tclsignal= - tclsignal_BIN_DIR=${ac_cv_c_tclsignalconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclsignal_BIN_DIR/tclsignalConfig.sh" >&5 -$as_echo "found $tclsignal_BIN_DIR/tclsignalConfig.sh" >&6; } + 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 ${tclsignal_BIN_DIR}/tclsignalConfig.sh" >&5 -$as_echo_n "checking for existence of ${tclsignal_BIN_DIR}/tclsignalConfig.sh... " >&6; } + { $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 "${tclsignal_BIN_DIR}/tclsignalConfig.sh" ; then + if test -f "${pngtcl_BIN_DIR}/pngtclConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tclsignal_BIN_DIR}/tclsignalConfig.sh" + . "${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 tclsignal_BIN_DIR is the build directory (not the install directory), + # 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 tclsignal_LIB_SPEC will be set to the value - # of tclsignal_BUILD_LIB_SPEC. An extension should make use of tclsignal_LIB_SPEC - # instead of tclsignal_BUILD_LIB_SPEC since it will work with both an + # 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 "${tclsignal_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclsignal" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclsignal" >&2;} - tclsignal_LIB_SPEC=${tclsignal_BUILD_LIB_SPEC} - tclsignal_STUB_LIB_SPEC=${tclsignal_BUILD_STUB_LIB_SPEC} - tclsignal_STUB_LIB_PATH=${tclsignal_BUILD_STUB_LIB_PATH} - tclsignal_INCLUDE_SPEC=${tclsignal_BUILD_INCLUDE_SPEC} - tclsignal_LIBRARY_PATH=${tclsignal_LIBRARY_PATH} + 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 @@ -4546,18 +4292,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclsig # 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${tclsignal_STUB_LIB_SPEC}" = x; then : + if test "x${pngtcl_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLSIGNAL_STUB library for LIBS" >&5 -$as_echo_n "checking For TCLSIGNAL_STUB library for LIBS... " >&6; } + { $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${TCLSIGNAL_STUB_LIB_SPEC}" != "x" ; then + if test "x${PNGTCL_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TCLSIGNAL_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${PNGTCL_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4571,11 +4317,11 @@ $as_echo_n "checking For TCLSIGNAL_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLSIGNAL_STUB_LIB_PATH ${TCLSIGNAL_STUB_LIB_PATH}" >&5 -$as_echo "using TCLSIGNAL_STUB_LIB_PATH ${TCLSIGNAL_STUB_LIB_PATH}" >&6; } + { $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="${TCLSIGNAL_STUB_LIB_SPEC}" + vars="${PNGTCL_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4589,8 +4335,8 @@ $as_echo "using TCLSIGNAL_STUB_LIB_PATH ${TCLSIGNAL_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLSIGNAL_STUB_LIB_SPEC ${TCLSIGNAL_STUB_LIB_SPEC}" >&5 -$as_echo "using TCLSIGNAL_STUB_LIB_SPEC ${TCLSIGNAL_STUB_LIB_SPEC}" >&6; } + { $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 @@ -4599,16 +4345,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tclsignal_STUB library for LIBS" >&5 -$as_echo_n "checking For tclsignal_STUB library for LIBS... " >&6; } + { $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${tclsignal_STUB_LIB_SPEC}" != "x" ; then + if test "x${pngtcl_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tclsignal_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${pngtcl_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4622,11 +4368,11 @@ $as_echo_n "checking For tclsignal_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclsignal_STUB_LIB_PATH ${tclsignal_STUB_LIB_PATH}" >&5 -$as_echo "using tclsignal_STUB_LIB_PATH ${tclsignal_STUB_LIB_PATH}" >&6; } + { $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="${tclsignal_STUB_LIB_SPEC}" + vars="${pngtcl_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4640,8 +4386,8 @@ $as_echo "using tclsignal_STUB_LIB_PATH ${tclsignal_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclsignal_STUB_LIB_SPEC ${tclsignal_STUB_LIB_SPEC}" >&5 -$as_echo "using tclsignal_STUB_LIB_SPEC ${tclsignal_STUB_LIB_SPEC}" >&6; } + { $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 @@ -4655,81 +4401,81 @@ fi # - # Ok, lets find the tclzvfs configuration + # Ok, lets find the jpegtcl configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tclzvfs + # the alternative search directory is invoked by --with-jpegtcl # - if test x"${no_tclzvfs}" = x ; then - # we reset no_tclzvfs in case something fails here - no_tclzvfs=true + if test x"${no_jpegtcl}" = x ; then + # we reset no_jpegtcl in case something fails here + no_jpegtcl=true -# Check whether --with-tclzvfs was given. -if test "${with_tclzvfs+set}" = set; then : - withval=$with_tclzvfs; with_tclzvfsconfig=${withval} +# Check whether --with-jpegtcl was given. +if test "${with_jpegtcl+set}" = set; then : + withval=$with_jpegtcl; with_jpegtclconfig=${withval} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclzvfs configuration" >&5 -$as_echo_n "checking for tclzvfs configuration... " >&6; } - if ${ac_cv_c_tclzvfsconfig+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpegtcl configuration" >&5 +$as_echo_n "checking for jpegtcl configuration... " >&6; } + if ${ac_cv_c_jpegtclconfig+:} false; then : $as_echo_n "(cached) " >&6 else - # First check to see if --with-tclzvfs was specified. - if test x"${with_tclzvfsconfig}" != x ; then - case ${with_tclzvfsconfig} in - */tclzvfsConfig.sh ) - if test -f ${with_tclzvfsconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclzvfs argument should refer to directory containing tclzvfsConfig.sh, not to tclzvfsConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tclzvfs argument should refer to directory containing tclzvfsConfig.sh, not to tclzvfsConfig.sh itself" >&2;} - with_tclzvfsconfig=`echo ${with_tclzvfsconfig} | sed 's!/tclzvfsConfig\.sh$!!'` + # First check to see if --with-jpegtcl was specified. + if test x"${with_jpegtclconfig}" != x ; then + case ${with_jpegtclconfig} in + */jpegtclConfig.sh ) + if test -f ${with_jpegtclconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-jpegtcl argument should refer to directory containing jpegtclConfig.sh, not to jpegtclConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-jpegtcl argument should refer to directory containing jpegtclConfig.sh, not to jpegtclConfig.sh itself" >&2;} + with_jpegtclconfig=`echo ${with_jpegtclconfig} | sed 's!/jpegtclConfig\.sh$!!'` fi;; esac - if test -f "${with_tclzvfsconfig}/tclzvfsConfig.sh" ; then - ac_cv_c_tclzvfsconfig=`(cd ${with_tclzvfsconfig}; pwd)` + if test -f "${with_jpegtclconfig}/jpegtclConfig.sh" ; then + ac_cv_c_jpegtclconfig=`(cd ${with_jpegtclconfig}; pwd)` else - as_fn_error $? "${with_tclzvfsconfig} directory doesn't contain tclzvfsConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_jpegtclconfig} directory doesn't contain jpegtclConfig.sh" "$LINENO" 5 fi fi - # then check for a private tclzvfs installation - if test x"${ac_cv_c_tclzvfsconfig}" = x ; then + # then check for a private jpegtcl installation + if test x"${ac_cv_c_jpegtclconfig}" = x ; then for i in \ - ../tclzvfs \ - `ls -dr ../tclzvfs*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tclzvfs*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tclzvfs*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tclzvfs*[0-9].[0-9]* 2>/dev/null` \ - ../../tclzvfs \ - `ls -dr ../../tclzvfs*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tclzvfs*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tclzvfs*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tclzvfs*[0-9].[0-9]* 2>/dev/null` \ - ../../../tclzvfs \ - `ls -dr ../../../tclzvfs*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tclzvfs*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tclzvfs*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tclzvfs*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tclzvfs \ - `ls -dr ${srcdir}/../tclzvfs*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tclzvfs*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tclzvfs*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tclzvfs*[0-9].[0-9]* 2>/dev/null` \ + ../jpegtcl \ + `ls -dr ../jpegtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../jpegtcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../jpegtcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../jpegtcl*[0-9].[0-9]* 2>/dev/null` \ + ../../jpegtcl \ + `ls -dr ../../jpegtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../jpegtcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../jpegtcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../jpegtcl*[0-9].[0-9]* 2>/dev/null` \ + ../../../jpegtcl \ + `ls -dr ../../../jpegtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../jpegtcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../jpegtcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../jpegtcl*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../jpegtcl \ + `ls -dr ${srcdir}/../jpegtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../jpegtcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../jpegtcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../jpegtcl*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/tclzvfsConfig.sh" ; then - ac_cv_c_tclzvfsconfig=`(cd $i; pwd)` + if test -f "$i/jpegtclConfig.sh" ; then + ac_cv_c_jpegtclconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/tclzvfsConfig.sh" ; then - ac_cv_c_tclzvfsconfig=`(cd $i/unix; pwd)` + if test -f "$i/unix/jpegtclConfig.sh" ; then + ac_cv_c_jpegtclconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_tclzvfsconfig}" = x ; then + if test x"${ac_cv_c_jpegtclconfig}" = 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` \ @@ -4738,8 +4484,8 @@ $as_echo "$as_me: WARNING: --with-tclzvfs argument should refer to directory con `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/tclzvfsConfig.sh" ; then - ac_cv_c_tclzvfsconfig=`(cd $i; pwd)` + if test -f "$i/jpegtclConfig.sh" ; then + ac_cv_c_jpegtclconfig=`(cd $i; pwd)` break fi done @@ -4748,49 +4494,49 @@ $as_echo "$as_me: WARNING: --with-tclzvfs argument should refer to directory con fi - if test x"${ac_cv_c_tclzvfsconfig}" = x ; then - tclzvfs_BIN_DIR="# no tclzvfs configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclzvfs configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tclzvfs configuration definitions" >&2;} + if test x"${ac_cv_c_jpegtclconfig}" = x ; then + jpegtcl_BIN_DIR="# no jpegtcl configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find jpegtcl configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find jpegtcl configuration definitions" >&2;} exit 0 else - no_tclzvfs= - tclzvfs_BIN_DIR=${ac_cv_c_tclzvfsconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclzvfs_BIN_DIR/tclzvfsConfig.sh" >&5 -$as_echo "found $tclzvfs_BIN_DIR/tclzvfsConfig.sh" >&6; } + no_jpegtcl= + jpegtcl_BIN_DIR=${ac_cv_c_jpegtclconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $jpegtcl_BIN_DIR/jpegtclConfig.sh" >&5 +$as_echo "found $jpegtcl_BIN_DIR/jpegtclConfig.sh" >&6; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclzvfs_BIN_DIR}/tclzvfsConfig.sh" >&5 -$as_echo_n "checking for existence of ${tclzvfs_BIN_DIR}/tclzvfsConfig.sh... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${jpegtcl_BIN_DIR}/jpegtclConfig.sh" >&5 +$as_echo_n "checking for existence of ${jpegtcl_BIN_DIR}/jpegtclConfig.sh... " >&6; } - if test -f "${tclzvfs_BIN_DIR}/tclzvfsConfig.sh" ; then + if test -f "${jpegtcl_BIN_DIR}/jpegtclConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tclzvfs_BIN_DIR}/tclzvfsConfig.sh" + . "${jpegtcl_BIN_DIR}/jpegtclConfig.sh" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 $as_echo "file not found" >&6; } fi # - # If the tclzvfs_BIN_DIR is the build directory (not the install directory), + # If the jpegtcl_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 tclzvfs_LIB_SPEC will be set to the value - # of tclzvfs_BUILD_LIB_SPEC. An extension should make use of tclzvfs_LIB_SPEC - # instead of tclzvfs_BUILD_LIB_SPEC since it will work with both an + # For example, the variable jpegtcl_LIB_SPEC will be set to the value + # of jpegtcl_BUILD_LIB_SPEC. An extension should make use of jpegtcl_LIB_SPEC + # instead of jpegtcl_BUILD_LIB_SPEC since it will work with both an # installed and uninstalled version of Tcl. # - if test -f "${tclzvfs_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclzvfs" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclzvfs" >&2;} - tclzvfs_LIB_SPEC=${tclzvfs_BUILD_LIB_SPEC} - tclzvfs_STUB_LIB_SPEC=${tclzvfs_BUILD_STUB_LIB_SPEC} - tclzvfs_STUB_LIB_PATH=${tclzvfs_BUILD_STUB_LIB_PATH} - tclzvfs_INCLUDE_SPEC=${tclzvfs_BUILD_INCLUDE_SPEC} - tclzvfs_LIBRARY_PATH=${tclzvfs_LIBRARY_PATH} + if test -f "${jpegtcl_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for jpegtcl" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for jpegtcl" >&2;} + jpegtcl_LIB_SPEC=${jpegtcl_BUILD_LIB_SPEC} + jpegtcl_STUB_LIB_SPEC=${jpegtcl_BUILD_STUB_LIB_SPEC} + jpegtcl_STUB_LIB_PATH=${jpegtcl_BUILD_STUB_LIB_PATH} + jpegtcl_INCLUDE_SPEC=${jpegtcl_BUILD_INCLUDE_SPEC} + jpegtcl_LIBRARY_PATH=${jpegtcl_LIBRARY_PATH} fi @@ -4810,18 +4556,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclzvf # 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${tclzvfs_STUB_LIB_SPEC}" = x; then : + if test "x${jpegtcl_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLZVFS_STUB library for LIBS" >&5 -$as_echo_n "checking For TCLZVFS_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For JPEGTCL_STUB library for LIBS" >&5 +$as_echo_n "checking For JPEGTCL_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${TCLZVFS_STUB_LIB_SPEC}" != "x" ; then + if test "x${JPEGTCL_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TCLZVFS_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${JPEGTCL_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4835,11 +4581,11 @@ $as_echo_n "checking For TCLZVFS_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLZVFS_STUB_LIB_PATH ${TCLZVFS_STUB_LIB_PATH}" >&5 -$as_echo "using TCLZVFS_STUB_LIB_PATH ${TCLZVFS_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using JPEGTCL_STUB_LIB_PATH ${JPEGTCL_STUB_LIB_PATH}" >&5 +$as_echo "using JPEGTCL_STUB_LIB_PATH ${JPEGTCL_STUB_LIB_PATH}" >&6; } else - vars="${TCLZVFS_STUB_LIB_SPEC}" + vars="${JPEGTCL_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4853,8 +4599,8 @@ $as_echo "using TCLZVFS_STUB_LIB_PATH ${TCLZVFS_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLZVFS_STUB_LIB_SPEC ${TCLZVFS_STUB_LIB_SPEC}" >&5 -$as_echo "using TCLZVFS_STUB_LIB_SPEC ${TCLZVFS_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using JPEGTCL_STUB_LIB_SPEC ${JPEGTCL_STUB_LIB_SPEC}" >&5 +$as_echo "using JPEGTCL_STUB_LIB_SPEC ${JPEGTCL_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -4863,16 +4609,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tclzvfs_STUB library for LIBS" >&5 -$as_echo_n "checking For tclzvfs_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For jpegtcl_STUB library for LIBS" >&5 +$as_echo_n "checking For jpegtcl_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${tclzvfs_STUB_LIB_SPEC}" != "x" ; then + if test "x${jpegtcl_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tclzvfs_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${jpegtcl_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4886,11 +4632,11 @@ $as_echo_n "checking For tclzvfs_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclzvfs_STUB_LIB_PATH ${tclzvfs_STUB_LIB_PATH}" >&5 -$as_echo "using tclzvfs_STUB_LIB_PATH ${tclzvfs_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using jpegtcl_STUB_LIB_PATH ${jpegtcl_STUB_LIB_PATH}" >&5 +$as_echo "using jpegtcl_STUB_LIB_PATH ${jpegtcl_STUB_LIB_PATH}" >&6; } else - vars="${tclzvfs_STUB_LIB_SPEC}" + vars="${jpegtcl_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -4904,8 +4650,8 @@ $as_echo "using tclzvfs_STUB_LIB_PATH ${tclzvfs_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclzvfs_STUB_LIB_SPEC ${tclzvfs_STUB_LIB_SPEC}" >&5 -$as_echo "using tclzvfs_STUB_LIB_SPEC ${tclzvfs_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using jpegtcl_STUB_LIB_SPEC ${jpegtcl_STUB_LIB_SPEC}" >&5 +$as_echo "using jpegtcl_STUB_LIB_SPEC ${jpegtcl_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -4919,81 +4665,81 @@ fi # - # Ok, lets find the tifftcl configuration + # Ok, lets find the zlibtcl configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tifftcl + # the alternative search directory is invoked by --with-zlibtcl # - if test x"${no_tifftcl}" = x ; then - # we reset no_tifftcl in case something fails here - no_tifftcl=true + if test x"${no_zlibtcl}" = x ; then + # we reset no_zlibtcl in case something fails here + no_zlibtcl=true -# Check whether --with-tifftcl was given. -if test "${with_tifftcl+set}" = set; then : - withval=$with_tifftcl; with_tifftclconfig=${withval} +# Check whether --with-zlibtcl was given. +if test "${with_zlibtcl+set}" = set; then : + withval=$with_zlibtcl; with_zlibtclconfig=${withval} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tifftcl configuration" >&5 -$as_echo_n "checking for tifftcl configuration... " >&6; } - if ${ac_cv_c_tifftclconfig+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibtcl configuration" >&5 +$as_echo_n "checking for zlibtcl configuration... " >&6; } + if ${ac_cv_c_zlibtclconfig+:} false; then : $as_echo_n "(cached) " >&6 else - # First check to see if --with-tifftcl was specified. - if test x"${with_tifftclconfig}" != x ; then - case ${with_tifftclconfig} in - */tifftclConfig.sh ) - if test -f ${with_tifftclconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tifftcl argument should refer to directory containing tifftclConfig.sh, not to tifftclConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tifftcl argument should refer to directory containing tifftclConfig.sh, not to tifftclConfig.sh itself" >&2;} - with_tifftclconfig=`echo ${with_tifftclconfig} | sed 's!/tifftclConfig\.sh$!!'` + # First check to see if --with-zlibtcl was specified. + if test x"${with_zlibtclconfig}" != x ; then + case ${with_zlibtclconfig} in + */zlibtclConfig.sh ) + if test -f ${with_zlibtclconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-zlibtcl argument should refer to directory containing zlibtclConfig.sh, not to zlibtclConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-zlibtcl argument should refer to directory containing zlibtclConfig.sh, not to zlibtclConfig.sh itself" >&2;} + with_zlibtclconfig=`echo ${with_zlibtclconfig} | sed 's!/zlibtclConfig\.sh$!!'` fi;; esac - if test -f "${with_tifftclconfig}/tifftclConfig.sh" ; then - ac_cv_c_tifftclconfig=`(cd ${with_tifftclconfig}; pwd)` + if test -f "${with_zlibtclconfig}/zlibtclConfig.sh" ; then + ac_cv_c_zlibtclconfig=`(cd ${with_zlibtclconfig}; pwd)` else - as_fn_error $? "${with_tifftclconfig} directory doesn't contain tifftclConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_zlibtclconfig} directory doesn't contain zlibtclConfig.sh" "$LINENO" 5 fi fi - # then check for a private tifftcl installation - if test x"${ac_cv_c_tifftclconfig}" = x ; then + # then check for a private zlibtcl installation + if test x"${ac_cv_c_zlibtclconfig}" = x ; then for i in \ - ../tifftcl \ - `ls -dr ../tifftcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tifftcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tifftcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tifftcl*[0-9].[0-9]* 2>/dev/null` \ - ../../tifftcl \ - `ls -dr ../../tifftcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tifftcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tifftcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tifftcl*[0-9].[0-9]* 2>/dev/null` \ - ../../../tifftcl \ - `ls -dr ../../../tifftcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tifftcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tifftcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tifftcl*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tifftcl \ - `ls -dr ${srcdir}/../tifftcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tifftcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tifftcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tifftcl*[0-9].[0-9]* 2>/dev/null` \ + ../zlibtcl \ + `ls -dr ../zlibtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../zlibtcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../zlibtcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../zlibtcl*[0-9].[0-9]* 2>/dev/null` \ + ../../zlibtcl \ + `ls -dr ../../zlibtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../zlibtcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../zlibtcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../zlibtcl*[0-9].[0-9]* 2>/dev/null` \ + ../../../zlibtcl \ + `ls -dr ../../../zlibtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../zlibtcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../zlibtcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../zlibtcl*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../zlibtcl \ + `ls -dr ${srcdir}/../zlibtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../zlibtcl*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../zlibtcl*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../zlibtcl*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/tifftclConfig.sh" ; then - ac_cv_c_tifftclconfig=`(cd $i; pwd)` + if test -f "$i/zlibtclConfig.sh" ; then + ac_cv_c_zlibtclconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/tifftclConfig.sh" ; then - ac_cv_c_tifftclconfig=`(cd $i/unix; pwd)` + if test -f "$i/unix/zlibtclConfig.sh" ; then + ac_cv_c_zlibtclconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_tifftclconfig}" = x ; then + if test x"${ac_cv_c_zlibtclconfig}" = 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` \ @@ -5002,8 +4748,8 @@ $as_echo "$as_me: WARNING: --with-tifftcl argument should refer to directory con `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/tifftclConfig.sh" ; then - ac_cv_c_tifftclconfig=`(cd $i; pwd)` + if test -f "$i/zlibtclConfig.sh" ; then + ac_cv_c_zlibtclconfig=`(cd $i; pwd)` break fi done @@ -5012,49 +4758,49 @@ $as_echo "$as_me: WARNING: --with-tifftcl argument should refer to directory con fi - if test x"${ac_cv_c_tifftclconfig}" = x ; then - tifftcl_BIN_DIR="# no tifftcl configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tifftcl configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tifftcl configuration definitions" >&2;} + if test x"${ac_cv_c_zlibtclconfig}" = x ; then + zlibtcl_BIN_DIR="# no zlibtcl configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find zlibtcl configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find zlibtcl configuration definitions" >&2;} exit 0 else - no_tifftcl= - tifftcl_BIN_DIR=${ac_cv_c_tifftclconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tifftcl_BIN_DIR/tifftclConfig.sh" >&5 -$as_echo "found $tifftcl_BIN_DIR/tifftclConfig.sh" >&6; } + no_zlibtcl= + zlibtcl_BIN_DIR=${ac_cv_c_zlibtclconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $zlibtcl_BIN_DIR/zlibtclConfig.sh" >&5 +$as_echo "found $zlibtcl_BIN_DIR/zlibtclConfig.sh" >&6; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tifftcl_BIN_DIR}/tifftclConfig.sh" >&5 -$as_echo_n "checking for existence of ${tifftcl_BIN_DIR}/tifftclConfig.sh... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${zlibtcl_BIN_DIR}/zlibtclConfig.sh" >&5 +$as_echo_n "checking for existence of ${zlibtcl_BIN_DIR}/zlibtclConfig.sh... " >&6; } - if test -f "${tifftcl_BIN_DIR}/tifftclConfig.sh" ; then + if test -f "${zlibtcl_BIN_DIR}/zlibtclConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tifftcl_BIN_DIR}/tifftclConfig.sh" + . "${zlibtcl_BIN_DIR}/zlibtclConfig.sh" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 $as_echo "file not found" >&6; } fi # - # If the tifftcl_BIN_DIR is the build directory (not the install directory), + # If the zlibtcl_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 tifftcl_LIB_SPEC will be set to the value - # of tifftcl_BUILD_LIB_SPEC. An extension should make use of tifftcl_LIB_SPEC - # instead of tifftcl_BUILD_LIB_SPEC since it will work with both an + # For example, the variable zlibtcl_LIB_SPEC will be set to the value + # of zlibtcl_BUILD_LIB_SPEC. An extension should make use of zlibtcl_LIB_SPEC + # instead of zlibtcl_BUILD_LIB_SPEC since it will work with both an # installed and uninstalled version of Tcl. # - if test -f "${tifftcl_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tifftcl" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tifftcl" >&2;} - tifftcl_LIB_SPEC=${tifftcl_BUILD_LIB_SPEC} - tifftcl_STUB_LIB_SPEC=${tifftcl_BUILD_STUB_LIB_SPEC} - tifftcl_STUB_LIB_PATH=${tifftcl_BUILD_STUB_LIB_PATH} - tifftcl_INCLUDE_SPEC=${tifftcl_BUILD_INCLUDE_SPEC} - tifftcl_LIBRARY_PATH=${tifftcl_LIBRARY_PATH} + if test -f "${zlibtcl_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for zlibtcl" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for zlibtcl" >&2;} + zlibtcl_LIB_SPEC=${zlibtcl_BUILD_LIB_SPEC} + zlibtcl_STUB_LIB_SPEC=${zlibtcl_BUILD_STUB_LIB_SPEC} + zlibtcl_STUB_LIB_PATH=${zlibtcl_BUILD_STUB_LIB_PATH} + zlibtcl_INCLUDE_SPEC=${zlibtcl_BUILD_INCLUDE_SPEC} + zlibtcl_LIBRARY_PATH=${zlibtcl_LIBRARY_PATH} fi @@ -5074,18 +4820,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tifftc # 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${tifftcl_STUB_LIB_SPEC}" = x; then : + if test "x${zlibtcl_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TIFFTCL_STUB library for LIBS" >&5 -$as_echo_n "checking For TIFFTCL_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For ZLIBTCL_STUB library for LIBS" >&5 +$as_echo_n "checking For ZLIBTCL_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${TIFFTCL_STUB_LIB_SPEC}" != "x" ; then + if test "x${ZLIBTCL_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TIFFTCL_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${ZLIBTCL_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5099,11 +4845,11 @@ $as_echo_n "checking For TIFFTCL_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TIFFTCL_STUB_LIB_PATH ${TIFFTCL_STUB_LIB_PATH}" >&5 -$as_echo "using TIFFTCL_STUB_LIB_PATH ${TIFFTCL_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using ZLIBTCL_STUB_LIB_PATH ${ZLIBTCL_STUB_LIB_PATH}" >&5 +$as_echo "using ZLIBTCL_STUB_LIB_PATH ${ZLIBTCL_STUB_LIB_PATH}" >&6; } else - vars="${TIFFTCL_STUB_LIB_SPEC}" + vars="${ZLIBTCL_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5117,8 +4863,8 @@ $as_echo "using TIFFTCL_STUB_LIB_PATH ${TIFFTCL_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TIFFTCL_STUB_LIB_SPEC ${TIFFTCL_STUB_LIB_SPEC}" >&5 -$as_echo "using TIFFTCL_STUB_LIB_SPEC ${TIFFTCL_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using ZLIBTCL_STUB_LIB_SPEC ${ZLIBTCL_STUB_LIB_SPEC}" >&5 +$as_echo "using ZLIBTCL_STUB_LIB_SPEC ${ZLIBTCL_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5127,16 +4873,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tifftcl_STUB library for LIBS" >&5 -$as_echo_n "checking For tifftcl_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For zlibtcl_STUB library for LIBS" >&5 +$as_echo_n "checking For zlibtcl_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${tifftcl_STUB_LIB_SPEC}" != "x" ; then + if test "x${zlibtcl_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tifftcl_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${zlibtcl_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5150,11 +4896,11 @@ $as_echo_n "checking For tifftcl_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tifftcl_STUB_LIB_PATH ${tifftcl_STUB_LIB_PATH}" >&5 -$as_echo "using tifftcl_STUB_LIB_PATH ${tifftcl_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using zlibtcl_STUB_LIB_PATH ${zlibtcl_STUB_LIB_PATH}" >&5 +$as_echo "using zlibtcl_STUB_LIB_PATH ${zlibtcl_STUB_LIB_PATH}" >&6; } else - vars="${tifftcl_STUB_LIB_SPEC}" + vars="${zlibtcl_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5168,8 +4914,8 @@ $as_echo "using tifftcl_STUB_LIB_PATH ${tifftcl_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tifftcl_STUB_LIB_SPEC ${tifftcl_STUB_LIB_SPEC}" >&5 -$as_echo "using tifftcl_STUB_LIB_SPEC ${tifftcl_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using zlibtcl_STUB_LIB_SPEC ${zlibtcl_STUB_LIB_SPEC}" >&5 +$as_echo "using zlibtcl_STUB_LIB_SPEC ${zlibtcl_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5183,81 +4929,81 @@ fi # - # Ok, lets find the pngtcl configuration + # Ok, lets find the tclcheckdns configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-pngtcl + # the alternative search directory is invoked by --with-tclcheckdns # - if test x"${no_pngtcl}" = x ; then - # we reset no_pngtcl in case something fails here - no_pngtcl=true + if test x"${no_tclcheckdns}" = x ; then + # we reset no_tclcheckdns in case something fails here + no_tclcheckdns=true -# Check whether --with-pngtcl was given. -if test "${with_pngtcl+set}" = set; then : - withval=$with_pngtcl; with_pngtclconfig=${withval} +# Check whether --with-tclcheckdns was given. +if test "${with_tclcheckdns+set}" = set; then : + withval=$with_tclcheckdns; with_tclcheckdnsconfig=${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 "$as_me:${as_lineno-$LINENO}: checking for tclcheckdns configuration" >&5 +$as_echo_n "checking for tclcheckdns configuration... " >&6; } + if ${ac_cv_c_tclcheckdnsconfig+:} 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$!!'` + # First check to see if --with-tclcheckdns was specified. + if test x"${with_tclcheckdnsconfig}" != x ; then + case ${with_tclcheckdnsconfig} in + */tclcheckdnsConfig.sh ) + if test -f ${with_tclcheckdnsconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclcheckdns argument should refer to directory containing tclcheckdnsConfig.sh, not to tclcheckdnsConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tclcheckdns argument should refer to directory containing tclcheckdnsConfig.sh, not to tclcheckdnsConfig.sh itself" >&2;} + with_tclcheckdnsconfig=`echo ${with_tclcheckdnsconfig} | sed 's!/tclcheckdnsConfig\.sh$!!'` fi;; esac - if test -f "${with_pngtclconfig}/pngtclConfig.sh" ; then - ac_cv_c_pngtclconfig=`(cd ${with_pngtclconfig}; pwd)` + if test -f "${with_tclcheckdnsconfig}/tclcheckdnsConfig.sh" ; then + ac_cv_c_tclcheckdnsconfig=`(cd ${with_tclcheckdnsconfig}; pwd)` else - as_fn_error $? "${with_pngtclconfig} directory doesn't contain pngtclConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_tclcheckdnsconfig} directory doesn't contain tclcheckdnsConfig.sh" "$LINENO" 5 fi fi - # then check for a private pngtcl installation - if test x"${ac_cv_c_pngtclconfig}" = x ; then + # then check for a private tclcheckdns installation + if test x"${ac_cv_c_tclcheckdnsconfig}" = 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` \ + ../tclcheckdns \ + `ls -dr ../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ + ../../tclcheckdns \ + `ls -dr ../../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ + ../../../tclcheckdns \ + `ls -dr ../../../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tclcheckdns \ + `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tclcheckdns*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/pngtclConfig.sh" ; then - ac_cv_c_pngtclconfig=`(cd $i; pwd)` + if test -f "$i/tclcheckdnsConfig.sh" ; then + ac_cv_c_tclcheckdnsconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/pngtclConfig.sh" ; then - ac_cv_c_pngtclconfig=`(cd $i/unix; pwd)` + if test -f "$i/unix/tclcheckdnsConfig.sh" ; then + ac_cv_c_tclcheckdnsconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_pngtclconfig}" = x ; then + if test x"${ac_cv_c_tclcheckdnsconfig}" = 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` \ @@ -5266,8 +5012,8 @@ $as_echo "$as_me: WARNING: --with-pngtcl argument should refer to directory cont `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)` + if test -f "$i/tclcheckdnsConfig.sh" ; then + ac_cv_c_tclcheckdnsconfig=`(cd $i; pwd)` break fi done @@ -5276,49 +5022,49 @@ $as_echo "$as_me: WARNING: --with-pngtcl argument should refer to directory cont 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;} + if test x"${ac_cv_c_tclcheckdnsconfig}" = x ; then + tclcheckdns_BIN_DIR="# no tclcheckdns configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclcheckdns configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tclcheckdns 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; } + no_tclcheckdns= + tclcheckdns_BIN_DIR=${ac_cv_c_tclcheckdnsconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclcheckdns_BIN_DIR/tclcheckdnsConfig.sh" >&5 +$as_echo "found $tclcheckdns_BIN_DIR/tclcheckdnsConfig.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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" >&5 +$as_echo_n "checking for existence of ${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh... " >&6; } - if test -f "${pngtcl_BIN_DIR}/pngtclConfig.sh" ; then + if test -f "${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${pngtcl_BIN_DIR}/pngtclConfig.sh" + . "${tclcheckdns_BIN_DIR}/tclcheckdnsConfig.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), + # If the tclcheckdns_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 + # For example, the variable tclcheckdns_LIB_SPEC will be set to the value + # of tclcheckdns_BUILD_LIB_SPEC. An extension should make use of tclcheckdns_LIB_SPEC + # instead of tclcheckdns_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} + if test -f "${tclcheckdns_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclcheckdns" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclcheckdns" >&2;} + tclcheckdns_LIB_SPEC=${tclcheckdns_BUILD_LIB_SPEC} + tclcheckdns_STUB_LIB_SPEC=${tclcheckdns_BUILD_STUB_LIB_SPEC} + tclcheckdns_STUB_LIB_PATH=${tclcheckdns_BUILD_STUB_LIB_PATH} + tclcheckdns_INCLUDE_SPEC=${tclcheckdns_BUILD_INCLUDE_SPEC} + tclcheckdns_LIBRARY_PATH=${tclcheckdns_LIBRARY_PATH} fi @@ -5338,18 +5084,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for pngtcl # 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 : + if test "x${tclcheckdns_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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLCHECKDNS_STUB library for LIBS" >&5 +$as_echo_n "checking For TCLCHECKDNS_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 "x${TCLCHECKDNS_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${PNGTCL_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TCLCHECKDNS_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5363,11 +5109,11 @@ $as_echo_n "checking For PNGTCL_STUB library for LIBS... " >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLCHECKDNS_STUB_LIB_PATH ${TCLCHECKDNS_STUB_LIB_PATH}" >&5 +$as_echo "using TCLCHECKDNS_STUB_LIB_PATH ${TCLCHECKDNS_STUB_LIB_PATH}" >&6; } else - vars="${PNGTCL_STUB_LIB_SPEC}" + vars="${TCLCHECKDNS_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5381,8 +5127,8 @@ $as_echo "using PNGTCL_STUB_LIB_PATH ${PNGTCL_STUB_LIB_PATH}" >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLCHECKDNS_STUB_LIB_SPEC ${TCLCHECKDNS_STUB_LIB_SPEC}" >&5 +$as_echo "using TCLCHECKDNS_STUB_LIB_SPEC ${TCLCHECKDNS_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5391,16 +5137,16 @@ $as_echo "file not found" >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tclcheckdns_STUB library for LIBS" >&5 +$as_echo_n "checking For tclcheckdns_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 "x${tclcheckdns_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${pngtcl_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tclcheckdns_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5414,11 +5160,11 @@ $as_echo_n "checking For pngtcl_STUB library for LIBS... " >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclcheckdns_STUB_LIB_PATH ${tclcheckdns_STUB_LIB_PATH}" >&5 +$as_echo "using tclcheckdns_STUB_LIB_PATH ${tclcheckdns_STUB_LIB_PATH}" >&6; } else - vars="${pngtcl_STUB_LIB_SPEC}" + vars="${tclcheckdns_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5432,8 +5178,8 @@ $as_echo "using pngtcl_STUB_LIB_PATH ${pngtcl_STUB_LIB_PATH}" >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclcheckdns_STUB_LIB_SPEC ${tclcheckdns_STUB_LIB_SPEC}" >&5 +$as_echo "using tclcheckdns_STUB_LIB_SPEC ${tclcheckdns_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5447,81 +5193,81 @@ fi # - # Ok, lets find the jpegtcl configuration + # Ok, lets find the tcliis configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-jpegtcl + # the alternative search directory is invoked by --with-tcliis # - if test x"${no_jpegtcl}" = x ; then - # we reset no_jpegtcl in case something fails here - no_jpegtcl=true + if test x"${no_tcliis}" = x ; then + # we reset no_tcliis in case something fails here + no_tcliis=true -# Check whether --with-jpegtcl was given. -if test "${with_jpegtcl+set}" = set; then : - withval=$with_jpegtcl; with_jpegtclconfig=${withval} +# 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 jpegtcl configuration" >&5 -$as_echo_n "checking for jpegtcl configuration... " >&6; } - if ${ac_cv_c_jpegtclconfig+:} false; then : + { $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-jpegtcl was specified. - if test x"${with_jpegtclconfig}" != x ; then - case ${with_jpegtclconfig} in - */jpegtclConfig.sh ) - if test -f ${with_jpegtclconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-jpegtcl argument should refer to directory containing jpegtclConfig.sh, not to jpegtclConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-jpegtcl argument should refer to directory containing jpegtclConfig.sh, not to jpegtclConfig.sh itself" >&2;} - with_jpegtclconfig=`echo ${with_jpegtclconfig} | sed 's!/jpegtclConfig\.sh$!!'` + # 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_jpegtclconfig}/jpegtclConfig.sh" ; then - ac_cv_c_jpegtclconfig=`(cd ${with_jpegtclconfig}; pwd)` + if test -f "${with_tcliisconfig}/tcliisConfig.sh" ; then + ac_cv_c_tcliisconfig=`(cd ${with_tcliisconfig}; pwd)` else - as_fn_error $? "${with_jpegtclconfig} directory doesn't contain jpegtclConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_tcliisconfig} directory doesn't contain tcliisConfig.sh" "$LINENO" 5 fi fi - # then check for a private jpegtcl installation - if test x"${ac_cv_c_jpegtclconfig}" = x ; then + # then check for a private tcliis installation + if test x"${ac_cv_c_tcliisconfig}" = x ; then for i in \ - ../jpegtcl \ - `ls -dr ../jpegtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../jpegtcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../jpegtcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../jpegtcl*[0-9].[0-9]* 2>/dev/null` \ - ../../jpegtcl \ - `ls -dr ../../jpegtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../jpegtcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../jpegtcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../jpegtcl*[0-9].[0-9]* 2>/dev/null` \ - ../../../jpegtcl \ - `ls -dr ../../../jpegtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../jpegtcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../jpegtcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../jpegtcl*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../jpegtcl \ - `ls -dr ${srcdir}/../jpegtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../jpegtcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../jpegtcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../jpegtcl*[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` \ + ../../../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/jpegtclConfig.sh" ; then - ac_cv_c_jpegtclconfig=`(cd $i; pwd)` + if test -f "$i/tcliisConfig.sh" ; then + ac_cv_c_tcliisconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/jpegtclConfig.sh" ; then - ac_cv_c_jpegtclconfig=`(cd $i/unix; pwd)` + 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_jpegtclconfig}" = x ; then + 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` \ @@ -5530,8 +5276,8 @@ $as_echo "$as_me: WARNING: --with-jpegtcl argument should refer to directory con `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/jpegtclConfig.sh" ; then - ac_cv_c_jpegtclconfig=`(cd $i; pwd)` + if test -f "$i/tcliisConfig.sh" ; then + ac_cv_c_tcliisconfig=`(cd $i; pwd)` break fi done @@ -5540,49 +5286,49 @@ $as_echo "$as_me: WARNING: --with-jpegtcl argument should refer to directory con fi - if test x"${ac_cv_c_jpegtclconfig}" = x ; then - jpegtcl_BIN_DIR="# no jpegtcl configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find jpegtcl configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find jpegtcl configuration definitions" >&2;} + 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_jpegtcl= - jpegtcl_BIN_DIR=${ac_cv_c_jpegtclconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $jpegtcl_BIN_DIR/jpegtclConfig.sh" >&5 -$as_echo "found $jpegtcl_BIN_DIR/jpegtclConfig.sh" >&6; } + 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 ${jpegtcl_BIN_DIR}/jpegtclConfig.sh" >&5 -$as_echo_n "checking for existence of ${jpegtcl_BIN_DIR}/jpegtclConfig.sh... " >&6; } + { $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 "${jpegtcl_BIN_DIR}/jpegtclConfig.sh" ; then + if test -f "${tcliis_BIN_DIR}/tcliisConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${jpegtcl_BIN_DIR}/jpegtclConfig.sh" + . "${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 jpegtcl_BIN_DIR is the build directory (not the install directory), + # 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 jpegtcl_LIB_SPEC will be set to the value - # of jpegtcl_BUILD_LIB_SPEC. An extension should make use of jpegtcl_LIB_SPEC - # instead of jpegtcl_BUILD_LIB_SPEC since it will work with both an + # 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 "${jpegtcl_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for jpegtcl" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for jpegtcl" >&2;} - jpegtcl_LIB_SPEC=${jpegtcl_BUILD_LIB_SPEC} - jpegtcl_STUB_LIB_SPEC=${jpegtcl_BUILD_STUB_LIB_SPEC} - jpegtcl_STUB_LIB_PATH=${jpegtcl_BUILD_STUB_LIB_PATH} - jpegtcl_INCLUDE_SPEC=${jpegtcl_BUILD_INCLUDE_SPEC} - jpegtcl_LIBRARY_PATH=${jpegtcl_LIBRARY_PATH} + 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 @@ -5602,18 +5348,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for jpegtc # 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${jpegtcl_STUB_LIB_SPEC}" = x; then : + if test "x${tcliis_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For JPEGTCL_STUB library for LIBS" >&5 -$as_echo_n "checking For JPEGTCL_STUB library for LIBS... " >&6; } + { $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${JPEGTCL_STUB_LIB_SPEC}" != "x" ; then + if test "x${TCLIIS_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${JPEGTCL_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TCLIIS_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5627,11 +5373,11 @@ $as_echo_n "checking For JPEGTCL_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using JPEGTCL_STUB_LIB_PATH ${JPEGTCL_STUB_LIB_PATH}" >&5 -$as_echo "using JPEGTCL_STUB_LIB_PATH ${JPEGTCL_STUB_LIB_PATH}" >&6; } + { $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="${JPEGTCL_STUB_LIB_SPEC}" + vars="${TCLIIS_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5645,8 +5391,8 @@ $as_echo "using JPEGTCL_STUB_LIB_PATH ${JPEGTCL_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using JPEGTCL_STUB_LIB_SPEC ${JPEGTCL_STUB_LIB_SPEC}" >&5 -$as_echo "using JPEGTCL_STUB_LIB_SPEC ${JPEGTCL_STUB_LIB_SPEC}" >&6; } + { $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 @@ -5655,16 +5401,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For jpegtcl_STUB library for LIBS" >&5 -$as_echo_n "checking For jpegtcl_STUB library for LIBS... " >&6; } + { $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${jpegtcl_STUB_LIB_SPEC}" != "x" ; then + if test "x${tcliis_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${jpegtcl_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tcliis_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5678,11 +5424,11 @@ $as_echo_n "checking For jpegtcl_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using jpegtcl_STUB_LIB_PATH ${jpegtcl_STUB_LIB_PATH}" >&5 -$as_echo "using jpegtcl_STUB_LIB_PATH ${jpegtcl_STUB_LIB_PATH}" >&6; } + { $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="${jpegtcl_STUB_LIB_SPEC}" + vars="${tcliis_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5696,8 +5442,8 @@ $as_echo "using jpegtcl_STUB_LIB_PATH ${jpegtcl_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using jpegtcl_STUB_LIB_SPEC ${jpegtcl_STUB_LIB_SPEC}" >&5 -$as_echo "using jpegtcl_STUB_LIB_SPEC ${jpegtcl_STUB_LIB_SPEC}" >&6; } + { $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 @@ -5711,81 +5457,81 @@ fi # - # Ok, lets find the zlibtcl configuration + # Ok, lets find the tclsignal configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-zlibtcl + # the alternative search directory is invoked by --with-tclsignal # - if test x"${no_zlibtcl}" = x ; then - # we reset no_zlibtcl in case something fails here - no_zlibtcl=true + if test x"${no_tclsignal}" = x ; then + # we reset no_tclsignal in case something fails here + no_tclsignal=true -# Check whether --with-zlibtcl was given. -if test "${with_zlibtcl+set}" = set; then : - withval=$with_zlibtcl; with_zlibtclconfig=${withval} +# Check whether --with-tclsignal was given. +if test "${with_tclsignal+set}" = set; then : + withval=$with_tclsignal; with_tclsignalconfig=${withval} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibtcl configuration" >&5 -$as_echo_n "checking for zlibtcl configuration... " >&6; } - if ${ac_cv_c_zlibtclconfig+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsignal configuration" >&5 +$as_echo_n "checking for tclsignal configuration... " >&6; } + if ${ac_cv_c_tclsignalconfig+:} false; then : $as_echo_n "(cached) " >&6 else - # First check to see if --with-zlibtcl was specified. - if test x"${with_zlibtclconfig}" != x ; then - case ${with_zlibtclconfig} in - */zlibtclConfig.sh ) - if test -f ${with_zlibtclconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-zlibtcl argument should refer to directory containing zlibtclConfig.sh, not to zlibtclConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-zlibtcl argument should refer to directory containing zlibtclConfig.sh, not to zlibtclConfig.sh itself" >&2;} - with_zlibtclconfig=`echo ${with_zlibtclconfig} | sed 's!/zlibtclConfig\.sh$!!'` + # First check to see if --with-tclsignal was specified. + if test x"${with_tclsignalconfig}" != x ; then + case ${with_tclsignalconfig} in + */tclsignalConfig.sh ) + if test -f ${with_tclsignalconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclsignal argument should refer to directory containing tclsignalConfig.sh, not to tclsignalConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tclsignal argument should refer to directory containing tclsignalConfig.sh, not to tclsignalConfig.sh itself" >&2;} + with_tclsignalconfig=`echo ${with_tclsignalconfig} | sed 's!/tclsignalConfig\.sh$!!'` fi;; esac - if test -f "${with_zlibtclconfig}/zlibtclConfig.sh" ; then - ac_cv_c_zlibtclconfig=`(cd ${with_zlibtclconfig}; pwd)` + if test -f "${with_tclsignalconfig}/tclsignalConfig.sh" ; then + ac_cv_c_tclsignalconfig=`(cd ${with_tclsignalconfig}; pwd)` else - as_fn_error $? "${with_zlibtclconfig} directory doesn't contain zlibtclConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_tclsignalconfig} directory doesn't contain tclsignalConfig.sh" "$LINENO" 5 fi fi - # then check for a private zlibtcl installation - if test x"${ac_cv_c_zlibtclconfig}" = x ; then + # then check for a private tclsignal installation + if test x"${ac_cv_c_tclsignalconfig}" = x ; then for i in \ - ../zlibtcl \ - `ls -dr ../zlibtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../zlibtcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../zlibtcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../zlibtcl*[0-9].[0-9]* 2>/dev/null` \ - ../../zlibtcl \ - `ls -dr ../../zlibtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../zlibtcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../zlibtcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../zlibtcl*[0-9].[0-9]* 2>/dev/null` \ - ../../../zlibtcl \ - `ls -dr ../../../zlibtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../zlibtcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../zlibtcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../zlibtcl*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../zlibtcl \ - `ls -dr ${srcdir}/../zlibtcl*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../zlibtcl*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../zlibtcl*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../zlibtcl*[0-9].[0-9]* 2>/dev/null` \ + ../tclsignal \ + `ls -dr ../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tclsignal*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tclsignal*[0-9].[0-9]* 2>/dev/null` \ + ../../tclsignal \ + `ls -dr ../../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tclsignal*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tclsignal*[0-9].[0-9]* 2>/dev/null` \ + ../../../tclsignal \ + `ls -dr ../../../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tclsignal*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tclsignal*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tclsignal \ + `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tclsignal*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/zlibtclConfig.sh" ; then - ac_cv_c_zlibtclconfig=`(cd $i; pwd)` + if test -f "$i/tclsignalConfig.sh" ; then + ac_cv_c_tclsignalconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/zlibtclConfig.sh" ; then - ac_cv_c_zlibtclconfig=`(cd $i/unix; pwd)` + if test -f "$i/unix/tclsignalConfig.sh" ; then + ac_cv_c_tclsignalconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_zlibtclconfig}" = x ; then + if test x"${ac_cv_c_tclsignalconfig}" = 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` \ @@ -5794,8 +5540,8 @@ $as_echo "$as_me: WARNING: --with-zlibtcl argument should refer to directory con `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/zlibtclConfig.sh" ; then - ac_cv_c_zlibtclconfig=`(cd $i; pwd)` + if test -f "$i/tclsignalConfig.sh" ; then + ac_cv_c_tclsignalconfig=`(cd $i; pwd)` break fi done @@ -5804,49 +5550,49 @@ $as_echo "$as_me: WARNING: --with-zlibtcl argument should refer to directory con fi - if test x"${ac_cv_c_zlibtclconfig}" = x ; then - zlibtcl_BIN_DIR="# no zlibtcl configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find zlibtcl configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find zlibtcl configuration definitions" >&2;} + if test x"${ac_cv_c_tclsignalconfig}" = x ; then + tclsignal_BIN_DIR="# no tclsignal configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclsignal configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tclsignal configuration definitions" >&2;} exit 0 else - no_zlibtcl= - zlibtcl_BIN_DIR=${ac_cv_c_zlibtclconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $zlibtcl_BIN_DIR/zlibtclConfig.sh" >&5 -$as_echo "found $zlibtcl_BIN_DIR/zlibtclConfig.sh" >&6; } + no_tclsignal= + tclsignal_BIN_DIR=${ac_cv_c_tclsignalconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclsignal_BIN_DIR/tclsignalConfig.sh" >&5 +$as_echo "found $tclsignal_BIN_DIR/tclsignalConfig.sh" >&6; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${zlibtcl_BIN_DIR}/zlibtclConfig.sh" >&5 -$as_echo_n "checking for existence of ${zlibtcl_BIN_DIR}/zlibtclConfig.sh... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclsignal_BIN_DIR}/tclsignalConfig.sh" >&5 +$as_echo_n "checking for existence of ${tclsignal_BIN_DIR}/tclsignalConfig.sh... " >&6; } - if test -f "${zlibtcl_BIN_DIR}/zlibtclConfig.sh" ; then + if test -f "${tclsignal_BIN_DIR}/tclsignalConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${zlibtcl_BIN_DIR}/zlibtclConfig.sh" + . "${tclsignal_BIN_DIR}/tclsignalConfig.sh" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 $as_echo "file not found" >&6; } fi # - # If the zlibtcl_BIN_DIR is the build directory (not the install directory), + # If the tclsignal_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 zlibtcl_LIB_SPEC will be set to the value - # of zlibtcl_BUILD_LIB_SPEC. An extension should make use of zlibtcl_LIB_SPEC - # instead of zlibtcl_BUILD_LIB_SPEC since it will work with both an + # For example, the variable tclsignal_LIB_SPEC will be set to the value + # of tclsignal_BUILD_LIB_SPEC. An extension should make use of tclsignal_LIB_SPEC + # instead of tclsignal_BUILD_LIB_SPEC since it will work with both an # installed and uninstalled version of Tcl. # - if test -f "${zlibtcl_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for zlibtcl" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for zlibtcl" >&2;} - zlibtcl_LIB_SPEC=${zlibtcl_BUILD_LIB_SPEC} - zlibtcl_STUB_LIB_SPEC=${zlibtcl_BUILD_STUB_LIB_SPEC} - zlibtcl_STUB_LIB_PATH=${zlibtcl_BUILD_STUB_LIB_PATH} - zlibtcl_INCLUDE_SPEC=${zlibtcl_BUILD_INCLUDE_SPEC} - zlibtcl_LIBRARY_PATH=${zlibtcl_LIBRARY_PATH} + if test -f "${tclsignal_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclsignal" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclsignal" >&2;} + tclsignal_LIB_SPEC=${tclsignal_BUILD_LIB_SPEC} + tclsignal_STUB_LIB_SPEC=${tclsignal_BUILD_STUB_LIB_SPEC} + tclsignal_STUB_LIB_PATH=${tclsignal_BUILD_STUB_LIB_PATH} + tclsignal_INCLUDE_SPEC=${tclsignal_BUILD_INCLUDE_SPEC} + tclsignal_LIBRARY_PATH=${tclsignal_LIBRARY_PATH} fi @@ -5866,18 +5612,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for zlibtc # 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${zlibtcl_STUB_LIB_SPEC}" = x; then : + if test "x${tclsignal_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For ZLIBTCL_STUB library for LIBS" >&5 -$as_echo_n "checking For ZLIBTCL_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLSIGNAL_STUB library for LIBS" >&5 +$as_echo_n "checking For TCLSIGNAL_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${ZLIBTCL_STUB_LIB_SPEC}" != "x" ; then + if test "x${TCLSIGNAL_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${ZLIBTCL_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TCLSIGNAL_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5891,11 +5637,11 @@ $as_echo_n "checking For ZLIBTCL_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using ZLIBTCL_STUB_LIB_PATH ${ZLIBTCL_STUB_LIB_PATH}" >&5 -$as_echo "using ZLIBTCL_STUB_LIB_PATH ${ZLIBTCL_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLSIGNAL_STUB_LIB_PATH ${TCLSIGNAL_STUB_LIB_PATH}" >&5 +$as_echo "using TCLSIGNAL_STUB_LIB_PATH ${TCLSIGNAL_STUB_LIB_PATH}" >&6; } else - vars="${ZLIBTCL_STUB_LIB_SPEC}" + vars="${TCLSIGNAL_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5909,8 +5655,8 @@ $as_echo "using ZLIBTCL_STUB_LIB_PATH ${ZLIBTCL_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using ZLIBTCL_STUB_LIB_SPEC ${ZLIBTCL_STUB_LIB_SPEC}" >&5 -$as_echo "using ZLIBTCL_STUB_LIB_SPEC ${ZLIBTCL_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLSIGNAL_STUB_LIB_SPEC ${TCLSIGNAL_STUB_LIB_SPEC}" >&5 +$as_echo "using TCLSIGNAL_STUB_LIB_SPEC ${TCLSIGNAL_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5919,16 +5665,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For zlibtcl_STUB library for LIBS" >&5 -$as_echo_n "checking For zlibtcl_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tclsignal_STUB library for LIBS" >&5 +$as_echo_n "checking For tclsignal_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${zlibtcl_STUB_LIB_SPEC}" != "x" ; then + if test "x${tclsignal_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${zlibtcl_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tclsignal_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5942,11 +5688,11 @@ $as_echo_n "checking For zlibtcl_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using zlibtcl_STUB_LIB_PATH ${zlibtcl_STUB_LIB_PATH}" >&5 -$as_echo "using zlibtcl_STUB_LIB_PATH ${zlibtcl_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclsignal_STUB_LIB_PATH ${tclsignal_STUB_LIB_PATH}" >&5 +$as_echo "using tclsignal_STUB_LIB_PATH ${tclsignal_STUB_LIB_PATH}" >&6; } else - vars="${zlibtcl_STUB_LIB_SPEC}" + vars="${tclsignal_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5960,8 +5706,8 @@ $as_echo "using zlibtcl_STUB_LIB_PATH ${zlibtcl_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using zlibtcl_STUB_LIB_SPEC ${zlibtcl_STUB_LIB_SPEC}" >&5 -$as_echo "using zlibtcl_STUB_LIB_SPEC ${zlibtcl_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclsignal_STUB_LIB_SPEC ${tclsignal_STUB_LIB_SPEC}" >&5 +$as_echo "using tclsignal_STUB_LIB_SPEC ${tclsignal_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5975,81 +5721,81 @@ fi # - # Ok, lets find the tkimg configuration + # Ok, lets find the tclzvfs configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tkimg + # the alternative search directory is invoked by --with-tclzvfs # - if test x"${no_tkimg}" = x ; then - # we reset no_tkimg in case something fails here - no_tkimg=true + if test x"${no_tclzvfs}" = x ; then + # we reset no_tclzvfs in case something fails here + no_tclzvfs=true -# Check whether --with-tkimg was given. -if test "${with_tkimg+set}" = set; then : - withval=$with_tkimg; with_tkimgconfig=${withval} +# Check whether --with-tclzvfs was given. +if test "${with_tclzvfs+set}" = set; then : + withval=$with_tclzvfs; with_tclzvfsconfig=${withval} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkimg configuration" >&5 -$as_echo_n "checking for tkimg configuration... " >&6; } - if ${ac_cv_c_tkimgconfig+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclzvfs configuration" >&5 +$as_echo_n "checking for tclzvfs configuration... " >&6; } + if ${ac_cv_c_tclzvfsconfig+:} false; then : $as_echo_n "(cached) " >&6 else - # First check to see if --with-tkimg was specified. - if test x"${with_tkimgconfig}" != x ; then - case ${with_tkimgconfig} in - */tkimgConfig.sh ) - if test -f ${with_tkimgconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&2;} - with_tkimgconfig=`echo ${with_tkimgconfig} | sed 's!/tkimgConfig\.sh$!!'` + # First check to see if --with-tclzvfs was specified. + if test x"${with_tclzvfsconfig}" != x ; then + case ${with_tclzvfsconfig} in + */tclzvfsConfig.sh ) + if test -f ${with_tclzvfsconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tclzvfs argument should refer to directory containing tclzvfsConfig.sh, not to tclzvfsConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tclzvfs argument should refer to directory containing tclzvfsConfig.sh, not to tclzvfsConfig.sh itself" >&2;} + with_tclzvfsconfig=`echo ${with_tclzvfsconfig} | sed 's!/tclzvfsConfig\.sh$!!'` fi;; esac - if test -f "${with_tkimgconfig}/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd ${with_tkimgconfig}; pwd)` + if test -f "${with_tclzvfsconfig}/tclzvfsConfig.sh" ; then + ac_cv_c_tclzvfsconfig=`(cd ${with_tclzvfsconfig}; pwd)` else - as_fn_error $? "${with_tkimgconfig} directory doesn't contain tkimgConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_tclzvfsconfig} directory doesn't contain tclzvfsConfig.sh" "$LINENO" 5 fi fi - # then check for a private tkimg installation - if test x"${ac_cv_c_tkimgconfig}" = x ; then + # then check for a private tclzvfs installation + if test x"${ac_cv_c_tclzvfsconfig}" = x ; then for i in \ - ../tkimg \ - `ls -dr ../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tkimg*[0-9].[0-9]* 2>/dev/null` \ - ../../tkimg \ - `ls -dr ../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tkimg*[0-9].[0-9]* 2>/dev/null` \ - ../../../tkimg \ - `ls -dr ../../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tkimg*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tkimg \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ../tclzvfs \ + `ls -dr ../tclzvfs*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tclzvfs*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tclzvfs*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tclzvfs*[0-9].[0-9]* 2>/dev/null` \ + ../../tclzvfs \ + `ls -dr ../../tclzvfs*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tclzvfs*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tclzvfs*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tclzvfs*[0-9].[0-9]* 2>/dev/null` \ + ../../../tclzvfs \ + `ls -dr ../../../tclzvfs*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tclzvfs*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tclzvfs*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tclzvfs*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tclzvfs \ + `ls -dr ${srcdir}/../tclzvfs*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tclzvfs*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tclzvfs*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tclzvfs*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd $i; pwd)` + if test -f "$i/tclzvfsConfig.sh" ; then + ac_cv_c_tclzvfsconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd $i/unix; pwd)` + if test -f "$i/unix/tclzvfsConfig.sh" ; then + ac_cv_c_tclzvfsconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_tkimgconfig}" = x ; then + if test x"${ac_cv_c_tclzvfsconfig}" = 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` \ @@ -6058,8 +5804,8 @@ $as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory conta `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd $i; pwd)` + if test -f "$i/tclzvfsConfig.sh" ; then + ac_cv_c_tclzvfsconfig=`(cd $i; pwd)` break fi done @@ -6068,49 +5814,49 @@ $as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory conta fi - if test x"${ac_cv_c_tkimgconfig}" = x ; then - tkimg_BIN_DIR="# no tkimg configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkimg configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tkimg configuration definitions" >&2;} + if test x"${ac_cv_c_tclzvfsconfig}" = x ; then + tclzvfs_BIN_DIR="# no tclzvfs configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tclzvfs configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tclzvfs configuration definitions" >&2;} exit 0 else - no_tkimg= - tkimg_BIN_DIR=${ac_cv_c_tkimgconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkimg_BIN_DIR/tkimgConfig.sh" >&5 -$as_echo "found $tkimg_BIN_DIR/tkimgConfig.sh" >&6; } + no_tclzvfs= + tclzvfs_BIN_DIR=${ac_cv_c_tclzvfsconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tclzvfs_BIN_DIR/tclzvfsConfig.sh" >&5 +$as_echo "found $tclzvfs_BIN_DIR/tclzvfsConfig.sh" >&6; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh" >&5 -$as_echo_n "checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tclzvfs_BIN_DIR}/tclzvfsConfig.sh" >&5 +$as_echo_n "checking for existence of ${tclzvfs_BIN_DIR}/tclzvfsConfig.sh... " >&6; } - if test -f "${tkimg_BIN_DIR}/tkimgConfig.sh" ; then + if test -f "${tclzvfs_BIN_DIR}/tclzvfsConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tkimg_BIN_DIR}/tkimgConfig.sh" + . "${tclzvfs_BIN_DIR}/tclzvfsConfig.sh" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 $as_echo "file not found" >&6; } fi # - # If the tkimg_BIN_DIR is the build directory (not the install directory), + # If the tclzvfs_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 tkimg_LIB_SPEC will be set to the value - # of tkimg_BUILD_LIB_SPEC. An extension should make use of tkimg_LIB_SPEC - # instead of tkimg_BUILD_LIB_SPEC since it will work with both an + # For example, the variable tclzvfs_LIB_SPEC will be set to the value + # of tclzvfs_BUILD_LIB_SPEC. An extension should make use of tclzvfs_LIB_SPEC + # instead of tclzvfs_BUILD_LIB_SPEC since it will work with both an # installed and uninstalled version of Tcl. # - if test -f "${tkimg_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkimg" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimg" >&2;} - tkimg_LIB_SPEC=${tkimg_BUILD_LIB_SPEC} - tkimg_STUB_LIB_SPEC=${tkimg_BUILD_STUB_LIB_SPEC} - tkimg_STUB_LIB_PATH=${tkimg_BUILD_STUB_LIB_PATH} - tkimg_INCLUDE_SPEC=${tkimg_BUILD_INCLUDE_SPEC} - tkimg_LIBRARY_PATH=${tkimg_LIBRARY_PATH} + if test -f "${tclzvfs_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tclzvfs" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tclzvfs" >&2;} + tclzvfs_LIB_SPEC=${tclzvfs_BUILD_LIB_SPEC} + tclzvfs_STUB_LIB_SPEC=${tclzvfs_BUILD_STUB_LIB_SPEC} + tclzvfs_STUB_LIB_PATH=${tclzvfs_BUILD_STUB_LIB_PATH} + tclzvfs_INCLUDE_SPEC=${tclzvfs_BUILD_INCLUDE_SPEC} + tclzvfs_LIBRARY_PATH=${tclzvfs_LIBRARY_PATH} fi @@ -6130,18 +5876,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimg" # 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${tkimg_STUB_LIB_SPEC}" = x; then : + if test "x${tclzvfs_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKIMG_STUB library for LIBS" >&5 -$as_echo_n "checking For TKIMG_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TCLZVFS_STUB library for LIBS" >&5 +$as_echo_n "checking For TCLZVFS_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${TKIMG_STUB_LIB_SPEC}" != "x" ; then + if test "x${TCLZVFS_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TKIMG_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TCLZVFS_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6155,11 +5901,11 @@ $as_echo_n "checking For TKIMG_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&5 -$as_echo "using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLZVFS_STUB_LIB_PATH ${TCLZVFS_STUB_LIB_PATH}" >&5 +$as_echo "using TCLZVFS_STUB_LIB_PATH ${TCLZVFS_STUB_LIB_PATH}" >&6; } else - vars="${TKIMG_STUB_LIB_SPEC}" + vars="${TCLZVFS_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6173,8 +5919,8 @@ $as_echo "using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_SPEC ${TKIMG_STUB_LIB_SPEC}" >&5 -$as_echo "using TKIMG_STUB_LIB_SPEC ${TKIMG_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TCLZVFS_STUB_LIB_SPEC ${TCLZVFS_STUB_LIB_SPEC}" >&5 +$as_echo "using TCLZVFS_STUB_LIB_SPEC ${TCLZVFS_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -6183,16 +5929,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tkimg_STUB library for LIBS" >&5 -$as_echo_n "checking For tkimg_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tclzvfs_STUB library for LIBS" >&5 +$as_echo_n "checking For tclzvfs_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${tkimg_STUB_LIB_SPEC}" != "x" ; then + if test "x${tclzvfs_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tkimg_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tclzvfs_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6206,11 +5952,11 @@ $as_echo_n "checking For tkimg_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&5 -$as_echo "using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclzvfs_STUB_LIB_PATH ${tclzvfs_STUB_LIB_PATH}" >&5 +$as_echo "using tclzvfs_STUB_LIB_PATH ${tclzvfs_STUB_LIB_PATH}" >&6; } else - vars="${tkimg_STUB_LIB_SPEC}" + vars="${tclzvfs_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6224,8 +5970,8 @@ $as_echo "using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_SPEC ${tkimg_STUB_LIB_SPEC}" >&5 -$as_echo "using tkimg_STUB_LIB_SPEC ${tkimg_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclzvfs_STUB_LIB_SPEC ${tclzvfs_STUB_LIB_SPEC}" >&5 +$as_echo "using tclzvfs_STUB_LIB_SPEC ${tclzvfs_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -6767,6 +6513,270 @@ fi # + # Ok, lets find the tkimg configuration + # First, look for one uninstalled. + # the alternative search directory is invoked by --with-tkimg + # + + if test x"${no_tkimg}" = x ; then + # we reset no_tkimg in case something fails here + no_tkimg=true + +# Check whether --with-tkimg was given. +if test "${with_tkimg+set}" = set; then : + withval=$with_tkimg; with_tkimgconfig=${withval} +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkimg configuration" >&5 +$as_echo_n "checking for tkimg configuration... " >&6; } + if ${ac_cv_c_tkimgconfig+:} false; then : + $as_echo_n "(cached) " >&6 +else + + + # First check to see if --with-tkimg was specified. + if test x"${with_tkimgconfig}" != x ; then + case ${with_tkimgconfig} in + */tkimgConfig.sh ) + if test -f ${with_tkimgconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&2;} + with_tkimgconfig=`echo ${with_tkimgconfig} | sed 's!/tkimgConfig\.sh$!!'` + fi;; + esac + if test -f "${with_tkimgconfig}/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd ${with_tkimgconfig}; pwd)` + else + as_fn_error $? "${with_tkimgconfig} directory doesn't contain tkimgConfig.sh" "$LINENO" 5 + fi + fi + + # then check for a private tkimg installation + if test x"${ac_cv_c_tkimgconfig}" = x ; then + for i in \ + ../tkimg \ + `ls -dr ../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ../../tkimg \ + `ls -dr ../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ../../../tkimg \ + `ls -dr ../../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tkimg \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ; do + if test -f "$i/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd $i; pwd)` + break + fi + if test -f "$i/unix/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + + # check in a few common install locations + if test x"${ac_cv_c_tkimgconfig}" = 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/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd $i; pwd)` + break + fi + done + fi + +fi + + + if test x"${ac_cv_c_tkimgconfig}" = x ; then + tkimg_BIN_DIR="# no tkimg configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkimg configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tkimg configuration definitions" >&2;} + exit 0 + else + no_tkimg= + tkimg_BIN_DIR=${ac_cv_c_tkimgconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkimg_BIN_DIR/tkimgConfig.sh" >&5 +$as_echo "found $tkimg_BIN_DIR/tkimgConfig.sh" >&6; } + fi + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh" >&5 +$as_echo_n "checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh... " >&6; } + + if test -f "${tkimg_BIN_DIR}/tkimgConfig.sh" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } + . "${tkimg_BIN_DIR}/tkimgConfig.sh" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 +$as_echo "file not found" >&6; } + fi + + # + # If the tkimg_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 tkimg_LIB_SPEC will be set to the value + # of tkimg_BUILD_LIB_SPEC. An extension should make use of tkimg_LIB_SPEC + # instead of tkimg_BUILD_LIB_SPEC since it will work with both an + # installed and uninstalled version of Tcl. + # + + if test -f "${tkimg_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkimg" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimg" >&2;} + tkimg_LIB_SPEC=${tkimg_BUILD_LIB_SPEC} + tkimg_STUB_LIB_SPEC=${tkimg_BUILD_STUB_LIB_SPEC} + tkimg_STUB_LIB_PATH=${tkimg_BUILD_STUB_LIB_PATH} + tkimg_INCLUDE_SPEC=${tkimg_BUILD_INCLUDE_SPEC} + tkimg_LIBRARY_PATH=${tkimg_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${tkimg_STUB_LIB_SPEC}" = x; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKIMG_STUB library for LIBS" >&5 +$as_echo_n "checking For TKIMG_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${TKIMG_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${TKIMG_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&5 +$as_echo "using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&6; } + else + + vars="${TKIMG_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_SPEC ${TKIMG_STUB_LIB_SPEC}" >&5 +$as_echo "using TKIMG_STUB_LIB_SPEC ${TKIMG_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 tkimg_STUB library for LIBS" >&5 +$as_echo_n "checking For tkimg_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${tkimg_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${tkimg_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&5 +$as_echo "using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&6; } + else + + vars="${tkimg_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_SPEC ${tkimg_STUB_LIB_SPEC}" >&5 +$as_echo "using tkimg_STUB_LIB_SPEC ${tkimg_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 @@ -7293,6 +7303,270 @@ fi fi + + # + # Ok, lets find the tktable configuration + # First, look for one uninstalled. + # the alternative search directory is invoked by --with-tktable + # + + if test x"${no_tktable}" = x ; then + # we reset no_tktable in case something fails here + no_tktable=true + +# Check whether --with-tktable was given. +if test "${with_tktable+set}" = set; then : + withval=$with_tktable; with_tktableconfig=${withval} +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tktable configuration" >&5 +$as_echo_n "checking for tktable configuration... " >&6; } + if ${ac_cv_c_tktableconfig+:} false; then : + $as_echo_n "(cached) " >&6 +else + + + # First check to see if --with-tktable was specified. + if test x"${with_tktableconfig}" != x ; then + case ${with_tktableconfig} in + */tktableConfig.sh ) + if test -f ${with_tktableconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tktable argument should refer to directory containing tktableConfig.sh, not to tktableConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tktable argument should refer to directory containing tktableConfig.sh, not to tktableConfig.sh itself" >&2;} + with_tktableconfig=`echo ${with_tktableconfig} | sed 's!/tktableConfig\.sh$!!'` + fi;; + esac + if test -f "${with_tktableconfig}/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd ${with_tktableconfig}; pwd)` + else + as_fn_error $? "${with_tktableconfig} directory doesn't contain tktableConfig.sh" "$LINENO" 5 + fi + fi + + # then check for a private tktable installation + if test x"${ac_cv_c_tktableconfig}" = x ; then + for i in \ + ../tktable \ + `ls -dr ../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tktable*[0-9].[0-9]* 2>/dev/null` \ + ../../tktable \ + `ls -dr ../../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tktable*[0-9].[0-9]* 2>/dev/null` \ + ../../../tktable \ + `ls -dr ../../../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tktable*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tktable \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9]* 2>/dev/null` \ + ; do + if test -f "$i/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd $i; pwd)` + break + fi + if test -f "$i/unix/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + + # check in a few common install locations + if test x"${ac_cv_c_tktableconfig}" = 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/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd $i; pwd)` + break + fi + done + fi + +fi + + + if test x"${ac_cv_c_tktableconfig}" = x ; then + tktable_BIN_DIR="# no tktable configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tktable configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tktable configuration definitions" >&2;} + exit 0 + else + no_tktable= + tktable_BIN_DIR=${ac_cv_c_tktableconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tktable_BIN_DIR/tktableConfig.sh" >&5 +$as_echo "found $tktable_BIN_DIR/tktableConfig.sh" >&6; } + fi + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tktable_BIN_DIR}/tktableConfig.sh" >&5 +$as_echo_n "checking for existence of ${tktable_BIN_DIR}/tktableConfig.sh... " >&6; } + + if test -f "${tktable_BIN_DIR}/tktableConfig.sh" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } + . "${tktable_BIN_DIR}/tktableConfig.sh" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 +$as_echo "file not found" >&6; } + fi + + # + # If the tktable_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 tktable_LIB_SPEC will be set to the value + # of tktable_BUILD_LIB_SPEC. An extension should make use of tktable_LIB_SPEC + # instead of tktable_BUILD_LIB_SPEC since it will work with both an + # installed and uninstalled version of Tcl. + # + + if test -f "${tktable_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tktable" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tktable" >&2;} + tktable_LIB_SPEC=${tktable_BUILD_LIB_SPEC} + tktable_STUB_LIB_SPEC=${tktable_BUILD_STUB_LIB_SPEC} + tktable_STUB_LIB_PATH=${tktable_BUILD_STUB_LIB_PATH} + tktable_INCLUDE_SPEC=${tktable_BUILD_INCLUDE_SPEC} + tktable_LIBRARY_PATH=${tktable_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${tktable_STUB_LIB_SPEC}" = x; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKTABLE_STUB library for LIBS" >&5 +$as_echo_n "checking For TKTABLE_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${TKTABLE_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${TKTABLE_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKTABLE_STUB_LIB_PATH ${TKTABLE_STUB_LIB_PATH}" >&5 +$as_echo "using TKTABLE_STUB_LIB_PATH ${TKTABLE_STUB_LIB_PATH}" >&6; } + else + + vars="${TKTABLE_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKTABLE_STUB_LIB_SPEC ${TKTABLE_STUB_LIB_SPEC}" >&5 +$as_echo "using TKTABLE_STUB_LIB_SPEC ${TKTABLE_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 tktable_STUB library for LIBS" >&5 +$as_echo_n "checking For tktable_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${tktable_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${tktable_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tktable_STUB_LIB_PATH ${tktable_STUB_LIB_PATH}" >&5 +$as_echo "using tktable_STUB_LIB_PATH ${tktable_STUB_LIB_PATH}" >&6; } + else + + vars="${tktable_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tktable_STUB_LIB_SPEC ${tktable_STUB_LIB_SPEC}" >&5 +$as_echo "using tktable_STUB_LIB_SPEC ${tktable_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 + + #----------------------------------------------------------------------- # Handle the --prefix=... option by defaulting to what Tcl gave. # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER. diff --git a/ds9/unix/configure.ac b/ds9/unix/configure.ac index 7fee915..20aacd6 100644 --- a/ds9/unix/configure.ac +++ b/ds9/unix/configure.ac @@ -49,18 +49,6 @@ TEA_LOAD_TKCONFIG # Load the *.sh file if necessary #-------------------------------------------------------------------- -TEA_PATH_CONFIG(tclcheckdns) -TEA_LOAD_CONFIG(tclcheckdns) - -TEA_PATH_CONFIG(tcliis) -TEA_LOAD_CONFIG(tcliis) - -TEA_PATH_CONFIG(tclsignal) -TEA_LOAD_CONFIG(tclsignal) - -TEA_PATH_CONFIG(tclzvfs) -TEA_LOAD_CONFIG(tclzvfs) - TEA_PATH_CONFIG(tifftcl) TEA_LOAD_CONFIG(tifftcl) @@ -73,8 +61,17 @@ TEA_LOAD_CONFIG(jpegtcl) TEA_PATH_CONFIG(zlibtcl) TEA_LOAD_CONFIG(zlibtcl) -TEA_PATH_CONFIG(tkimg) -TEA_LOAD_CONFIG(tkimg) +TEA_PATH_CONFIG(tclcheckdns) +TEA_LOAD_CONFIG(tclcheckdns) + +TEA_PATH_CONFIG(tcliis) +TEA_LOAD_CONFIG(tcliis) + +TEA_PATH_CONFIG(tclsignal) +TEA_LOAD_CONFIG(tclsignal) + +TEA_PATH_CONFIG(tclzvfs) +TEA_LOAD_CONFIG(tclzvfs) TEA_PATH_CONFIG(tkblt) TEA_LOAD_CONFIG(tkblt) @@ -82,12 +79,18 @@ TEA_LOAD_CONFIG(tkblt) TEA_PATH_CONFIG(tkhtml1) TEA_LOAD_CONFIG(tkhtml1) +TEA_PATH_CONFIG(tkimg) +TEA_LOAD_CONFIG(tkimg) + TEA_PATH_CONFIG(tkmpeg) TEA_LOAD_CONFIG(tkmpeg) TEA_PATH_CONFIG(tksao) TEA_LOAD_CONFIG(tksao) +TEA_PATH_CONFIG(tktable) +TEA_LOAD_CONFIG(tktable) + #----------------------------------------------------------------------- # Handle the --prefix=... option by defaulting to what Tcl gave. # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER. diff --git a/ds9/win/Makefile.in b/ds9/win/Makefile.in index 9287810..08f8ed9 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -28,6 +28,7 @@ tkblt_LIB_SPEC = @tkblt_LIB_SPEC@ tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@ tkmpeg_LIB_SPEC = @tkmpeg_LIB_SPEC@ tksao_LIB_SPEC = @tksao_LIB_SPEC@ +tktable_LIB_SPEC= @tktable_LIB_SPEC@ tkwin_LIB_SPEC = @tkwin_LIB_SPEC@ CC = @CC@ @@ -66,7 +67,6 @@ LLIBS = \ $(libdir)/libast_err.a \ $(libdir)/libast_pal.a \ $(libdir)/Tclxml$(TCLXMLVER)/Tclxml32.a \ - $(libdir)/Tktable$(TKTABLEVER)/Tktable210.a \ $(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff146.a \ $(libdir)/tkimgpng$(TKIMGVER)/libtkimgpng146.a \ $(libdir)/tkimgjpeg$(TKIMGVER)/libtkimgjpeg146.a \ @@ -102,11 +102,12 @@ ds9Base$(EXEEXT): $(OBJS) $(LLIBS) $(pngtcl_LIB_SPEC) \ $(jpegtcl_LIB_SPEC) \ $(zlibtcl_LIB_SPEC) \ - $(tkimg_LIB_SPEC) \ $(tkblt_LIB_SPEC) \ $(tkhtml1_LIB_SPEC) \ + $(tkimg_LIB_SPEC) \ $(tkmpeg_LIB_SPEC) \ $(tksao_LIB_SPEC) \ + $(tktable_LIB_SPEC) \ $(tkwin_LIB_SPEC) \ $(TK_STUB_LIB_SPEC) $(TK_LIB_SPEC) \ $(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \ diff --git a/ds9/win/configure b/ds9/win/configure index 8163257..bf84619 100755 --- a/ds9/win/configure +++ b/ds9/win/configure @@ -666,14 +666,6 @@ INSTALL_DATA INSTALL_DATA_DIR INSTALL CPP -tksao_STUB_LIB_PATH -tksao_STUB_LIB_SPEC -tksao_STUB_LIB_FILE -tksao_LIB_SPEC -tksao_LIB_FILE -tksao_SRC_DIR -tksao_BIN_DIR -tksao_VERSION tkwin_STUB_LIB_PATH tkwin_STUB_LIB_SPEC tkwin_STUB_LIB_FILE @@ -682,14 +674,22 @@ 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 +tktable_STUB_LIB_PATH +tktable_STUB_LIB_SPEC +tktable_STUB_LIB_FILE +tktable_LIB_SPEC +tktable_LIB_FILE +tktable_SRC_DIR +tktable_BIN_DIR +tktable_VERSION +tksao_STUB_LIB_PATH +tksao_STUB_LIB_SPEC +tksao_STUB_LIB_FILE +tksao_LIB_SPEC +tksao_LIB_FILE +tksao_SRC_DIR +tksao_BIN_DIR +tksao_VERSION tkmpeg_STUB_LIB_PATH tkmpeg_STUB_LIB_SPEC tkmpeg_STUB_LIB_FILE @@ -698,14 +698,6 @@ tkmpeg_LIB_FILE tkmpeg_SRC_DIR tkmpeg_BIN_DIR tkmpeg_VERSION -tkblt_STUB_LIB_PATH -tkblt_STUB_LIB_SPEC -tkblt_STUB_LIB_FILE -tkblt_LIB_SPEC -tkblt_LIB_FILE -tkblt_SRC_DIR -tkblt_BIN_DIR -tkblt_VERSION tkimg_STUB_LIB_PATH tkimg_STUB_LIB_SPEC tkimg_STUB_LIB_FILE @@ -714,6 +706,22 @@ tkimg_LIB_FILE tkimg_SRC_DIR tkimg_BIN_DIR tkimg_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 +tkblt_LIB_SPEC +tkblt_LIB_FILE +tkblt_SRC_DIR +tkblt_BIN_DIR +tkblt_VERSION zlibtcl_STUB_LIB_PATH zlibtcl_STUB_LIB_SPEC zlibtcl_STUB_LIB_FILE @@ -839,12 +847,13 @@ with_tifftcl with_pngtcl with_jpegtcl with_zlibtcl -with_tkimg with_tkblt -with_tkmpeg with_tkhtml1 -with_tkwin +with_tkimg +with_tkmpeg with_tksao +with_tktable +with_tkwin with_tclinclude with_tkinclude enable_shared @@ -1493,12 +1502,13 @@ Optional Packages: --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-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-tkimg directory containing tkimg configuration (tkimgConfig.sh) + --with-tkmpeg directory containing tkmpeg configuration (tkmpegConfig.sh) --with-tksao directory containing tksao configuration (tksaoConfig.sh) + --with-tktable directory containing tktable configuration (tktableConfig.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 --with-celib=DIR use Windows/CE support library from DIR @@ -4883,81 +4893,81 @@ fi # - # Ok, lets find the tkimg configuration + # Ok, lets find the tkblt configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tkimg + # the alternative search directory is invoked by --with-tkblt # - if test x"${no_tkimg}" = x ; then - # we reset no_tkimg in case something fails here - no_tkimg=true + if test x"${no_tkblt}" = x ; then + # we reset no_tkblt in case something fails here + no_tkblt=true -# Check whether --with-tkimg was given. -if test "${with_tkimg+set}" = set; then : - withval=$with_tkimg; with_tkimgconfig=${withval} +# Check whether --with-tkblt was given. +if test "${with_tkblt+set}" = set; then : + withval=$with_tkblt; with_tkbltconfig=${withval} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkimg configuration" >&5 -$as_echo_n "checking for tkimg configuration... " >&6; } - if ${ac_cv_c_tkimgconfig+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkblt configuration" >&5 +$as_echo_n "checking for tkblt configuration... " >&6; } + if ${ac_cv_c_tkbltconfig+:} false; then : $as_echo_n "(cached) " >&6 else - # First check to see if --with-tkimg was specified. - if test x"${with_tkimgconfig}" != x ; then - case ${with_tkimgconfig} in - */tkimgConfig.sh ) - if test -f ${with_tkimgconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&2;} - with_tkimgconfig=`echo ${with_tkimgconfig} | sed 's!/tkimgConfig\.sh$!!'` + # First check to see if --with-tkblt was specified. + if test x"${with_tkbltconfig}" != x ; then + case ${with_tkbltconfig} in + */tkbltConfig.sh ) + if test -f ${with_tkbltconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkblt argument should refer to directory containing tkbltConfig.sh, not to tkbltConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tkblt argument should refer to directory containing tkbltConfig.sh, not to tkbltConfig.sh itself" >&2;} + with_tkbltconfig=`echo ${with_tkbltconfig} | sed 's!/tkbltConfig\.sh$!!'` fi;; esac - if test -f "${with_tkimgconfig}/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd ${with_tkimgconfig}; pwd)` + if test -f "${with_tkbltconfig}/tkbltConfig.sh" ; then + ac_cv_c_tkbltconfig=`(cd ${with_tkbltconfig}; pwd)` else - as_fn_error $? "${with_tkimgconfig} directory doesn't contain tkimgConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_tkbltconfig} directory doesn't contain tkbltConfig.sh" "$LINENO" 5 fi fi - # then check for a private tkimg installation - if test x"${ac_cv_c_tkimgconfig}" = x ; then + # then check for a private tkblt installation + if test x"${ac_cv_c_tkbltconfig}" = x ; then for i in \ - ../tkimg \ - `ls -dr ../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tkimg*[0-9].[0-9]* 2>/dev/null` \ - ../../tkimg \ - `ls -dr ../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tkimg*[0-9].[0-9]* 2>/dev/null` \ - ../../../tkimg \ - `ls -dr ../../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tkimg*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tkimg \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ../tkblt \ + `ls -dr ../tkblt*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tkblt*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tkblt*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tkblt*[0-9].[0-9]* 2>/dev/null` \ + ../../tkblt \ + `ls -dr ../../tkblt*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tkblt*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tkblt*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tkblt*[0-9].[0-9]* 2>/dev/null` \ + ../../../tkblt \ + `ls -dr ../../../tkblt*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tkblt*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tkblt*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tkblt*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tkblt \ + `ls -dr ${srcdir}/../tkblt*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tkblt*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tkblt*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tkblt*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd $i; pwd)` + if test -f "$i/tkbltConfig.sh" ; then + ac_cv_c_tkbltconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd $i/unix; pwd)` + if test -f "$i/unix/tkbltConfig.sh" ; then + ac_cv_c_tkbltconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_tkimgconfig}" = x ; then + if test x"${ac_cv_c_tkbltconfig}" = 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` \ @@ -4966,8 +4976,8 @@ $as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory conta `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/tkimgConfig.sh" ; then - ac_cv_c_tkimgconfig=`(cd $i; pwd)` + if test -f "$i/tkbltConfig.sh" ; then + ac_cv_c_tkbltconfig=`(cd $i; pwd)` break fi done @@ -4976,49 +4986,49 @@ $as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory conta fi - if test x"${ac_cv_c_tkimgconfig}" = x ; then - tkimg_BIN_DIR="# no tkimg configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkimg configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tkimg configuration definitions" >&2;} + if test x"${ac_cv_c_tkbltconfig}" = x ; then + tkblt_BIN_DIR="# no tkblt configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkblt configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tkblt configuration definitions" >&2;} exit 0 else - no_tkimg= - tkimg_BIN_DIR=${ac_cv_c_tkimgconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkimg_BIN_DIR/tkimgConfig.sh" >&5 -$as_echo "found $tkimg_BIN_DIR/tkimgConfig.sh" >&6; } + no_tkblt= + tkblt_BIN_DIR=${ac_cv_c_tkbltconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkblt_BIN_DIR/tkbltConfig.sh" >&5 +$as_echo "found $tkblt_BIN_DIR/tkbltConfig.sh" >&6; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh" >&5 -$as_echo_n "checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkblt_BIN_DIR}/tkbltConfig.sh" >&5 +$as_echo_n "checking for existence of ${tkblt_BIN_DIR}/tkbltConfig.sh... " >&6; } - if test -f "${tkimg_BIN_DIR}/tkimgConfig.sh" ; then + if test -f "${tkblt_BIN_DIR}/tkbltConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tkimg_BIN_DIR}/tkimgConfig.sh" + . "${tkblt_BIN_DIR}/tkbltConfig.sh" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 $as_echo "file not found" >&6; } fi # - # If the tkimg_BIN_DIR is the build directory (not the install directory), + # If the tkblt_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 tkimg_LIB_SPEC will be set to the value - # of tkimg_BUILD_LIB_SPEC. An extension should make use of tkimg_LIB_SPEC - # instead of tkimg_BUILD_LIB_SPEC since it will work with both an + # For example, the variable tkblt_LIB_SPEC will be set to the value + # of tkblt_BUILD_LIB_SPEC. An extension should make use of tkblt_LIB_SPEC + # instead of tkblt_BUILD_LIB_SPEC since it will work with both an # installed and uninstalled version of Tcl. # - if test -f "${tkimg_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkimg" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimg" >&2;} - tkimg_LIB_SPEC=${tkimg_BUILD_LIB_SPEC} - tkimg_STUB_LIB_SPEC=${tkimg_BUILD_STUB_LIB_SPEC} - tkimg_STUB_LIB_PATH=${tkimg_BUILD_STUB_LIB_PATH} - tkimg_INCLUDE_SPEC=${tkimg_BUILD_INCLUDE_SPEC} - tkimg_LIBRARY_PATH=${tkimg_LIBRARY_PATH} + if test -f "${tkblt_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkblt" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkblt" >&2;} + tkblt_LIB_SPEC=${tkblt_BUILD_LIB_SPEC} + tkblt_STUB_LIB_SPEC=${tkblt_BUILD_STUB_LIB_SPEC} + tkblt_STUB_LIB_PATH=${tkblt_BUILD_STUB_LIB_PATH} + tkblt_INCLUDE_SPEC=${tkblt_BUILD_INCLUDE_SPEC} + tkblt_LIBRARY_PATH=${tkblt_LIBRARY_PATH} fi @@ -5038,18 +5048,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimg" # 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${tkimg_STUB_LIB_SPEC}" = x; then : + if test "x${tkblt_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKIMG_STUB library for LIBS" >&5 -$as_echo_n "checking For TKIMG_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKBLT_STUB library for LIBS" >&5 +$as_echo_n "checking For TKBLT_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${TKIMG_STUB_LIB_SPEC}" != "x" ; then + if test "x${TKBLT_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TKIMG_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TKBLT_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5063,11 +5073,11 @@ $as_echo_n "checking For TKIMG_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&5 -$as_echo "using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKBLT_STUB_LIB_PATH ${TKBLT_STUB_LIB_PATH}" >&5 +$as_echo "using TKBLT_STUB_LIB_PATH ${TKBLT_STUB_LIB_PATH}" >&6; } else - vars="${TKIMG_STUB_LIB_SPEC}" + vars="${TKBLT_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5081,8 +5091,8 @@ $as_echo "using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_SPEC ${TKIMG_STUB_LIB_SPEC}" >&5 -$as_echo "using TKIMG_STUB_LIB_SPEC ${TKIMG_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKBLT_STUB_LIB_SPEC ${TKBLT_STUB_LIB_SPEC}" >&5 +$as_echo "using TKBLT_STUB_LIB_SPEC ${TKBLT_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5091,16 +5101,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tkimg_STUB library for LIBS" >&5 -$as_echo_n "checking For tkimg_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tkblt_STUB library for LIBS" >&5 +$as_echo_n "checking For tkblt_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${tkimg_STUB_LIB_SPEC}" != "x" ; then + if test "x${tkblt_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tkimg_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tkblt_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5114,11 +5124,11 @@ $as_echo_n "checking For tkimg_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&5 -$as_echo "using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkblt_STUB_LIB_PATH ${tkblt_STUB_LIB_PATH}" >&5 +$as_echo "using tkblt_STUB_LIB_PATH ${tkblt_STUB_LIB_PATH}" >&6; } else - vars="${tkimg_STUB_LIB_SPEC}" + vars="${tkblt_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5132,8 +5142,8 @@ $as_echo "using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_SPEC ${tkimg_STUB_LIB_SPEC}" >&5 -$as_echo "using tkimg_STUB_LIB_SPEC ${tkimg_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkblt_STUB_LIB_SPEC ${tkblt_STUB_LIB_SPEC}" >&5 +$as_echo "using tkblt_STUB_LIB_SPEC ${tkblt_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5147,81 +5157,81 @@ fi # - # Ok, lets find the tkblt configuration + # Ok, lets find the tkhtml1 configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tkblt + # the alternative search directory is invoked by --with-tkhtml1 # - if test x"${no_tkblt}" = x ; then - # we reset no_tkblt in case something fails here - no_tkblt=true + if test x"${no_tkhtml1}" = x ; then + # we reset no_tkhtml1 in case something fails here + no_tkhtml1=true -# Check whether --with-tkblt was given. -if test "${with_tkblt+set}" = set; then : - withval=$with_tkblt; with_tkbltconfig=${withval} +# 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 tkblt configuration" >&5 -$as_echo_n "checking for tkblt configuration... " >&6; } - if ${ac_cv_c_tkbltconfig+:} false; then : + { $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-tkblt was specified. - if test x"${with_tkbltconfig}" != x ; then - case ${with_tkbltconfig} in - */tkbltConfig.sh ) - if test -f ${with_tkbltconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkblt argument should refer to directory containing tkbltConfig.sh, not to tkbltConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tkblt argument should refer to directory containing tkbltConfig.sh, not to tkbltConfig.sh itself" >&2;} - with_tkbltconfig=`echo ${with_tkbltconfig} | sed 's!/tkbltConfig\.sh$!!'` + # 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_tkbltconfig}/tkbltConfig.sh" ; then - ac_cv_c_tkbltconfig=`(cd ${with_tkbltconfig}; pwd)` + if test -f "${with_tkhtml1config}/tkhtml1Config.sh" ; then + ac_cv_c_tkhtml1config=`(cd ${with_tkhtml1config}; pwd)` else - as_fn_error $? "${with_tkbltconfig} directory doesn't contain tkbltConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_tkhtml1config} directory doesn't contain tkhtml1Config.sh" "$LINENO" 5 fi fi - # then check for a private tkblt installation - if test x"${ac_cv_c_tkbltconfig}" = x ; then + # then check for a private tkhtml1 installation + if test x"${ac_cv_c_tkhtml1config}" = x ; then for i in \ - ../tkblt \ - `ls -dr ../tkblt*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tkblt*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tkblt*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tkblt*[0-9].[0-9]* 2>/dev/null` \ - ../../tkblt \ - `ls -dr ../../tkblt*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tkblt*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tkblt*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tkblt*[0-9].[0-9]* 2>/dev/null` \ - ../../../tkblt \ - `ls -dr ../../../tkblt*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tkblt*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tkblt*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tkblt*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tkblt \ - `ls -dr ${srcdir}/../tkblt*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tkblt*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tkblt*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tkblt*[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` \ + ../../../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/tkbltConfig.sh" ; then - ac_cv_c_tkbltconfig=`(cd $i; pwd)` + if test -f "$i/tkhtml1Config.sh" ; then + ac_cv_c_tkhtml1config=`(cd $i; pwd)` break fi - if test -f "$i/unix/tkbltConfig.sh" ; then - ac_cv_c_tkbltconfig=`(cd $i/unix; pwd)` + 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_tkbltconfig}" = x ; then + 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` \ @@ -5230,8 +5240,8 @@ $as_echo "$as_me: WARNING: --with-tkblt argument should refer to directory conta `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/tkbltConfig.sh" ; then - ac_cv_c_tkbltconfig=`(cd $i; pwd)` + if test -f "$i/tkhtml1Config.sh" ; then + ac_cv_c_tkhtml1config=`(cd $i; pwd)` break fi done @@ -5240,49 +5250,49 @@ $as_echo "$as_me: WARNING: --with-tkblt argument should refer to directory conta fi - if test x"${ac_cv_c_tkbltconfig}" = x ; then - tkblt_BIN_DIR="# no tkblt configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkblt configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tkblt configuration definitions" >&2;} + 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_tkblt= - tkblt_BIN_DIR=${ac_cv_c_tkbltconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkblt_BIN_DIR/tkbltConfig.sh" >&5 -$as_echo "found $tkblt_BIN_DIR/tkbltConfig.sh" >&6; } + 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 ${tkblt_BIN_DIR}/tkbltConfig.sh" >&5 -$as_echo_n "checking for existence of ${tkblt_BIN_DIR}/tkbltConfig.sh... " >&6; } + { $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 "${tkblt_BIN_DIR}/tkbltConfig.sh" ; then + if test -f "${tkhtml1_BIN_DIR}/tkhtml1Config.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tkblt_BIN_DIR}/tkbltConfig.sh" + . "${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 tkblt_BIN_DIR is the build directory (not the install directory), + # 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 tkblt_LIB_SPEC will be set to the value - # of tkblt_BUILD_LIB_SPEC. An extension should make use of tkblt_LIB_SPEC - # instead of tkblt_BUILD_LIB_SPEC since it will work with both an + # 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 "${tkblt_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkblt" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkblt" >&2;} - tkblt_LIB_SPEC=${tkblt_BUILD_LIB_SPEC} - tkblt_STUB_LIB_SPEC=${tkblt_BUILD_STUB_LIB_SPEC} - tkblt_STUB_LIB_PATH=${tkblt_BUILD_STUB_LIB_PATH} - tkblt_INCLUDE_SPEC=${tkblt_BUILD_INCLUDE_SPEC} - tkblt_LIBRARY_PATH=${tkblt_LIBRARY_PATH} + 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 @@ -5302,18 +5312,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkblt" # 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${tkblt_STUB_LIB_SPEC}" = x; then : + if test "x${tkhtml1_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKBLT_STUB library for LIBS" >&5 -$as_echo_n "checking For TKBLT_STUB library for LIBS... " >&6; } + { $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${TKBLT_STUB_LIB_SPEC}" != "x" ; then + if test "x${TKHTML1_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TKBLT_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TKHTML1_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5327,11 +5337,11 @@ $as_echo_n "checking For TKBLT_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKBLT_STUB_LIB_PATH ${TKBLT_STUB_LIB_PATH}" >&5 -$as_echo "using TKBLT_STUB_LIB_PATH ${TKBLT_STUB_LIB_PATH}" >&6; } + { $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="${TKBLT_STUB_LIB_SPEC}" + vars="${TKHTML1_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5345,8 +5355,8 @@ $as_echo "using TKBLT_STUB_LIB_PATH ${TKBLT_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKBLT_STUB_LIB_SPEC ${TKBLT_STUB_LIB_SPEC}" >&5 -$as_echo "using TKBLT_STUB_LIB_SPEC ${TKBLT_STUB_LIB_SPEC}" >&6; } + { $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 @@ -5355,16 +5365,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tkblt_STUB library for LIBS" >&5 -$as_echo_n "checking For tkblt_STUB library for LIBS... " >&6; } + { $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${tkblt_STUB_LIB_SPEC}" != "x" ; then + if test "x${tkhtml1_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tkblt_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tkhtml1_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5378,11 +5388,11 @@ $as_echo_n "checking For tkblt_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkblt_STUB_LIB_PATH ${tkblt_STUB_LIB_PATH}" >&5 -$as_echo "using tkblt_STUB_LIB_PATH ${tkblt_STUB_LIB_PATH}" >&6; } + { $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="${tkblt_STUB_LIB_SPEC}" + vars="${tkhtml1_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5396,8 +5406,272 @@ $as_echo "using tkblt_STUB_LIB_PATH ${tkblt_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkblt_STUB_LIB_SPEC ${tkblt_STUB_LIB_SPEC}" >&5 -$as_echo "using tkblt_STUB_LIB_SPEC ${tkblt_STUB_LIB_SPEC}" >&6; } + { $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 tkimg configuration + # First, look for one uninstalled. + # the alternative search directory is invoked by --with-tkimg + # + + if test x"${no_tkimg}" = x ; then + # we reset no_tkimg in case something fails here + no_tkimg=true + +# Check whether --with-tkimg was given. +if test "${with_tkimg+set}" = set; then : + withval=$with_tkimg; with_tkimgconfig=${withval} +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkimg configuration" >&5 +$as_echo_n "checking for tkimg configuration... " >&6; } + if ${ac_cv_c_tkimgconfig+:} false; then : + $as_echo_n "(cached) " >&6 +else + + + # First check to see if --with-tkimg was specified. + if test x"${with_tkimgconfig}" != x ; then + case ${with_tkimgconfig} in + */tkimgConfig.sh ) + if test -f ${with_tkimgconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tkimg argument should refer to directory containing tkimgConfig.sh, not to tkimgConfig.sh itself" >&2;} + with_tkimgconfig=`echo ${with_tkimgconfig} | sed 's!/tkimgConfig\.sh$!!'` + fi;; + esac + if test -f "${with_tkimgconfig}/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd ${with_tkimgconfig}; pwd)` + else + as_fn_error $? "${with_tkimgconfig} directory doesn't contain tkimgConfig.sh" "$LINENO" 5 + fi + fi + + # then check for a private tkimg installation + if test x"${ac_cv_c_tkimgconfig}" = x ; then + for i in \ + ../tkimg \ + `ls -dr ../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ../../tkimg \ + `ls -dr ../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ../../../tkimg \ + `ls -dr ../../../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tkimg \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tkimg*[0-9].[0-9]* 2>/dev/null` \ + ; do + if test -f "$i/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd $i; pwd)` + break + fi + if test -f "$i/unix/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd $i/unix; pwd)` + break + fi + done + fi + + # check in a few common install locations + if test x"${ac_cv_c_tkimgconfig}" = 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/tkimgConfig.sh" ; then + ac_cv_c_tkimgconfig=`(cd $i; pwd)` + break + fi + done + fi + +fi + + + if test x"${ac_cv_c_tkimgconfig}" = x ; then + tkimg_BIN_DIR="# no tkimg configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkimg configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tkimg configuration definitions" >&2;} + exit 0 + else + no_tkimg= + tkimg_BIN_DIR=${ac_cv_c_tkimgconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkimg_BIN_DIR/tkimgConfig.sh" >&5 +$as_echo "found $tkimg_BIN_DIR/tkimgConfig.sh" >&6; } + fi + fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh" >&5 +$as_echo_n "checking for existence of ${tkimg_BIN_DIR}/tkimgConfig.sh... " >&6; } + + if test -f "${tkimg_BIN_DIR}/tkimgConfig.sh" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } + . "${tkimg_BIN_DIR}/tkimgConfig.sh" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 +$as_echo "file not found" >&6; } + fi + + # + # If the tkimg_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 tkimg_LIB_SPEC will be set to the value + # of tkimg_BUILD_LIB_SPEC. An extension should make use of tkimg_LIB_SPEC + # instead of tkimg_BUILD_LIB_SPEC since it will work with both an + # installed and uninstalled version of Tcl. + # + + if test -f "${tkimg_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkimg" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkimg" >&2;} + tkimg_LIB_SPEC=${tkimg_BUILD_LIB_SPEC} + tkimg_STUB_LIB_SPEC=${tkimg_BUILD_STUB_LIB_SPEC} + tkimg_STUB_LIB_PATH=${tkimg_BUILD_STUB_LIB_PATH} + tkimg_INCLUDE_SPEC=${tkimg_BUILD_INCLUDE_SPEC} + tkimg_LIBRARY_PATH=${tkimg_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${tkimg_STUB_LIB_SPEC}" = x; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKIMG_STUB library for LIBS" >&5 +$as_echo_n "checking For TKIMG_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${TKIMG_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${TKIMG_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&5 +$as_echo "using TKIMG_STUB_LIB_PATH ${TKIMG_STUB_LIB_PATH}" >&6; } + else + + vars="${TKIMG_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKIMG_STUB_LIB_SPEC ${TKIMG_STUB_LIB_SPEC}" >&5 +$as_echo "using TKIMG_STUB_LIB_SPEC ${TKIMG_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 tkimg_STUB library for LIBS" >&5 +$as_echo_n "checking For tkimg_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${tkimg_STUB_LIB_SPEC}" != "x" ; then + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${tkimg_STUB_LIB_PATH}`\"" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&5 +$as_echo "using tkimg_STUB_LIB_PATH ${tkimg_STUB_LIB_PATH}" >&6; } + else + + vars="${tkimg_STUB_LIB_SPEC}" + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + case $i in + *.lib) + # Convert foo.lib to -lfoo for GCC + i=-l`echo "$i" | sed -e 's/\.[^.]*$//' -e 's/\.lib.*//'` + ;; + esac + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkimg_STUB_LIB_SPEC ${tkimg_STUB_LIB_SPEC}" >&5 +$as_echo "using tkimg_STUB_LIB_SPEC ${tkimg_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5675,81 +5949,81 @@ fi # - # Ok, lets find the tkhtml1 configuration + # Ok, lets find the tksao configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tkhtml1 + # the alternative search directory is invoked by --with-tksao # - if test x"${no_tkhtml1}" = x ; then - # we reset no_tkhtml1 in case something fails here - no_tkhtml1=true + if test x"${no_tksao}" = x ; then + # we reset no_tksao in case something fails here + no_tksao=true -# Check whether --with-tkhtml1 was given. -if test "${with_tkhtml1+set}" = set; then : - withval=$with_tkhtml1; with_tkhtml1config=${withval} +# Check whether --with-tksao was given. +if test "${with_tksao+set}" = set; then : + withval=$with_tksao; with_tksaoconfig=${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 "$as_me:${as_lineno-$LINENO}: checking for tksao configuration" >&5 +$as_echo_n "checking for tksao configuration... " >&6; } + if ${ac_cv_c_tksaoconfig+:} 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$!!'` + # First check to see if --with-tksao was specified. + if test x"${with_tksaoconfig}" != x ; then + case ${with_tksaoconfig} in + */tksaoConfig.sh ) + if test -f ${with_tksaoconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tksao argument should refer to directory containing tksaoConfig.sh, not to tksaoConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tksao argument should refer to directory containing tksaoConfig.sh, not to tksaoConfig.sh itself" >&2;} + with_tksaoconfig=`echo ${with_tksaoconfig} | sed 's!/tksaoConfig\.sh$!!'` fi;; esac - if test -f "${with_tkhtml1config}/tkhtml1Config.sh" ; then - ac_cv_c_tkhtml1config=`(cd ${with_tkhtml1config}; pwd)` + if test -f "${with_tksaoconfig}/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd ${with_tksaoconfig}; pwd)` else - as_fn_error $? "${with_tkhtml1config} directory doesn't contain tkhtml1Config.sh" "$LINENO" 5 + as_fn_error $? "${with_tksaoconfig} directory doesn't contain tksaoConfig.sh" "$LINENO" 5 fi fi - # then check for a private tkhtml1 installation - if test x"${ac_cv_c_tkhtml1config}" = x ; then + # then check for a private tksao installation + if test x"${ac_cv_c_tksaoconfig}" = 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` \ + ../tksao \ + `ls -dr ../tksao*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tksao*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tksao*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tksao*[0-9].[0-9]* 2>/dev/null` \ + ../../tksao \ + `ls -dr ../../tksao*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tksao*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tksao*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tksao*[0-9].[0-9]* 2>/dev/null` \ + ../../../tksao \ + `ls -dr ../../../tksao*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tksao*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tksao*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tksao*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tksao \ + `ls -dr ${srcdir}/../tksao*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tksao*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tksao*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tksao*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/tkhtml1Config.sh" ; then - ac_cv_c_tkhtml1config=`(cd $i; pwd)` + if test -f "$i/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/tkhtml1Config.sh" ; then - ac_cv_c_tkhtml1config=`(cd $i/unix; pwd)` + if test -f "$i/unix/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_tkhtml1config}" = x ; then + if test x"${ac_cv_c_tksaoconfig}" = 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` \ @@ -5758,8 +6032,8 @@ $as_echo "$as_me: WARNING: --with-tkhtml1 argument should refer to directory con `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)` + if test -f "$i/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd $i; pwd)` break fi done @@ -5768,49 +6042,49 @@ $as_echo "$as_me: WARNING: --with-tkhtml1 argument should refer to directory con 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;} + if test x"${ac_cv_c_tksaoconfig}" = x ; then + tksao_BIN_DIR="# no tksao configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tksao configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tksao 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; } + no_tksao= + tksao_BIN_DIR=${ac_cv_c_tksaoconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tksao_BIN_DIR/tksaoConfig.sh" >&5 +$as_echo "found $tksao_BIN_DIR/tksaoConfig.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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tksao_BIN_DIR}/tksaoConfig.sh" >&5 +$as_echo_n "checking for existence of ${tksao_BIN_DIR}/tksaoConfig.sh... " >&6; } - if test -f "${tkhtml1_BIN_DIR}/tkhtml1Config.sh" ; then + if test -f "${tksao_BIN_DIR}/tksaoConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tkhtml1_BIN_DIR}/tkhtml1Config.sh" + . "${tksao_BIN_DIR}/tksaoConfig.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), + # If the tksao_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 + # For example, the variable tksao_LIB_SPEC will be set to the value + # of tksao_BUILD_LIB_SPEC. An extension should make use of tksao_LIB_SPEC + # instead of tksao_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} + if test -f "${tksao_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tksao" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tksao" >&2;} + tksao_LIB_SPEC=${tksao_BUILD_LIB_SPEC} + tksao_STUB_LIB_SPEC=${tksao_BUILD_STUB_LIB_SPEC} + tksao_STUB_LIB_PATH=${tksao_BUILD_STUB_LIB_PATH} + tksao_INCLUDE_SPEC=${tksao_BUILD_INCLUDE_SPEC} + tksao_LIBRARY_PATH=${tksao_LIBRARY_PATH} fi @@ -5830,18 +6104,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkhtml # 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 : + if test "x${tksao_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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKSAO_STUB library for LIBS" >&5 +$as_echo_n "checking For TKSAO_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 "x${TKSAO_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TKHTML1_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TKSAO_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5855,11 +6129,11 @@ $as_echo_n "checking For TKHTML1_STUB library for LIBS... " >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&5 +$as_echo "using TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&6; } else - vars="${TKHTML1_STUB_LIB_SPEC}" + vars="${TKSAO_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5873,8 +6147,8 @@ $as_echo "using TKHTML1_STUB_LIB_PATH ${TKHTML1_STUB_LIB_PATH}" >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKSAO_STUB_LIB_SPEC ${TKSAO_STUB_LIB_SPEC}" >&5 +$as_echo "using TKSAO_STUB_LIB_SPEC ${TKSAO_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5883,16 +6157,16 @@ $as_echo "file not found" >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tksao_STUB library for LIBS" >&5 +$as_echo_n "checking For tksao_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 "x${tksao_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tkhtml1_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tksao_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5906,11 +6180,11 @@ $as_echo_n "checking For tkhtml1_STUB library for LIBS... " >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&5 +$as_echo "using tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&6; } else - vars="${tkhtml1_STUB_LIB_SPEC}" + vars="${tksao_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -5924,8 +6198,8 @@ $as_echo "using tkhtml1_STUB_LIB_PATH ${tkhtml1_STUB_LIB_PATH}" >&6; } 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; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tksao_STUB_LIB_SPEC ${tksao_STUB_LIB_SPEC}" >&5 +$as_echo "using tksao_STUB_LIB_SPEC ${tksao_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -5939,81 +6213,81 @@ fi # - # Ok, lets find the tkwin configuration + # Ok, lets find the tktable configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tkwin + # the alternative search directory is invoked by --with-tktable # - if test x"${no_tkwin}" = x ; then - # we reset no_tkwin in case something fails here - no_tkwin=true + if test x"${no_tktable}" = x ; then + # we reset no_tktable in case something fails here + no_tktable=true -# Check whether --with-tkwin was given. -if test "${with_tkwin+set}" = set; then : - withval=$with_tkwin; with_tkwinconfig=${withval} +# Check whether --with-tktable was given. +if test "${with_tktable+set}" = set; then : + withval=$with_tktable; with_tktableconfig=${withval} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkwin configuration" >&5 -$as_echo_n "checking for tkwin configuration... " >&6; } - if ${ac_cv_c_tkwinconfig+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tktable configuration" >&5 +$as_echo_n "checking for tktable configuration... " >&6; } + if ${ac_cv_c_tktableconfig+:} false; then : $as_echo_n "(cached) " >&6 else - # First check to see if --with-tkwin was specified. - if test x"${with_tkwinconfig}" != x ; then - case ${with_tkwinconfig} in - */tkwinConfig.sh ) - if test -f ${with_tkwinconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkwin argument should refer to directory containing tkwinConfig.sh, not to tkwinConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tkwin argument should refer to directory containing tkwinConfig.sh, not to tkwinConfig.sh itself" >&2;} - with_tkwinconfig=`echo ${with_tkwinconfig} | sed 's!/tkwinConfig\.sh$!!'` + # First check to see if --with-tktable was specified. + if test x"${with_tktableconfig}" != x ; then + case ${with_tktableconfig} in + */tktableConfig.sh ) + if test -f ${with_tktableconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tktable argument should refer to directory containing tktableConfig.sh, not to tktableConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tktable argument should refer to directory containing tktableConfig.sh, not to tktableConfig.sh itself" >&2;} + with_tktableconfig=`echo ${with_tktableconfig} | sed 's!/tktableConfig\.sh$!!'` fi;; esac - if test -f "${with_tkwinconfig}/tkwinConfig.sh" ; then - ac_cv_c_tkwinconfig=`(cd ${with_tkwinconfig}; pwd)` + if test -f "${with_tktableconfig}/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd ${with_tktableconfig}; pwd)` else - as_fn_error $? "${with_tkwinconfig} directory doesn't contain tkwinConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_tktableconfig} directory doesn't contain tktableConfig.sh" "$LINENO" 5 fi fi - # then check for a private tkwin installation - if test x"${ac_cv_c_tkwinconfig}" = x ; then + # then check for a private tktable installation + if test x"${ac_cv_c_tktableconfig}" = x ; then for i in \ - ../tkwin \ - `ls -dr ../tkwin*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tkwin*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tkwin*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tkwin*[0-9].[0-9]* 2>/dev/null` \ - ../../tkwin \ - `ls -dr ../../tkwin*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tkwin*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tkwin*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tkwin*[0-9].[0-9]* 2>/dev/null` \ - ../../../tkwin \ - `ls -dr ../../../tkwin*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tkwin*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tkwin*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tkwin*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tkwin \ - `ls -dr ${srcdir}/../tkwin*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tkwin*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tkwin*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tkwin*[0-9].[0-9]* 2>/dev/null` \ + ../tktable \ + `ls -dr ../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tktable*[0-9].[0-9]* 2>/dev/null` \ + ../../tktable \ + `ls -dr ../../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tktable*[0-9].[0-9]* 2>/dev/null` \ + ../../../tktable \ + `ls -dr ../../../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tktable*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tktable \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tktable*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/tkwinConfig.sh" ; then - ac_cv_c_tkwinconfig=`(cd $i; pwd)` + if test -f "$i/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/tkwinConfig.sh" ; then - ac_cv_c_tkwinconfig=`(cd $i/unix; pwd)` + if test -f "$i/unix/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_tkwinconfig}" = x ; then + if test x"${ac_cv_c_tktableconfig}" = 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` \ @@ -6022,8 +6296,8 @@ $as_echo "$as_me: WARNING: --with-tkwin argument should refer to directory conta `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/tkwinConfig.sh" ; then - ac_cv_c_tkwinconfig=`(cd $i; pwd)` + if test -f "$i/tktableConfig.sh" ; then + ac_cv_c_tktableconfig=`(cd $i; pwd)` break fi done @@ -6032,49 +6306,49 @@ $as_echo "$as_me: WARNING: --with-tkwin argument should refer to directory conta fi - if test x"${ac_cv_c_tkwinconfig}" = x ; then - tkwin_BIN_DIR="# no tkwin configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkwin configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tkwin configuration definitions" >&2;} + if test x"${ac_cv_c_tktableconfig}" = x ; then + tktable_BIN_DIR="# no tktable configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tktable configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tktable configuration definitions" >&2;} exit 0 else - no_tkwin= - tkwin_BIN_DIR=${ac_cv_c_tkwinconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkwin_BIN_DIR/tkwinConfig.sh" >&5 -$as_echo "found $tkwin_BIN_DIR/tkwinConfig.sh" >&6; } + no_tktable= + tktable_BIN_DIR=${ac_cv_c_tktableconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tktable_BIN_DIR/tktableConfig.sh" >&5 +$as_echo "found $tktable_BIN_DIR/tktableConfig.sh" >&6; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkwin_BIN_DIR}/tkwinConfig.sh" >&5 -$as_echo_n "checking for existence of ${tkwin_BIN_DIR}/tkwinConfig.sh... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tktable_BIN_DIR}/tktableConfig.sh" >&5 +$as_echo_n "checking for existence of ${tktable_BIN_DIR}/tktableConfig.sh... " >&6; } - if test -f "${tkwin_BIN_DIR}/tkwinConfig.sh" ; then + if test -f "${tktable_BIN_DIR}/tktableConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tkwin_BIN_DIR}/tkwinConfig.sh" + . "${tktable_BIN_DIR}/tktableConfig.sh" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 $as_echo "file not found" >&6; } fi # - # If the tkwin_BIN_DIR is the build directory (not the install directory), + # If the tktable_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 tkwin_LIB_SPEC will be set to the value - # of tkwin_BUILD_LIB_SPEC. An extension should make use of tkwin_LIB_SPEC - # instead of tkwin_BUILD_LIB_SPEC since it will work with both an + # For example, the variable tktable_LIB_SPEC will be set to the value + # of tktable_BUILD_LIB_SPEC. An extension should make use of tktable_LIB_SPEC + # instead of tktable_BUILD_LIB_SPEC since it will work with both an # installed and uninstalled version of Tcl. # - if test -f "${tkwin_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkwin" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkwin" >&2;} - tkwin_LIB_SPEC=${tkwin_BUILD_LIB_SPEC} - tkwin_STUB_LIB_SPEC=${tkwin_BUILD_STUB_LIB_SPEC} - tkwin_STUB_LIB_PATH=${tkwin_BUILD_STUB_LIB_PATH} - tkwin_INCLUDE_SPEC=${tkwin_BUILD_INCLUDE_SPEC} - tkwin_LIBRARY_PATH=${tkwin_LIBRARY_PATH} + if test -f "${tktable_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tktable" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tktable" >&2;} + tktable_LIB_SPEC=${tktable_BUILD_LIB_SPEC} + tktable_STUB_LIB_SPEC=${tktable_BUILD_STUB_LIB_SPEC} + tktable_STUB_LIB_PATH=${tktable_BUILD_STUB_LIB_PATH} + tktable_INCLUDE_SPEC=${tktable_BUILD_INCLUDE_SPEC} + tktable_LIBRARY_PATH=${tktable_LIBRARY_PATH} fi @@ -6094,18 +6368,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkwin" # 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${tkwin_STUB_LIB_SPEC}" = x; then : + if test "x${tktable_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKWIN_STUB library for LIBS" >&5 -$as_echo_n "checking For TKWIN_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKTABLE_STUB library for LIBS" >&5 +$as_echo_n "checking For TKTABLE_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${TKWIN_STUB_LIB_SPEC}" != "x" ; then + if test "x${TKTABLE_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TKWIN_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TKTABLE_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6119,11 +6393,11 @@ $as_echo_n "checking For TKWIN_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKWIN_STUB_LIB_PATH ${TKWIN_STUB_LIB_PATH}" >&5 -$as_echo "using TKWIN_STUB_LIB_PATH ${TKWIN_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKTABLE_STUB_LIB_PATH ${TKTABLE_STUB_LIB_PATH}" >&5 +$as_echo "using TKTABLE_STUB_LIB_PATH ${TKTABLE_STUB_LIB_PATH}" >&6; } else - vars="${TKWIN_STUB_LIB_SPEC}" + vars="${TKTABLE_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6137,8 +6411,8 @@ $as_echo "using TKWIN_STUB_LIB_PATH ${TKWIN_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKWIN_STUB_LIB_SPEC ${TKWIN_STUB_LIB_SPEC}" >&5 -$as_echo "using TKWIN_STUB_LIB_SPEC ${TKWIN_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKTABLE_STUB_LIB_SPEC ${TKTABLE_STUB_LIB_SPEC}" >&5 +$as_echo "using TKTABLE_STUB_LIB_SPEC ${TKTABLE_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -6147,16 +6421,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tkwin_STUB library for LIBS" >&5 -$as_echo_n "checking For tkwin_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tktable_STUB library for LIBS" >&5 +$as_echo_n "checking For tktable_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${tkwin_STUB_LIB_SPEC}" != "x" ; then + if test "x${tktable_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tkwin_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tktable_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6170,11 +6444,11 @@ $as_echo_n "checking For tkwin_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkwin_STUB_LIB_PATH ${tkwin_STUB_LIB_PATH}" >&5 -$as_echo "using tkwin_STUB_LIB_PATH ${tkwin_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tktable_STUB_LIB_PATH ${tktable_STUB_LIB_PATH}" >&5 +$as_echo "using tktable_STUB_LIB_PATH ${tktable_STUB_LIB_PATH}" >&6; } else - vars="${tkwin_STUB_LIB_SPEC}" + vars="${tktable_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6188,8 +6462,8 @@ $as_echo "using tkwin_STUB_LIB_PATH ${tkwin_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkwin_STUB_LIB_SPEC ${tkwin_STUB_LIB_SPEC}" >&5 -$as_echo "using tkwin_STUB_LIB_SPEC ${tkwin_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tktable_STUB_LIB_SPEC ${tktable_STUB_LIB_SPEC}" >&5 +$as_echo "using tktable_STUB_LIB_SPEC ${tktable_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -6203,81 +6477,81 @@ fi # - # Ok, lets find the tksao configuration + # Ok, lets find the tkwin configuration # First, look for one uninstalled. - # the alternative search directory is invoked by --with-tksao + # the alternative search directory is invoked by --with-tkwin # - if test x"${no_tksao}" = x ; then - # we reset no_tksao in case something fails here - no_tksao=true + if test x"${no_tkwin}" = x ; then + # we reset no_tkwin in case something fails here + no_tkwin=true -# Check whether --with-tksao was given. -if test "${with_tksao+set}" = set; then : - withval=$with_tksao; with_tksaoconfig=${withval} +# Check whether --with-tkwin was given. +if test "${with_tkwin+set}" = set; then : + withval=$with_tkwin; with_tkwinconfig=${withval} fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tksao configuration" >&5 -$as_echo_n "checking for tksao configuration... " >&6; } - if ${ac_cv_c_tksaoconfig+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkwin configuration" >&5 +$as_echo_n "checking for tkwin configuration... " >&6; } + if ${ac_cv_c_tkwinconfig+:} false; then : $as_echo_n "(cached) " >&6 else - # First check to see if --with-tksao was specified. - if test x"${with_tksaoconfig}" != x ; then - case ${with_tksaoconfig} in - */tksaoConfig.sh ) - if test -f ${with_tksaoconfig}; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tksao argument should refer to directory containing tksaoConfig.sh, not to tksaoConfig.sh itself" >&5 -$as_echo "$as_me: WARNING: --with-tksao argument should refer to directory containing tksaoConfig.sh, not to tksaoConfig.sh itself" >&2;} - with_tksaoconfig=`echo ${with_tksaoconfig} | sed 's!/tksaoConfig\.sh$!!'` + # First check to see if --with-tkwin was specified. + if test x"${with_tkwinconfig}" != x ; then + case ${with_tkwinconfig} in + */tkwinConfig.sh ) + if test -f ${with_tkwinconfig}; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkwin argument should refer to directory containing tkwinConfig.sh, not to tkwinConfig.sh itself" >&5 +$as_echo "$as_me: WARNING: --with-tkwin argument should refer to directory containing tkwinConfig.sh, not to tkwinConfig.sh itself" >&2;} + with_tkwinconfig=`echo ${with_tkwinconfig} | sed 's!/tkwinConfig\.sh$!!'` fi;; esac - if test -f "${with_tksaoconfig}/tksaoConfig.sh" ; then - ac_cv_c_tksaoconfig=`(cd ${with_tksaoconfig}; pwd)` + if test -f "${with_tkwinconfig}/tkwinConfig.sh" ; then + ac_cv_c_tkwinconfig=`(cd ${with_tkwinconfig}; pwd)` else - as_fn_error $? "${with_tksaoconfig} directory doesn't contain tksaoConfig.sh" "$LINENO" 5 + as_fn_error $? "${with_tkwinconfig} directory doesn't contain tkwinConfig.sh" "$LINENO" 5 fi fi - # then check for a private tksao installation - if test x"${ac_cv_c_tksaoconfig}" = x ; then + # then check for a private tkwin installation + if test x"${ac_cv_c_tkwinconfig}" = x ; then for i in \ - ../tksao \ - `ls -dr ../tksao*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../tksao*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../tksao*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../tksao*[0-9].[0-9]* 2>/dev/null` \ - ../../tksao \ - `ls -dr ../../tksao*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../tksao*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../tksao*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../tksao*[0-9].[0-9]* 2>/dev/null` \ - ../../../tksao \ - `ls -dr ../../../tksao*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ../../../tksao*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ../../../tksao*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ../../../tksao*[0-9].[0-9]* 2>/dev/null` \ - ${srcdir}/../tksao \ - `ls -dr ${srcdir}/../tksao*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ - `ls -dr ${srcdir}/../tksao*[0-9].[0-9][0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tksao*[0-9].[0-9] 2>/dev/null` \ - `ls -dr ${srcdir}/../tksao*[0-9].[0-9]* 2>/dev/null` \ + ../tkwin \ + `ls -dr ../tkwin*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../tkwin*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../tkwin*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../tkwin*[0-9].[0-9]* 2>/dev/null` \ + ../../tkwin \ + `ls -dr ../../tkwin*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../tkwin*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../tkwin*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../tkwin*[0-9].[0-9]* 2>/dev/null` \ + ../../../tkwin \ + `ls -dr ../../../tkwin*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ../../../tkwin*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ../../../tkwin*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ../../../tkwin*[0-9].[0-9]* 2>/dev/null` \ + ${srcdir}/../tkwin \ + `ls -dr ${srcdir}/../tkwin*[0-9].[0-9]*.[0-9]* 2>/dev/null` \ + `ls -dr ${srcdir}/../tkwin*[0-9].[0-9][0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tkwin*[0-9].[0-9] 2>/dev/null` \ + `ls -dr ${srcdir}/../tkwin*[0-9].[0-9]* 2>/dev/null` \ ; do - if test -f "$i/tksaoConfig.sh" ; then - ac_cv_c_tksaoconfig=`(cd $i; pwd)` + if test -f "$i/tkwinConfig.sh" ; then + ac_cv_c_tkwinconfig=`(cd $i; pwd)` break fi - if test -f "$i/unix/tksaoConfig.sh" ; then - ac_cv_c_tksaoconfig=`(cd $i/unix; pwd)` + if test -f "$i/unix/tkwinConfig.sh" ; then + ac_cv_c_tkwinconfig=`(cd $i/unix; pwd)` break fi done fi # check in a few common install locations - if test x"${ac_cv_c_tksaoconfig}" = x ; then + if test x"${ac_cv_c_tkwinconfig}" = 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` \ @@ -6286,8 +6560,8 @@ $as_echo "$as_me: WARNING: --with-tksao argument should refer to directory conta `ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \ ; do - if test -f "$i/tksaoConfig.sh" ; then - ac_cv_c_tksaoconfig=`(cd $i; pwd)` + if test -f "$i/tkwinConfig.sh" ; then + ac_cv_c_tkwinconfig=`(cd $i; pwd)` break fi done @@ -6296,49 +6570,49 @@ $as_echo "$as_me: WARNING: --with-tksao argument should refer to directory conta fi - if test x"${ac_cv_c_tksaoconfig}" = x ; then - tksao_BIN_DIR="# no tksao configs found" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tksao configuration definitions" >&5 -$as_echo "$as_me: WARNING: Cannot find tksao configuration definitions" >&2;} + if test x"${ac_cv_c_tkwinconfig}" = x ; then + tkwin_BIN_DIR="# no tkwin configs found" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkwin configuration definitions" >&5 +$as_echo "$as_me: WARNING: Cannot find tkwin configuration definitions" >&2;} exit 0 else - no_tksao= - tksao_BIN_DIR=${ac_cv_c_tksaoconfig} - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tksao_BIN_DIR/tksaoConfig.sh" >&5 -$as_echo "found $tksao_BIN_DIR/tksaoConfig.sh" >&6; } + no_tkwin= + tkwin_BIN_DIR=${ac_cv_c_tkwinconfig} + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkwin_BIN_DIR/tkwinConfig.sh" >&5 +$as_echo "found $tkwin_BIN_DIR/tkwinConfig.sh" >&6; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tksao_BIN_DIR}/tksaoConfig.sh" >&5 -$as_echo_n "checking for existence of ${tksao_BIN_DIR}/tksaoConfig.sh... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkwin_BIN_DIR}/tkwinConfig.sh" >&5 +$as_echo_n "checking for existence of ${tkwin_BIN_DIR}/tkwinConfig.sh... " >&6; } - if test -f "${tksao_BIN_DIR}/tksaoConfig.sh" ; then + if test -f "${tkwin_BIN_DIR}/tkwinConfig.sh" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 $as_echo "loading" >&6; } - . "${tksao_BIN_DIR}/tksaoConfig.sh" + . "${tkwin_BIN_DIR}/tkwinConfig.sh" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 $as_echo "file not found" >&6; } fi # - # If the tksao_BIN_DIR is the build directory (not the install directory), + # If the tkwin_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 tksao_LIB_SPEC will be set to the value - # of tksao_BUILD_LIB_SPEC. An extension should make use of tksao_LIB_SPEC - # instead of tksao_BUILD_LIB_SPEC since it will work with both an + # For example, the variable tkwin_LIB_SPEC will be set to the value + # of tkwin_BUILD_LIB_SPEC. An extension should make use of tkwin_LIB_SPEC + # instead of tkwin_BUILD_LIB_SPEC since it will work with both an # installed and uninstalled version of Tcl. # - if test -f "${tksao_BIN_DIR}/Makefile" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tksao" >&5 -$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tksao" >&2;} - tksao_LIB_SPEC=${tksao_BUILD_LIB_SPEC} - tksao_STUB_LIB_SPEC=${tksao_BUILD_STUB_LIB_SPEC} - tksao_STUB_LIB_PATH=${tksao_BUILD_STUB_LIB_PATH} - tksao_INCLUDE_SPEC=${tksao_BUILD_INCLUDE_SPEC} - tksao_LIBRARY_PATH=${tksao_LIBRARY_PATH} + if test -f "${tkwin_BIN_DIR}/Makefile" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkwin" >&5 +$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkwin" >&2;} + tkwin_LIB_SPEC=${tkwin_BUILD_LIB_SPEC} + tkwin_STUB_LIB_SPEC=${tkwin_BUILD_STUB_LIB_SPEC} + tkwin_STUB_LIB_PATH=${tkwin_BUILD_STUB_LIB_PATH} + tkwin_INCLUDE_SPEC=${tkwin_BUILD_INCLUDE_SPEC} + tkwin_LIBRARY_PATH=${tkwin_LIBRARY_PATH} fi @@ -6358,18 +6632,18 @@ $as_echo "$as_me: WARNING: Found Makefile - using build library specs for tksao" # 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${tksao_STUB_LIB_SPEC}" = x; then : + if test "x${tkwin_STUB_LIB_SPEC}" = x; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKSAO_STUB library for LIBS" >&5 -$as_echo_n "checking For TKSAO_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKWIN_STUB library for LIBS" >&5 +$as_echo_n "checking For TKWIN_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${TKSAO_STUB_LIB_SPEC}" != "x" ; then + if test "x${TKWIN_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${TKSAO_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${TKWIN_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6383,11 +6657,11 @@ $as_echo_n "checking For TKSAO_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&5 -$as_echo "using TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKWIN_STUB_LIB_PATH ${TKWIN_STUB_LIB_PATH}" >&5 +$as_echo "using TKWIN_STUB_LIB_PATH ${TKWIN_STUB_LIB_PATH}" >&6; } else - vars="${TKSAO_STUB_LIB_SPEC}" + vars="${TKWIN_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6401,8 +6675,8 @@ $as_echo "using TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKSAO_STUB_LIB_SPEC ${TKSAO_STUB_LIB_SPEC}" >&5 -$as_echo "using TKSAO_STUB_LIB_SPEC ${TKSAO_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using TKWIN_STUB_LIB_SPEC ${TKWIN_STUB_LIB_SPEC}" >&5 +$as_echo "using TKWIN_STUB_LIB_SPEC ${TKWIN_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 @@ -6411,16 +6685,16 @@ $as_echo "file not found" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tksao_STUB library for LIBS" >&5 -$as_echo_n "checking For tksao_STUB library for LIBS... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking For tkwin_STUB library for LIBS" >&5 +$as_echo_n "checking For tkwin_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${tksao_STUB_LIB_SPEC}" != "x" ; then + if test "x${tkwin_STUB_LIB_SPEC}" != "x" ; then if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then - vars="\"`${CYGPATH} ${tksao_STUB_LIB_PATH}`\"" + vars="\"`${CYGPATH} ${tkwin_STUB_LIB_PATH}`\"" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6434,11 +6708,11 @@ $as_echo_n "checking For tksao_STUB library for LIBS... " >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&5 -$as_echo "using tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkwin_STUB_LIB_PATH ${tkwin_STUB_LIB_PATH}" >&5 +$as_echo "using tkwin_STUB_LIB_PATH ${tkwin_STUB_LIB_PATH}" >&6; } else - vars="${tksao_STUB_LIB_SPEC}" + vars="${tkwin_STUB_LIB_SPEC}" for i in $vars; do if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then case $i in @@ -6452,8 +6726,8 @@ $as_echo "using tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&6; } done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tksao_STUB_LIB_SPEC ${tksao_STUB_LIB_SPEC}" >&5 -$as_echo "using tksao_STUB_LIB_SPEC ${tksao_STUB_LIB_SPEC}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tkwin_STUB_LIB_SPEC ${tkwin_STUB_LIB_SPEC}" >&5 +$as_echo "using tkwin_STUB_LIB_SPEC ${tkwin_STUB_LIB_SPEC}" >&6; } fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5 diff --git a/ds9/win/configure.ac b/ds9/win/configure.ac index 047e913..7e08ca1 100644 --- a/ds9/win/configure.ac +++ b/ds9/win/configure.ac @@ -61,24 +61,27 @@ TEA_LOAD_CONFIG(jpegtcl) TEA_PATH_CONFIG(zlibtcl) TEA_LOAD_CONFIG(zlibtcl) -TEA_PATH_CONFIG(tkimg) -TEA_LOAD_CONFIG(tkimg) - TEA_PATH_CONFIG(tkblt) 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) +TEA_PATH_CONFIG(tkimg) +TEA_LOAD_CONFIG(tkimg) + +TEA_PATH_CONFIG(tkmpeg) +TEA_LOAD_CONFIG(tkmpeg) TEA_PATH_CONFIG(tksao) TEA_LOAD_CONFIG(tksao) +TEA_PATH_CONFIG(tktable) +TEA_LOAD_CONFIG(tktable) + +TEA_PATH_CONFIG(tkwin) +TEA_LOAD_CONFIG(tkwin) + #----------------------------------------------------------------------- # Handle the --prefix=... option by defaulting to what Tcl gave. # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER. |