diff options
| author | das <das> | 2008-04-01 21:42:59 (GMT) |
|---|---|---|
| committer | das <das> | 2008-04-01 21:42:59 (GMT) |
| commit | 4746ce24ce36fe6e90d71d55d4933c3b0d0312da (patch) | |
| tree | 097f693aa69b105a0777d46ffd244d50583dfdf9 | |
| parent | 5e7c4d9bce04c5fbf22ab66e1459a1660ff57e25 (diff) | |
| download | tk-4746ce24ce36fe6e90d71d55d4933c3b0d0312da.zip tk-4746ce24ce36fe6e90d71d55d4933c3b0d0312da.tar.gz tk-4746ce24ce36fe6e90d71d55d4933c3b0d0312da.tar.bz2 | |
sync with tcl/unix/tcl.m4 changes
| -rw-r--r-- | unix/tcl.m4 | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 6270d24..6b09a17 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1927,6 +1927,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. @@ -1948,11 +1966,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}' |