update to TEA 3.5

diff --git a/ChangeLog b/ChangeLog
index 8d2f8c9e99177dcd721f4d8a3a8c4d0cb86b63eb..d73660b0cc24b689cd9efc50ac7074056748615c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-25  Jeff Hobbs  <jeffh@ActiveState.com>
+
+       * configure, configure.in: update to TEA 3.5
+       * tclconfig/tcl.m4:        TEA rcs 1.89 2006/01/25 21:25:02
+
 2006-01-22  Jeff Hobbs  <jeffh@ActiveState.com>
 
        * tclconfig/tcl.m4, configure: update to TEA 3.4 interim

diff --git a/configure b/configure
index d5272551297fe9f27a4b3c01bc65d08f54c2ab13..db5a9afad4bd508e234d17d83914ff03e2c3e86a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1324,7 +1324,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
     # TEA extensions pass this us the version of TEA they think they
     # are compatible with.
-    TEA_VERSION="3.4"
+    TEA_VERSION="3.5"
 
     echo "$as_me:$LINENO: checking for correct TEA configuration" >&5
 echo $ECHO_N "checking for correct TEA configuration... $ECHO_C" >&6
@@ -1335,15 +1335,15 @@ echo "$as_me: error:
 The PACKAGE_NAME variable must be defined by your TEA configure.in" >&2;}
    { (exit 1); exit 1; }; }
     fi
