summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordas <das>2006-11-10 01:57:04 (GMT)
committerdas <das>2006-11-10 01:57:04 (GMT)
commitc8fd8c3b3b073f1e7e3ff81ea864d8b3060fa386 (patch)
tree67260b96b15cb5f3d2efcc1abdf8a699506c7f8d /unix
parent3acc1810b8570d0f3bf39ca4d9e8f831e7b867d3 (diff)
downloadtk-c8fd8c3b3b073f1e7e3ff81ea864d8b3060fa386.zip
tk-c8fd8c3b3b073f1e7e3ff81ea864d8b3060fa386.tar.gz
tk-c8fd8c3b3b073f1e7e3ff81ea864d8b3060fa386.tar.bz2
* macosx/Wish.xcodeproj/project.pbxproj: remove tclParseExpr.c and
bwidget.test. * unix/tcl.m4 (Darwin): suppress linker arch warnings when building universal for both 32 & 64 bit and no 64bit CoreFoundation is available; sync with tcl tcl.m4 change. * unix/configure: autoconf-2.59 * unix/tkConfig.h.in: autoheader-2.59
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure106
-rw-r--r--unix/tcl.m45
-rw-r--r--unix/tkConfig.h.in6
3 files changed, 117 insertions, 0 deletions
diff --git a/unix/configure b/unix/configure
index 235af5f..911751a 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4328,6 +4328,111 @@ _ACEOF
fi
fi
fi
+ if test $tcl_ok = no; then
+ # Darwin thread stacksize API
+
+for ac_func in pthread_get_stacksize_np
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ fi
LIBS=$ac_saved_libs
else
TCL_THREADS=0
@@ -5779,6 +5884,7 @@ cat >>confdefs.h <<\_ACEOF
#define NO_COREFOUNDATION_64 1
_ACEOF
+ LDFLAGS="$LDFLAGS -Wl,-no_arch_warnings"
fi
fi
fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index adaa421..8c900dd 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -708,6 +708,10 @@ AC_DEFUN([SC_ENABLE_THREADS], [
fi
fi
fi
+ if test $tcl_ok = no; then
+ # Darwin thread stacksize API
+ AC_CHECK_FUNCS(pthread_get_stacksize_np)
+ fi
LIBS=$ac_saved_libs
else
TCL_THREADS=0
@@ -1645,6 +1649,7 @@ dnl AC_CHECK_TOOL(AR, ar)
if test $tcl_cv_lib_corefoundation_64 = no; then
AC_DEFINE(NO_COREFOUNDATION_64, 1,
[Is Darwin CoreFoundation unavailable for 64-bit?])
+ LDFLAGS="$LDFLAGS -Wl,-no_arch_warnings"
fi
fi
fi
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index 79389ff..e28ef01 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -16,6 +16,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the `Xft' library (-lXft). */
+#undef HAVE_LIBXFT
+
/* Do we have <limits.h>? */
#undef HAVE_LIMITS_H
@@ -37,6 +40,9 @@
/* Do we want a Linux-like thread-attribute interface? */
#undef HAVE_PTHREAD_GETATTR_NP
+/* Define to 1 if you have the `pthread_get_stacksize_np' function. */
+#undef HAVE_PTHREAD_GET_STACKSIZE_NP
+
/* Does struct password have a pw_gecos field? */
#undef HAVE_PW_GECOS