diff options
-rwxr-xr-x | ds9/macos/configure | 274 | ||||
-rw-r--r-- | ds9/macos/configure.ac | 3 | ||||
-rwxr-xr-x | ds9/unix/configure | 274 | ||||
-rw-r--r-- | ds9/unix/configure.ac | 3 | ||||
-rw-r--r-- | make.include | 24 |
5 files changed, 3 insertions, 575 deletions
diff --git a/ds9/macos/configure b/ds9/macos/configure index 9d09835..54194e0 100755 --- a/ds9/macos/configure +++ b/ds9/macos/configure @@ -798,14 +798,6 @@ 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 @@ -931,7 +923,6 @@ with_tifftcl with_pngtcl with_jpegtcl with_zlibtcl -with_tclcheckdns with_tcliis with_tclsignal with_tclxml @@ -1605,7 +1596,6 @@ 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-tclcheckdns directory containing tclcheckdns configuration (tclcheckdnsConfig.sh) --with-tcliis directory containing tcliis configuration (tcliisConfig.sh) --with-tclsignal directory containing tclsignal configuration (tclsignalConfig.sh) --with-tclxml directory containing tclxml configuration (tclxmlConfig.sh) @@ -5009,270 +4999,6 @@ fi # - # 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 diff --git a/ds9/macos/configure.ac b/ds9/macos/configure.ac index 8c1adb6..6aca1bd 100644 --- a/ds9/macos/configure.ac +++ b/ds9/macos/configure.ac @@ -61,9 +61,6 @@ TEA_LOAD_CONFIG(jpegtcl) TEA_PATH_CONFIG(zlibtcl) TEA_LOAD_CONFIG(zlibtcl) -TEA_PATH_CONFIG(tclcheckdns) -TEA_LOAD_CONFIG(tclcheckdns) - TEA_PATH_CONFIG(tcliis) TEA_LOAD_CONFIG(tcliis) diff --git a/ds9/unix/configure b/ds9/unix/configure index 1a36fce..efb03ae 100755 --- a/ds9/unix/configure +++ b/ds9/unix/configure @@ -799,14 +799,6 @@ 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 @@ -932,7 +924,6 @@ with_tifftcl with_pngtcl with_jpegtcl with_zlibtcl -with_tclcheckdns with_tcliis with_tclsignal with_tclxml @@ -1606,7 +1597,6 @@ 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-tclcheckdns directory containing tclcheckdns configuration (tclcheckdnsConfig.sh) --with-tcliis directory containing tcliis configuration (tcliisConfig.sh) --with-tclsignal directory containing tclsignal configuration (tclsignalConfig.sh) --with-tclxml directory containing tclxml configuration (tclxmlConfig.sh) @@ -5010,270 +5000,6 @@ fi # - # 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 diff --git a/ds9/unix/configure.ac b/ds9/unix/configure.ac index 0f1b152..8fcebc6 100644 --- a/ds9/unix/configure.ac +++ b/ds9/unix/configure.ac @@ -61,9 +61,6 @@ TEA_LOAD_CONFIG(jpegtcl) TEA_PATH_CONFIG(zlibtcl) TEA_LOAD_CONFIG(zlibtcl) -TEA_PATH_CONFIG(tclcheckdns) -TEA_LOAD_CONFIG(tclcheckdns) - TEA_PATH_CONFIG(tcliis) TEA_LOAD_CONFIG(tcliis) diff --git a/make.include b/make.include index 2a98c51..1d419da 100644 --- a/make.include +++ b/make.include @@ -1,6 +1,5 @@ # tcl 8.6.6 # tk 8.6.6 -# tclcheckdns 1.1 # tcliis 1.0 # tcllib 1.18 # tclsignal 1.4 @@ -53,7 +52,7 @@ TKIMGTMPFILES = \ #-------------------------- main .NOTPARALLEL : -.PHONY : all dirs ds9 tclcheckdns tcliis tclsignal tclxml tclzvfs tls xpa +.PHONY : all dirs ds9 tcliis tclsignal tclxml tclzvfs tls xpa .PHONY : tkblt tkcon tkhtml1 tkimg tkmpeg tksao tktable .PHONY : ast funtools @@ -87,23 +86,6 @@ ds9/$(OS)/Makefile : $(PREFIX) \ $(STD) -#-------------------------- tclcheckdns - -tclcheckdns : tclcheckdns/Makefile - @echo "" - @echo "*** $@ ***" - $(MAKE) -C tclcheckdns -j $(JOBS) install - -tclcheckdns/Makefile : - @echo "" - @echo "*** $@ ***" - cd tclcheckdns; \ - ./configure \ - $(WITHTCL) \ - $(PREFIX) \ - $(STD) \ - $(CACHE) - #-------------------------- tcliis tcliis : tcliis/Makefile @@ -452,13 +434,13 @@ scrub : .PHONY : clean .PHONY : dirsclean ds9clean localclean -.PHONY : tclcheckdnsclean tcliisclean tclsignalclean +.PHONY : tcliisclean tclsignalclean .PHONY : tclxmlclean tclzvfsclean tlsclean .PHONY : tkbltclean tkconclean tkhtml1clean tkimgclean .PHONY : tkmpegclean tksaoclean astclean funtoolsclean tktableclean xpaclean clean : tclclean tkclean \ - tclcheckdnsclean tcliisclean tclsignalclean \ + tcliisclean tclsignalclean \ tclzvfsclean tlsclean tclxmlclean xpaclean \ tkbltclean tkconclean tktableclean tkimgclean \ tkmpegclean tkhtml1clean \ |