update TEA 3.10

1 files changed, 258 insertions, 0 deletions

diff --git a/ds9/macosx/configure b/ds9/macosx/configure
index 687e389..090a41e 100755
--- a/ds9/macosx/configure
+++ b/ds9/macosx/configure
@@ -660,6 +660,14 @@ tkmpeg_LIB_FILE
 tkmpeg_SRC_DIR
 tkmpeg_BIN_DIR
 tkmpeg_VERSION
+tkmacosx_STUB_LIB_PATH
+tkmacosx_STUB_LIB_SPEC
+tkmacosx_STUB_LIB_FILE
+tkmacosx_LIB_SPEC
+tkmacosx_LIB_FILE
+tkmacosx_SRC_DIR
+tkmacosx_BIN_DIR
+tkmacosx_VERSION
 tkblt_STUB_LIB_PATH
 tkblt_STUB_LIB_SPEC
 tkblt_STUB_LIB_FILE
@@ -828,6 +836,7 @@ with_jpegtcl
 with_zlibtcl
 with_tkimg
 with_tkblt
+with_tkmacosx
 with_tkmpeg
 with_tclinclude
 with_tkinclude
@@ -1485,6 +1494,7 @@ Optional Packages:
   --with-zlibtcl              directory containing zlibtcl configuration (zlibtclConfig.sh)
   --with-tkimg              directory containing tkimg configuration (tkimgConfig.sh)
   --with-tkblt              directory containing tkblt configuration (tkbltConfig.sh)
+  --with-tkmacosx              directory containing tkmacosx configuration (tkmacosxConfig.sh)
   --with-tkmpeg              directory containing tkmpeg configuration (tkmpegConfig.sh)
   --with-tclinclude       directory containing the public Tcl header files
   --with-tkinclude        directory containing the public Tk header files
@@ -5976,6 +5986,254 @@ fi
 
 
     #