-    if test x"3.4" = x ; then
+    if test x"3.5" = x ; then
        { { echo "$as_me:$LINENO: error:
 TEA version not specified." >&5
 echo "$as_me: error:
 TEA version not specified." >&2;}
    { (exit 1); exit 1; }; }
-    elif test "3.4" != "${TEA_VERSION}" ; then
-       echo "$as_me:$LINENO: result: warning: requested TEA version \"3.4\", have \"${TEA_VERSION}\"" >&5
-echo "${ECHO_T}warning: requested TEA version \"3.4\", have \"${TEA_VERSION}\"" >&6
+    elif test "3.5" != "${TEA_VERSION}" ; then
+       echo "$as_me:$LINENO: result: warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&5
+echo "${ECHO_T}warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&6
     else
        echo "$as_me:$LINENO: result: ok (TEA ${TEA_VERSION})" >&5
 echo "${ECHO_T}ok (TEA ${TEA_VERSION})" >&6
@@ -1529,6 +1529,19 @@ echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >
                done
            fi
 
+           # on Windows, check in common installation locations
+           if test "${TEA_PLATFORM}" = "windows" \
+               -a x"${ac_cv_c_tclconfig}" = x ; then
+               for i in `ls -d C:/Tcl/lib 2>/dev/null` \
+                       `ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \
+                       ; do
+                   if test -f "$i/tclConfig.sh" ; then
+                       ac_cv_c_tclconfig=`(cd $i; pwd)`
+                       break
+                   fi
+               done
+           fi
+
            # check in a few common install locations
            if test x"${ac_cv_c_tclconfig}" = x ; then
                for i in `ls -d ${libdir} 2>/dev/null` \
@@ -8039,7 +8052,8 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6
                do64bit_ok=yes
                CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
            fi
-           SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS}'
+           # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS here:
+           SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}'
            echo "$as_me:$LINENO: checking if ld accepts -single_module flag" >&5
 echo $ECHO_N "checking if ld accepts -single_module flag... $ECHO_C" >&6
 if test "${tcl_cv_ld_single_module+set}" = set; then
@@ -8174,6 +8188,12 @@ echo "${ECHO_T}$tcl_cv_ld_search_paths_first" >&6
            CC_SEARCH_FLAGS=""
            LD_SEARCH_FLAGS=""
            LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
+
+           # TEA specific: for Tk extensions, remove -arch ppc64 from CFLAGS
+           # for fat builds, as neither TkAqua nor TkX11 can be built for 64bit
+           # at present (no 64bit GUI libraries).
+           test $do64bit_ok = no && test -n "${TK_BIN_DIR}" && \
+               CFLAGS="`echo "$CFLAGS" | sed -e 's/-arch ppc64/-arch ppc/g'`"
            ;;
        NEXTSTEP-*)
            SHLIB_CFLAGS=""
@@ -8546,10 +8566,6 @@ fi;
     fi
     LDFLAGS="$LDFLAGS $LDFLAGS_ARCH"
 
-    # For TEA, CC_SEARCH_FLAGS becomes LD_SEARCH_FLAGS:
-    LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"
-    CC_SEARCH_FLAGS=""
-
     # If we're running gcc, then change the C flags for compiling shared
     # libraries to the right flags for gcc, instead of those for the
     # standard manufacturer compiler.

diff --git a/configure.in b/configure.in
index 0fc805302a0f06f968aadefac4fba2616e05ea23..2ec9d75a83e74c6c664db73a5832cdc35201c638 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@ AC_INIT([vfs], [1.3])
 # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
 #--------------------------------------------------------------------
 
-TEA_INIT([3.4])
+TEA_INIT([3.5])
 
 AC_CONFIG_AUX_DIR(tclconfig)
 

diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4
index 5292f45112a874e60fb35d9701d979766b5242a6..9c0337a7c07324e3434c07214a8156e34d0c12f4 100644 (file)
--- a/tclconfig/tcl.m4
+++ b/tclconfig/tcl.m4
@@ -13,6 +13,10 @@
 
 AC_PREREQ(2.50)
 
+dnl TEA extensions pass this us the version of TEA they think they
+dnl are compatible with (must be set in TEA_INIT below)
+dnl TEA_VERSION="3.5"
+
 # Possible values for key variables defined:
 #
 # TEA_WINDOWINGSYSTEM - win32 aqua x11 (mirrors 'tk windowingsystem')
@@ -109,6 +113,19 @@ AC_DEFUN(TEA_PATH_TCLCONFIG, [
                done
            fi
 
+           # on Windows, check in common installation locations
+           if test "${TEA_PLATFORM}" = "windows" \
+               -a x"${ac_cv_c_tclconfig}" = x ; then
+               for i in `ls -d C:/Tcl/lib 2>/dev/null` \
+                       `ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \
+                       ; do
+                   if test -f "$i/tclConfig.sh" ; then
+                       ac_cv_c_tclconfig=`(cd $i; pwd)`
+                       break
+                   fi
+               done
+           fi
+
            # check in a few common install locations
            if test x"${ac_cv_c_tclconfig}" = x ; then
                for i in `ls -d ${libdir} 2>/dev/null` \
@@ -254,6 +271,20 @@ AC_DEFUN(TEA_PATH_TKCONFIG, [
                    fi
                done
            fi
+
+           # on Windows, check in common installation locations
+           if test "${TEA_PLATFORM}" = "windows" \
+               -a x"${ac_cv_c_tclconfig}" = x ; then
+               for i in `ls -d C:/Tcl/lib 2>/dev/null` \
+                       `ls -d C:/Progra~1/Tcl/lib 2>/dev/null` \
+                       ; do
+                   if test -f "$i/tclConfig.sh" ; then
+                       ac_cv_c_tclconfig=`(cd $i; pwd)`
+                       break
+                   fi
+               done
+           fi
+
            # check in a few other private locations
            if test x"${ac_cv_c_tkconfig}" = x ; then
                for i in \
@@ -1578,7 +1609,8 @@ dnl AC_CHECK_TOOL(AR, ar)
                do64bit_ok=yes
                CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
            fi
-           SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS}'
+           # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS here:
+           SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}'
            AC_CACHE_CHECK([if ld accepts -single_module flag], tcl_cv_ld_single_module, [
                hold_ldflags=$LDFLAGS
                LDFLAGS="$LDFLAGS -dynamiclib -Wl,-single_module"
@@ -1607,6 +1639,12 @@ dnl AC_CHECK_TOOL(AR, ar)
            CC_SEARCH_FLAGS=""
            LD_SEARCH_FLAGS=""
            LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
+
+           # TEA specific: for Tk extensions, remove -arch ppc64 from CFLAGS
+           # for fat builds, as neither TkAqua nor TkX11 can be built for 64bit
+           # at present (no 64bit GUI libraries).
+           test $do64bit_ok = no && test -n "${TK_BIN_DIR}" && \
+               CFLAGS="`echo "$CFLAGS" | sed -e 's/-arch ppc64/-arch ppc/g'`"
            ;;
        NEXTSTEP-*)
            SHLIB_CFLAGS=""
@@ -1902,10 +1940,6 @@ dnl AC_CHECK_TOOL(AR, ar)
     fi
     LDFLAGS="$LDFLAGS $LDFLAGS_ARCH"
 
-    # For TEA, CC_SEARCH_FLAGS becomes LD_SEARCH_FLAGS:
-    LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"
-    CC_SEARCH_FLAGS=""
-
     # If we're running gcc, then change the C flags for compiling shared
     # libraries to the right flags for gcc, instead of those for the
     # standard manufacturer compiler.
@@ -2670,6 +2704,7 @@ AC_DEFUN(TEA_TCL_64BIT_FLAGS, [
 #              CYGPATH
 #              EXEEXT
 #      Defines only:
+#              TEA_VERSION
 #              TEA_INITED
 #              TEA_PLATFORM (windows or unix)
 #
@@ -2686,7 +2721,7 @@ AC_DEFUN(TEA_TCL_64BIT_FLAGS, [
 AC_DEFUN(TEA_INIT, [
     # TEA extensions pass this us the version of TEA they think they
     # are compatible with.
-    TEA_VERSION="3.4"
+    TEA_VERSION="3.5"
 
     AC_MSG_CHECKING([for correct TEA configuration])
     if test x"${PACKAGE_NAME}" = x ; then
@@ -3917,3 +3952,5 @@ AC_DEFUN(TEA_PATH_CELIB, [
 # Local Variables:
 # mode: autoconf
 # End:
+
+# BASED ON TEA 1.89 2006/01/25 21:25:02