From 37c7af0dfdebbfadc6a8ffc0a8087e11e2959e03 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 5 Jan 2017 17:00:03 -0500 Subject: update TEA 3.10 --- ds9/unix/Makefile.in | 3 +- ds9/unix/configure | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++ ds9/unix/configure.in | 3 + 3 files changed, 263 insertions(+), 1 deletion(-) diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in index f9bd8e0..5b40b5d 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -24,6 +24,7 @@ jpegtcl_LIB_SPEC= @jpegtcl_LIB_SPEC@ zlibtcl_LIB_SPEC= @zlibtcl_LIB_SPEC@ tkimg_LIB_SPEC = @tkimg_LIB_SPEC@ +tclzvfs_LIB_SPEC= @tclzvfs_LIB_SPEC@ tkblt_LIB_SPEC = @tkblt_LIB_SPEC@ CC = @CC@ @@ -88,7 +89,6 @@ LLIBS = \ $(libdir)/tkimgjpeg$(TKIMGVER)/libtkimgjpeg$(TKIMGVER).a \ $(libdir)/tkimggif$(TKIMGVER)/libtkimggif$(TKIMGVER).a \ $(libdir)/tkimgwindow$(TKIMGVER)/libtkimgwindow$(TKIMGVER).a \ - $(libdir)/tclzvfs$(TCLZVFSVER)/libtclzvfs$(TCLZVFSVER).a \ $(libdir)/libxpa.a \ $(libdir)/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \ $(libdir)/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \ @@ -142,6 +142,7 @@ ds9base : $(OBJS) $(LLIBS) $(OBJS) \ $(LLIBS) \ $(LIBS) \ + $(tclzvfs_LIB_SPEC) \ $(tifftcl_LIB_SPEC) \ $(pngtcl_LIB_SPEC) \ $(jpegtcl_LIB_SPEC) \ diff --git a/ds9/unix/configure b/ds9/unix/configure index 8ccbaf9..b76935a 100755 --- a/ds9/unix/configure +++ b/ds9/unix/configure @@ -701,6 +701,14 @@ tifftcl_LIB_FILE tifftcl_SRC_DIR tifftcl_BIN_DIR tifftcl_VERSION +tclzvfs_STUB_LIB_PATH +tclzvfs_STUB_LIB_SPEC +tclzvfs_STUB_LIB_FILE +tclzvfs_LIB_SPEC +tclzvfs_LIB_FILE +tclzvfs_SRC_DIR +tclzvfs_BIN_DIR +tclzvfs_VERSION TK_XINCLUDES TK_LIBS TK_STUB_LIB_SPEC @@ -788,6 +796,7 @@ ac_user_opts=' enable_option_checking with_tcl with_tk +with_tclzvfs with_tifftcl with_pngtcl with_jpegtcl @@ -1441,6 +1450,7 @@ Optional Packages: --with-tcl directory containing tcl configuration (tclConfig.sh) --with-tk directory containing tk configuration (tkConfig.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) @@ -3705,6 +3715,254 @@ $as_echo "#define MAC_OSX_TK 1" >>confdefs.h # + # Ok, lets find the tclzvfs configuration + # First, look for one uninstalled. + # the alternative search directory is invoked by --with-tclzvfs + # + + if test x"${no_tclzvfs}" = x ; then + # we reset no_tclzvfs in case something fails here + no_tclzvfs=true + +# 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 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-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_tclzvfsconfig}/tclzvfsConfig.sh" ; then + ac_cv_c_tclzvfsconfig=`(cd ${with_tclzvfsconfig}; pwd)` + else + as_fn_error $? "${with_tclzvfsconfig} directory doesn't contain tclzvfsConfig.sh" "$LINENO" 5 + fi + fi + + # then check for a private tclzvfs installation + if test x"${ac_cv_c_tclzvfsconfig}" = 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` \ + ; do + if test -f "$i/tclzvfsConfig.sh" ; then + ac_cv_c_tclzvfsconfig=`(cd $i; pwd)` + break + fi + 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_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` \ + `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/tclzvfsConfig.sh" ; then + ac_cv_c_tclzvfsconfig=`(cd $i; pwd)` + break + fi + done + fi + +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;} + 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; } + 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; } + + if test -f "${tclzvfs_BIN_DIR}/tclzvfsConfig.sh" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } + . "${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 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 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 "${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 + + + + + + + + + + + + + # 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${tclzvfs_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; } + # 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 "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${TCLZVFS_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 TCLZVFS_STUB_LIB_PATH ${TCLZVFS_STUB_LIB_PATH}" >&5 +$as_echo "using TCLZVFS_STUB_LIB_PATH ${TCLZVFS_STUB_LIB_PATH}" >&6; } + else + + vars="${TCLZVFS_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 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 +$as_echo "file not found" >&6; } + fi + +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; } + # 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 "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${tclzvfs_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 tclzvfs_STUB_LIB_PATH ${tclzvfs_STUB_LIB_PATH}" >&5 +$as_echo "using tclzvfs_STUB_LIB_PATH ${tclzvfs_STUB_LIB_PATH}" >&6; } + else + + vars="${tclzvfs_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 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 +$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/unix/configure.in b/ds9/unix/configure.in index ad82de6..f432515 100755 --- a/ds9/unix/configure.in +++ b/ds9/unix/configure.in @@ -49,6 +49,9 @@ TEA_LOAD_TKCONFIG # Load the *.sh file if necessary #-------------------------------------------------------------------- +TEA_PATH_CONFIG(tclzvfs) +TEA_LOAD_CONFIG(tclzvfs) + TEA_PATH_CONFIG(tifftcl) TEA_LOAD_CONFIG(tifftcl) -- cgit v0.12