+    # Ok, lets find the tkmacosx configuration
+    # First, look for one uninstalled.
+    # the alternative search directory is invoked by --with-tkmacosx
+    #
+
+    if test x"${no_tkmacosx}" = x ; then
+	# we reset no_tkmacosx in case something fails here
+	no_tkmacosx=true
+
+# Check whether --with-tkmacosx was given.
+if test "${with_tkmacosx+set}" = set; then :
+  withval=$with_tkmacosx; with_tkmacosxconfig=${withval}
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tkmacosx configuration" >&5
+$as_echo_n "checking for tkmacosx configuration... " >&6; }
+	if ${ac_cv_c_tkmacosxconfig+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+
+	    # First check to see if --with-tkmacosx was specified.
+	    if test x"${with_tkmacosxconfig}" != x ; then
+		case ${with_tkmacosxconfig} in
+		    */tkmacosxConfig.sh )
+			if test -f ${with_tkmacosxconfig}; then
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tkmacosx argument should refer to directory containing tkmacosxConfig.sh, not to tkmacosxConfig.sh itself" >&5
+$as_echo "$as_me: WARNING: --with-tkmacosx argument should refer to directory containing tkmacosxConfig.sh, not to tkmacosxConfig.sh itself" >&2;}
+			    with_tkmacosxconfig=`echo ${with_tkmacosxconfig} | sed 's!/tkmacosxConfig\.sh$!!'`
+			fi;;
+		esac
+		if test -f "${with_tkmacosxconfig}/tkmacosxConfig.sh" ; then
+		    ac_cv_c_tkmacosxconfig=`(cd ${with_tkmacosxconfig}; pwd)`
+		else
+		    as_fn_error $? "${with_tkmacosxconfig} directory doesn't contain tkmacosxConfig.sh" "$LINENO" 5
+		fi
+	    fi
+
+	    # then check for a private tkmacosx installation
+	    if test x"${ac_cv_c_tkmacosxconfig}" = x ; then
+		for i in \
+			../tkmacosx \
+			`ls -dr ../tkmacosx*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../tkmacosx*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../tkmacosx*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../tkmacosx*[0-9].[0-9]* 2>/dev/null` \
+			../../tkmacosx \
+			`ls -dr ../../tkmacosx*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../tkmacosx*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../tkmacosx*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../tkmacosx*[0-9].[0-9]* 2>/dev/null` \
+			../../../tkmacosx \
+			`ls -dr ../../../tkmacosx*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ../../../tkmacosx*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ../../../tkmacosx*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ../../../tkmacosx*[0-9].[0-9]* 2>/dev/null` \
+			${srcdir}/../tkmacosx \
+			`ls -dr ${srcdir}/../tkmacosx*[0-9].[0-9]*.[0-9]* 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkmacosx*[0-9].[0-9][0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkmacosx*[0-9].[0-9] 2>/dev/null` \
+			`ls -dr ${srcdir}/../tkmacosx*[0-9].[0-9]* 2>/dev/null` \
+			; do
+		    if test -f "$i/tkmacosxConfig.sh" ; then
+			ac_cv_c_tkmacosxconfig=`(cd $i; pwd)`
+			break
+		    fi
+		    if test -f "$i/unix/tkmacosxConfig.sh" ; then
+			ac_cv_c_tkmacosxconfig=`(cd $i/unix; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+	    # check in a few common install locations
+	    if test x"${ac_cv_c_tkmacosxconfig}" = 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/tkmacosxConfig.sh" ; then
+			ac_cv_c_tkmacosxconfig=`(cd $i; pwd)`
+			break
+		    fi
+		done
+	    fi
+
+fi
+
+
+	if test x"${ac_cv_c_tkmacosxconfig}" = x ; then
+	    tkmacosx_BIN_DIR="# no tkmacosx configs found"
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find tkmacosx configuration definitions" >&5
+$as_echo "$as_me: WARNING: Cannot find tkmacosx configuration definitions" >&2;}
+	    exit 0
+	else
+	    no_tkmacosx=
+	    tkmacosx_BIN_DIR=${ac_cv_c_tkmacosxconfig}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $tkmacosx_BIN_DIR/tkmacosxConfig.sh" >&5
+$as_echo "found $tkmacosx_BIN_DIR/tkmacosxConfig.sh" >&6; }
+	fi
+    fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${tkmacosx_BIN_DIR}/tkmacosxConfig.sh" >&5
+$as_echo_n "checking for existence of ${tkmacosx_BIN_DIR}/tkmacosxConfig.sh... " >&6; }
+
+    if test -f "${tkmacosx_BIN_DIR}/tkmacosxConfig.sh" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
+	. "${tkmacosx_BIN_DIR}/tkmacosxConfig.sh"
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+    #
+    # If the tkmacosx_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 tkmacosx_LIB_SPEC will be set to the value
+    # of tkmacosx_BUILD_LIB_SPEC. An extension should make use of tkmacosx_LIB_SPEC
+    # instead of tkmacosx_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+
+    if test -f "${tkmacosx_BIN_DIR}/Makefile" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makefile - using build library specs for tkmacosx" >&5
+$as_echo "$as_me: WARNING: Found Makefile - using build library specs for tkmacosx" >&2;}
+        tkmacosx_LIB_SPEC=${tkmacosx_BUILD_LIB_SPEC}
+        tkmacosx_STUB_LIB_SPEC=${tkmacosx_BUILD_STUB_LIB_SPEC}
+        tkmacosx_STUB_LIB_PATH=${tkmacosx_BUILD_STUB_LIB_PATH}
+        tkmacosx_INCLUDE_SPEC=${tkmacosx_BUILD_INCLUDE_SPEC}
+        tkmacosx_LIBRARY_PATH=${tkmacosx_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${tkmacosx_STUB_LIB_SPEC}" = x; then :
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking For TKMACOSX_STUB library for LIBS" >&5
+$as_echo_n "checking For TKMACOSX_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${TKMACOSX_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${TKMACOSX_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 TKMACOSX_STUB_LIB_PATH ${TKMACOSX_STUB_LIB_PATH}" >&5
+$as_echo "using TKMACOSX_STUB_LIB_PATH ${TKMACOSX_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${TKMACOSX_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 TKMACOSX_STUB_LIB_SPEC ${TKMACOSX_STUB_LIB_SPEC}" >&5
+$as_echo "using TKMACOSX_STUB_LIB_SPEC ${TKMACOSX_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 tkmacosx_STUB library for LIBS" >&5
+$as_echo_n "checking For tkmacosx_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${tkmacosx_STUB_LIB_SPEC}" != "x" ; then
+	if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
+
+    vars="\"`${CYGPATH} ${tkmacosx_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 tkmacosx_STUB_LIB_PATH ${tkmacosx_STUB_LIB_PATH}" >&5
+$as_echo "using tkmacosx_STUB_LIB_PATH ${tkmacosx_STUB_LIB_PATH}" >&6; }
+	else
+
+    vars="${tkmacosx_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 tkmacosx_STUB_LIB_SPEC ${tkmacosx_STUB_LIB_SPEC}" >&5
+$as_echo "using tkmacosx_STUB_LIB_SPEC ${tkmacosx_STUB_LIB_SPEC}" >&6; }
+	fi
+    else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+fi
+
+fi
+
+
+
+    #
     # Ok, lets find the tkmpeg configuration
     # First, look for one uninstalled.
     # the alternative search directory is invoked by --with-tkmpeg