diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-09 22:15:44 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-09 22:15:44 (GMT) |
commit | e678a25609c415c761d6c6f7fbf2cf69002bf1c8 (patch) | |
tree | dc28f11b05facdba8af2ef792f9a895aebac2557 /ds9 | |
parent | f6730acf941d984c4f293c98b51406619e91ac98 (diff) | |
download | blt-e678a25609c415c761d6c6f7fbf2cf69002bf1c8.zip blt-e678a25609c415c761d6c6f7fbf2cf69002bf1c8.tar.gz blt-e678a25609c415c761d6c6f7fbf2cf69002bf1c8.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 | 3 | ||||
-rwxr-xr-x | ds9/unix/configure | 258 | ||||
-rwxr-xr-x | ds9/unix/configure.in | 3 | ||||
-rwxr-xr-x | ds9/win/Makefile.in | 3 | ||||
-rwxr-xr-x | ds9/win/configure | 258 | ||||
-rwxr-xr-x | ds9/win/configure.in | 3 |
9 files changed, 789 insertions, 3 deletions
diff --git a/ds9/macosx/Makefile.in b/ds9/macosx/Makefile.in index b18d896..4fc657c 100644 --- a/ds9/macosx/Makefile.in +++ b/ds9/macosx/Makefile.in @@ -32,6 +32,7 @@ tkblt_LIB_SPEC = @tkblt_LIB_SPEC@ tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@ tkmacosx_LIB_SPEC= @tkmacosx_LIB_SPEC@ tkmpeg_LIB_SPEC = @tkmpeg_LIB_SPEC@ +tksao_LIB_SPEC = @tksao_LIB_SPEC@ CC = @CC@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ @@ -69,7 +70,6 @@ LLIBS = \ $(libdir)/libast.a \ $(libdir)/libast_err.a \ $(libdir)/libast_pal.a \ - $(libdir)/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \ $(libdir)/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \ $(libdir)/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \ $(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff$(TKIMGVER).a \ @@ -143,6 +143,7 @@ ds9base : $(OBJS) $(LLIBS) $(tkhtml1_LIB_SPEC) \ $(tkmacosx_LIB_SPEC) \ $(tkmpeg_LIB_SPEC) \ + $(tksao_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 1dcb4ee..498e7f0 100755 --- a/ds9/macosx/configure +++ b/ds9/macosx/configure @@ -652,6 +652,14 @@ RANLIB SET_MAKE 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 tkmpeg_STUB_LIB_PATH tkmpeg_STUB_LIB_SPEC tkmpeg_STUB_LIB_FILE @@ -847,6 +855,7 @@ with_tkblt with_tkhtml1 with_tkmacosx with_tkmpeg +with_tksao with_tclinclude with_tkinclude with_x @@ -1506,6 +1515,7 @@ Optional Packages: --with-tkhtml1 directory containing tkhtml1 configuration (tkhtml1Config.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-tclinclude directory containing the public Tcl header files --with-tkinclude directory containing the public Tk header files --with-x use the X Window System @@ -6738,6 +6748,254 @@ fi fi + + # + # Ok, lets find the tksao configuration + # First, look for one uninstalled. + # the alternative search directory is invoked by --with-tksao + # + + if test x"${no_tksao}" = x ; then + # we reset no_tksao in case something fails here + no_tksao=true + +# 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 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-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_tksaoconfig}/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd ${with_tksaoconfig}; pwd)` + else + as_fn_error $? "${with_tksaoconfig} directory doesn't contain tksaoConfig.sh" "$LINENO" 5 + fi + fi + + # then check for a private tksao installation + if test x"${ac_cv_c_tksaoconfig}" = 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` \ + ; do + if test -f "$i/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd $i; pwd)` + break + fi + 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_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` \ + `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/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd $i; pwd)` + break + fi + done + fi + +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;} + 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; } + 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; } + + if test -f "${tksao_BIN_DIR}/tksaoConfig.sh" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } + . "${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 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 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 "${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 + + + + + + + + + + + + + # 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${tksao_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; } + # 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 "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${TKSAO_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 TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&5 +$as_echo "using TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&6; } + else + + vars="${TKSAO_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 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 +$as_echo "file not found" >&6; } + fi + +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; } + # 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 "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${tksao_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 tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&5 +$as_echo "using tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&6; } + else + + vars="${tksao_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 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 +$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.in b/ds9/macosx/configure.in index 63b50a2..5b4c366 100755 --- a/ds9/macosx/configure.in +++ b/ds9/macosx/configure.in @@ -85,6 +85,9 @@ TEA_LOAD_CONFIG(tkmacosx) TEA_PATH_CONFIG(tkmpeg) TEA_LOAD_CONFIG(tkmpeg) +TEA_PATH_CONFIG(tksao) +TEA_LOAD_CONFIG(tksao) + #----------------------------------------------------------------------- # 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 f3b11ea..d492aeb 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -32,6 +32,7 @@ tclzvfs_LIB_SPEC= @tclzvfs_LIB_SPEC@ tkblt_LIB_SPEC = @tkblt_LIB_SPEC@ tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@ tkmpeg_LIB_SPEC = @tkmpeg_LIB_SPEC@ +tksao_LIB_SPEC = @tksao_LIB_SPEC@ CC = @CC@ CFLAGS_DEFAULT = @CFLAGS_DEFAULT@ @@ -85,7 +86,6 @@ LLIBS = \ $(libdir)/libast.a \ $(libdir)/libast_err.a \ $(libdir)/libast_pal.a \ - $(libdir)/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \ $(libdir)/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \ $(libdir)/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \ $(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff$(TKIMGVER).a \ @@ -155,6 +155,7 @@ ds9base : $(OBJS) $(LLIBS) $(tkblt_LIB_SPEC) \ $(tkhtml1_LIB_SPEC) \ $(tkmpeg_LIB_SPEC) \ + $(tksao_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 06e38bd..663be06 100755 --- a/ds9/unix/configure +++ b/ds9/unix/configure @@ -653,6 +653,14 @@ RANLIB SET_MAKE 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 tkmpeg_STUB_LIB_PATH tkmpeg_STUB_LIB_SPEC tkmpeg_STUB_LIB_FILE @@ -848,6 +856,7 @@ with_tkimg with_tkblt with_tkhtml1 with_tkmpeg +with_tksao with_tclinclude with_tkinclude with_x @@ -1507,6 +1516,7 @@ Optional Packages: --with-tkblt directory containing tkblt configuration (tkbltConfig.sh) --with-tkhtml1 directory containing tkhtml1 configuration (tkhtml1Config.sh) --with-tkmpeg directory containing tkmpeg configuration (tkmpegConfig.sh) + --with-tksao directory containing tksao configuration (tksaoConfig.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 @@ -6739,6 +6749,254 @@ fi fi + + # + # Ok, lets find the tksao configuration + # First, look for one uninstalled. + # the alternative search directory is invoked by --with-tksao + # + + if test x"${no_tksao}" = x ; then + # we reset no_tksao in case something fails here + no_tksao=true + +# 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 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-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_tksaoconfig}/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd ${with_tksaoconfig}; pwd)` + else + as_fn_error $? "${with_tksaoconfig} directory doesn't contain tksaoConfig.sh" "$LINENO" 5 + fi + fi + + # then check for a private tksao installation + if test x"${ac_cv_c_tksaoconfig}" = 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` \ + ; do + if test -f "$i/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd $i; pwd)` + break + fi + 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_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` \ + `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/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd $i; pwd)` + break + fi + done + fi + +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;} + 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; } + 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; } + + if test -f "${tksao_BIN_DIR}/tksaoConfig.sh" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } + . "${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 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 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 "${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 + + + + + + + + + + + + + # 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${tksao_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; } + # 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 "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${TKSAO_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 TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&5 +$as_echo "using TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&6; } + else + + vars="${TKSAO_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 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 +$as_echo "file not found" >&6; } + fi + +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; } + # 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 "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${tksao_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 tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&5 +$as_echo "using tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&6; } + else + + vars="${tksao_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 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 +$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.in b/ds9/unix/configure.in index 891e303..b17ef07 100755 --- a/ds9/unix/configure.in +++ b/ds9/unix/configure.in @@ -85,6 +85,9 @@ TEA_LOAD_CONFIG(tkhtml1) TEA_PATH_CONFIG(tkmpeg) TEA_LOAD_CONFIG(tkmpeg) +TEA_PATH_CONFIG(tksao) +TEA_LOAD_CONFIG(tksao) + #----------------------------------------------------------------------- # 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 ad7096f..75c66d2 100755 --- a/ds9/win/Makefile.in +++ b/ds9/win/Makefile.in @@ -27,6 +27,7 @@ tkimg_LIB_SPEC = @tkimg_LIB_SPEC@ tkblt_LIB_SPEC = @tkblt_LIB_SPEC@ tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@ tkmpeg_LIB_SPEC = @tkmpeg_LIB_SPEC@ +tksao_LIB_SPEC = @tksao_LIB_SPEC@ tkwin_LIB_SPEC = @tkwin_LIB_SPEC@ CC = @CC@ @@ -65,7 +66,6 @@ LLIBS = \ $(libdir)/libast.a \ $(libdir)/libast_err.a \ $(libdir)/libast_pal.a \ - $(libdir)/tksao$(TKSAOVER)/tksao10.a \ $(libdir)/Tclxml$(TCLXMLVER)/Tclxml32.a \ $(libdir)/Tktable$(TKTABLEVER)/Tktable210.a \ $(libdir)/tkimgtiff$(TKIMGVER)/libtkimgtiff146.a \ @@ -107,6 +107,7 @@ ds9Base$(EXEEXT): $(OBJS) $(LLIBS) $(tkblt_LIB_SPEC) \ $(tkhtml1_LIB_SPEC) \ $(tkmpeg_LIB_SPEC) \ + $(tksao_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 4d3d905..b422837 100755 --- a/ds9/win/configure +++ b/ds9/win/configure @@ -651,6 +651,14 @@ RANLIB SET_MAKE 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 @@ -819,6 +827,7 @@ with_tkblt with_tkmpeg with_tkhtml1 with_tkwin +with_tksao with_tclinclude with_tkinclude enable_shared @@ -1469,6 +1478,7 @@ Optional Packages: --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-tksao directory containing tksao configuration (tksaoConfig.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 @@ -5955,6 +5965,254 @@ fi fi + + # + # Ok, lets find the tksao configuration + # First, look for one uninstalled. + # the alternative search directory is invoked by --with-tksao + # + + if test x"${no_tksao}" = x ; then + # we reset no_tksao in case something fails here + no_tksao=true + +# 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 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-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_tksaoconfig}/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd ${with_tksaoconfig}; pwd)` + else + as_fn_error $? "${with_tksaoconfig} directory doesn't contain tksaoConfig.sh" "$LINENO" 5 + fi + fi + + # then check for a private tksao installation + if test x"${ac_cv_c_tksaoconfig}" = 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` \ + ; do + if test -f "$i/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd $i; pwd)` + break + fi + 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_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` \ + `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/tksaoConfig.sh" ; then + ac_cv_c_tksaoconfig=`(cd $i; pwd)` + break + fi + done + fi + +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;} + 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; } + 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; } + + if test -f "${tksao_BIN_DIR}/tksaoConfig.sh" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 +$as_echo "loading" >&6; } + . "${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 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 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 "${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 + + + + + + + + + + + + + # 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${tksao_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; } + # 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 "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${TKSAO_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 TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&5 +$as_echo "using TKSAO_STUB_LIB_PATH ${TKSAO_STUB_LIB_PATH}" >&6; } + else + + vars="${TKSAO_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 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 +$as_echo "file not found" >&6; } + fi + +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; } + # 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 "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then + + vars="\"`${CYGPATH} ${tksao_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 tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&5 +$as_echo "using tksao_STUB_LIB_PATH ${tksao_STUB_LIB_PATH}" >&6; } + else + + vars="${tksao_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 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 +$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/win/configure.in b/ds9/win/configure.in index 3429a67..902d2ed 100755 --- a/ds9/win/configure.in +++ b/ds9/win/configure.in @@ -76,6 +76,9 @@ TEA_LOAD_CONFIG(tkhtml1) TEA_PATH_CONFIG(tkwin) TEA_LOAD_CONFIG(tkwin) +TEA_PATH_CONFIG(tksao) +TEA_LOAD_CONFIG(tksao) + #----------------------------------------------------------------------- # Handle the --prefix=... option by defaulting to what Tcl gave. # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER. |