summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2008-04-01 21:43:04 (GMT)
committerdas <das>2008-04-01 21:43:04 (GMT)
commitc518c7409a4b95124d66ff83f56a3a0acf559701 (patch)
tree48d981212bdbdc688884751b791f75660eef1859
parent05d2b1f699928197cd82a59538c4b55d22f2df7c (diff)
downloadtk-c518c7409a4b95124d66ff83f56a3a0acf559701.zip
tk-c518c7409a4b95124d66ff83f56a3a0acf559701.tar.gz
tk-c518c7409a4b95124d66ff83f56a3a0acf559701.tar.bz2
sync with tcl/unix/tcl.m4 changes
-rw-r--r--unix/tcl.m427
1 files changed, 24 insertions, 3 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 6270d24..bf1c524 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1926,6 +1926,24 @@ dnl AC_CHECK_TOOL(AR, ar)
])
], [AC_MSG_WARN([64bit mode not supported for $arch])])])
])
+
+ #--------------------------------------------------------------------
+ # On Solaris 5.x i386 with the sunpro compiler we need to link
+ # with sunmath to get floating point rounding control
+ #--------------------------------------------------------------------
+ AS_IF([test "$GCC" = yes],[use_sunmath=no],[
+ arch=`isainfo`
+ AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control])
+ AS_IF([test "$arch" = "amd64 i386"], [
+ AC_MSG_RESULT([yes])
+ MATH_LIBS="-lsunmath $MATH_LIBS"
+ AC_CHECK_HEADER(sunmath.h)
+ use_sunmath=yes
+ ], [
+ AC_MSG_RESULT([no])
+ use_sunmath=no
+ ])
+ ])
# Note: need the LIBS below, otherwise Tk won't find Tcl's
# symbols when dynamically loaded into tclsh.
@@ -1934,6 +1952,8 @@ dnl AC_CHECK_TOOL(AR, ar)
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
+
+
AS_IF([test "$GCC" = yes], [
SHLIB_LD='${CC} -shared'
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -1948,11 +1968,12 @@ dnl AC_CHECK_TOOL(AR, ar)
#CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir"
])
], [
+ AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text])
case $system in
SunOS-5.[[1-9]][[0-9]]*)
- SHLIB_LD='${CC} -G -z text ${LDFLAGS}';;
+ SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";;
*)
- SHLIB_LD='/usr/ccs/bin/ld -G -z text';;
+ SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";;
esac
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
@@ -2592,7 +2613,7 @@ AC_DEFUN([SC_TCL_LINK_LIBS], [
AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm")
AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"])
-
+
#--------------------------------------------------------------------
# Interactive UNIX requires -linet instead of -lsocket, plus it
# needs net/errno.h to define the socket-related error codes.