diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-06 20:19:07 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-06 20:19:07 (GMT) |
commit | 5197e60d971befe5d121e6c493fac724a49fa8ba (patch) | |
tree | 42aa835187f68882512c70ea192df545601cfd59 /ds9 | |
parent | 52c61fa01342e8f0b23b9660ac0d7160bda55237 (diff) | |
download | blt-5197e60d971befe5d121e6c493fac724a49fa8ba.zip blt-5197e60d971befe5d121e6c493fac724a49fa8ba.tar.gz blt-5197e60d971befe5d121e6c493fac724a49fa8ba.tar.bz2 |
update TEA 3.10
Diffstat (limited to 'ds9')
-rw-r--r-- | ds9/macosx/Makefile.in | 3 | ||||
-rwxr-xr-x | ds9/macosx/configure | 258 | ||||
-rwxr-xr-x | ds9/macosx/configure.in | 3 | ||||
-rw-r--r-- | ds9/unix/Makefile.in | 5 | ||||
-rwxr-xr-x | ds9/unix/configure | 258 | ||||
-rwxr-xr-x | ds9/unix/configure.in | 3 |
6 files changed, 527 insertions, 3 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index a81626e..6b0e60a 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -26,6 +26,7 @@ tkimg_LIB_SPEC = @tkimg_LIB_SPEC@ tclcheckdns_LIB_SPEC= @tclcheckdns_LIB_SPEC@ tcliis_LIB_SPEC = @tcliis_LIB_SPEC@ +tclsignal_LIB_SPEC= @tclsignal_LIB_SPEC@ tkblt_LIB_SPEC = @tkblt_LIB_SPEC@ CC = @CC@ @@ -75,7 +76,6 @@ LLIBS = \ $(libdir)/tkimggif$(TKIMGVER)/libtkimggif$(TKIMGVER).a \ $(libdir)/tkimgwindow$(TKIMGVER)/libtkimgwindow$(TKIMGVER).a \ $(libdir)/libxpa.a \ - $(libdir)/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \ $(libdir)/tkmacosx$(TKMACOSXVER)/libtkmacosx$(TKMACOSXVER).a APPDIR = $(bindir)/SAOImage\ DS9.app @@ -132,6 +132,7 @@ ds9base : $(OBJS) $(LLIBS) $(LIBS) \ $(tclcheckdns_LIB_SPEC) \ $(tcliis_LIB_SPEC) \ + $(tclsignal_LIB_SPEC) \ $(tifftcl_LIB_SPEC) \ $(pngtcl_LIB_SPEC) \ $(jpegtcl_LIB_SPEC) \ diff --git a/ds9/macosx/configure b/ds9/macosx/configure index 98c3b97..12e8421 100755 --- a/ds9/macosx/configure +++ b/ds9/macosx/configure @@ -700,6 +700,14 @@ 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 @@ -805,6 +813,7 @@ with_tcl with_tk with_tclcheckdns with_tcliis +with_tclsignal with_tifftcl with_pngtcl with_jpegtcl @@ -1460,6 +1469,7 @@ Optional Packages: --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) @@ -4220,6 +4230,254 @@ 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 + # Convert foo.lib to -lfoo for GCC. No-op if not *.lib + i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using 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 + # Convert foo.lib to -lfoo for GCC. No-op if not *.lib + i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using 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 + # Convert foo.lib to -lfoo for GCC. No-op if not *.lib + i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using 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 + # Convert foo.lib to -lfoo for GCC. No-op if not *.lib + i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using 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 diff --git a/ds9/macosx/configure.in b/ds9/macosx/configure.in index f3394c4..5187e82 100755 --- a/ds9/macosx/configure.in +++ b/ds9/macosx/configure.in @@ -55,6 +55,9 @@ 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) diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index 21dcd84..17f9bba 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -26,6 +26,7 @@ tkimg_LIB_SPEC = @tkimg_LIB_SPEC@ tclcheckdns_LIB_SPEC= @tclcheckdns_LIB_SPEC@ tcliis_LIB_SPEC = @tcliis_LIB_SPEC@ +tclsignal_LIB_SPEC= @tclsignal_LIB_SPEC@ tclzvfs_LIB_SPEC= @tclzvfs_LIB_SPEC@ tkblt_LIB_SPEC = @tkblt_LIB_SPEC@ @@ -91,8 +92,7 @@ LLIBS = \ $(libdir)/tkimgjpeg$(TKIMGVER)/libtkimgjpeg$(TKIMGVER).a \ $(libdir)/tkimggif$(TKIMGVER)/libtkimggif$(TKIMGVER).a \ $(libdir)/tkimgwindow$(TKIMGVER)/libtkimgwindow$(TKIMGVER).a \ - $(libdir)/libxpa.a \ - $(libdir)/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a + $(libdir)/libxpa.a #--------------------------main @@ -144,6 +144,7 @@ ds9base : $(OBJS) $(LLIBS) $(LIBS) \ $(tclcheckdns_LIB_SPEC) \ $(tcliis_LIB_SPEC) \ + $(tclsignal_LIB_SPEC) \ $(tclzvfs_LIB_SPEC) \ $(tifftcl_LIB_SPEC) \ $(pngtcl_LIB_SPEC) \ diff --git a/ds9/unix/configure b/ds9/unix/configure index 5b3a816..c570ae5 100755 --- a/ds9/unix/configure +++ b/ds9/unix/configure @@ -709,6 +709,14 @@ tclzvfs_LIB_FILE tclzvfs_SRC_DIR tclzvfs_BIN_DIR tclzvfs_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 @@ -814,6 +822,7 @@ with_tcl with_tk with_tclcheckdns with_tcliis +with_tclsignal with_tclzvfs with_tifftcl with_pngtcl @@ -1470,6 +1479,7 @@ Optional Packages: --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) @@ -4231,6 +4241,254 @@ 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 + # Convert foo.lib to -lfoo for GCC. No-op if not *.lib + i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using 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 + # Convert foo.lib to -lfoo for GCC. No-op if not *.lib + i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using 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 + # Convert foo.lib to -lfoo for GCC. No-op if not *.lib + i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using 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 + # Convert foo.lib to -lfoo for GCC. No-op if not *.lib + i=`echo "$i" | sed -e 's/^\([^-].*\)\.lib$/-l\1/i'` + fi + PKG_LIBS="$PKG_LIBS $i" + done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using 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 tclzvfs configuration # First, look for one uninstalled. # the alternative search directory is invoked by --with-tclzvfs diff --git a/ds9/unix/configure.in b/ds9/unix/configure.in index 163f295..fb24fd2 100755 --- a/ds9/unix/configure.in +++ b/ds9/unix/configure.in @@ -55,6 +55,9 @@ 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) |