Import Tk 8.6.10
This commit is contained in:
49
unix/tcl.m4
49
unix/tcl.m4
@@ -77,7 +77,6 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
|
||||
for i in `ls -d ~/Library/Frameworks 2>/dev/null` \
|
||||
`ls -d /Library/Frameworks 2>/dev/null` \
|
||||
`ls -d /Network/Library/Frameworks 2>/dev/null` \
|
||||
`ls -d /System/Library/Frameworks 2>/dev/null` \
|
||||
; do
|
||||
if test -f "$i/Tcl.framework/tclConfig.sh" ; then
|
||||
ac_cv_c_tclconfig="`(cd $i/Tcl.framework; pwd)`"
|
||||
@@ -94,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
|
||||
`ls -d /usr/local/lib 2>/dev/null` \
|
||||
`ls -d /usr/contrib/lib 2>/dev/null` \
|
||||
`ls -d /usr/pkg/lib 2>/dev/null` \
|
||||
`ls -d /usr/lib/tcl8.6 2>/dev/null` \
|
||||
`ls -d /usr/lib 2>/dev/null` \
|
||||
`ls -d /usr/lib64 2>/dev/null` \
|
||||
`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
|
||||
@@ -210,7 +210,6 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
|
||||
for i in `ls -d ~/Library/Frameworks 2>/dev/null` \
|
||||
`ls -d /Library/Frameworks 2>/dev/null` \
|
||||
`ls -d /Network/Library/Frameworks 2>/dev/null` \
|
||||
`ls -d /System/Library/Frameworks 2>/dev/null` \
|
||||
; do
|
||||
if test -f "$i/Tk.framework/tkConfig.sh" ; then
|
||||
ac_cv_c_tkconfig="`(cd $i/Tk.framework; pwd)`"
|
||||
@@ -227,6 +226,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
|
||||
`ls -d /usr/local/lib 2>/dev/null` \
|
||||
`ls -d /usr/contrib/lib 2>/dev/null` \
|
||||
`ls -d /usr/pkg/lib 2>/dev/null` \
|
||||
`ls -d /usr/lib/tk8.6 2>/dev/null` \
|
||||
`ls -d /usr/lib 2>/dev/null` \
|
||||
`ls -d /usr/lib64 2>/dev/null` \
|
||||
`ls -d /usr/local/lib/tk8.6 2>/dev/null` \
|
||||
@@ -928,6 +928,9 @@ AC_DEFUN([SC_CONFIG_SYSTEM], [
|
||||
if test "`uname -s`" = "AIX" ; then
|
||||
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
|
||||
fi
|
||||
if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
|
||||
tcl_cv_sys_version=NetBSD-Debian
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
])
|
||||
@@ -1602,10 +1605,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
|
||||
SHLIB_SUFFIX=".dylib"
|
||||
DL_OBJS="tclLoadDyld.o"
|
||||
DL_LIBS=""
|
||||
# Don't use -prebind when building for Mac OS X 10.4 or later only:
|
||||
AS_IF([test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int([$]2)}'`" -lt 4 -a \
|
||||
"`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int([$]2)}'`" -lt 4], [
|
||||
LDFLAGS="$LDFLAGS -prebind"])
|
||||
LDFLAGS="$LDFLAGS -headerpad_max_install_names"
|
||||
AC_CACHE_CHECK([if ld accepts -search_paths_first flag],
|
||||
tcl_cv_ld_search_paths_first, [
|
||||
@@ -2683,7 +2682,20 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[
|
||||
#
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
AC_DEFUN([SC_TCL_GETHOSTBYADDR_R], [AC_CHECK_FUNC(gethostbyaddr_r, [
|
||||
AC_DEFUN([SC_TCL_GETHOSTBYADDR_R], [
|
||||
# Avoids picking hidden internal symbol from libc
|
||||
SC_TCL_GETHOSTBYADDR_R_DECL
|
||||
|
||||
if test "$tcl_cv_api_gethostbyaddr_r" = yes; then
|
||||
SC_TCL_GETHOSTBYADDR_R_TYPE
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN([SC_TCL_GETHOSTBYADDR_R_DECL], [AC_CHECK_DECLS(gethostbyaddr_r, [
|
||||
tcl_cv_api_gethostbyaddr_r=yes],[tcl_cv_api_gethostbyaddr_r=no],[#include <netdb.h>])
|
||||
])
|
||||
|
||||
AC_DEFUN([SC_TCL_GETHOSTBYADDR_R_TYPE], [AC_CHECK_FUNC(gethostbyaddr_r, [
|
||||
AC_CACHE_CHECK([for gethostbyaddr_r with 7 args], tcl_cv_api_gethostbyaddr_r_7, [
|
||||
AC_TRY_COMPILE([
|
||||
#include <netdb.h>
|
||||
@@ -2744,14 +2756,27 @@ AC_DEFUN([SC_TCL_GETHOSTBYADDR_R], [AC_CHECK_FUNC(gethostbyaddr_r, [
|
||||
# Results:
|
||||
#
|
||||
# Might define the following vars:
|
||||
# HAVE_GETHOSTBYADDR_R
|
||||
# HAVE_GETHOSTBYADDR_R_3
|
||||
# HAVE_GETHOSTBYADDR_R_5
|
||||
# HAVE_GETHOSTBYADDR_R_6
|
||||
# HAVE_GETHOSTBYNAME_R
|
||||
# HAVE_GETHOSTBYNAME_R_3
|
||||
# HAVE_GETHOSTBYNAME_R_5
|
||||
# HAVE_GETHOSTBYNAME_R_6
|
||||
#
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
AC_DEFUN([SC_TCL_GETHOSTBYNAME_R], [AC_CHECK_FUNC(gethostbyname_r, [
|
||||
AC_DEFUN([SC_TCL_GETHOSTBYNAME_R], [
|
||||
# Avoids picking hidden internal symbol from libc
|
||||
SC_TCL_GETHOSTBYNAME_R_DECL
|
||||
|
||||
if test "$tcl_cv_api_gethostbyname_r" = yes; then
|
||||
SC_TCL_GETHOSTBYNAME_R_TYPE
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN([SC_TCL_GETHOSTBYNAME_R_DECL], [AC_CHECK_DECLS(gethostbyname_r, [
|
||||
tcl_cv_api_gethostbyname_r=yes],[tcl_cv_api_gethostbyname_r=no],[#include <netdb.h>])
|
||||
])
|
||||
|
||||
AC_DEFUN([SC_TCL_GETHOSTBYNAME_R_TYPE], [AC_CHECK_FUNC(gethostbyname_r, [
|
||||
AC_CACHE_CHECK([for gethostbyname_r with 6 args], tcl_cv_api_gethostbyname_r_6, [
|
||||
AC_TRY_COMPILE([
|
||||
#include <netdb.h>
|
||||
|
||||
Reference in New Issue
Block a user