From c0b4e45ffd661b4211d91f8842bfe94e913e9adc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 24 May 2013 12:29:23 +0000
Subject: Disable XInitThreads() call until we have a better test for it.

---
 unix/configure     | 18 ++++++++++--------
 unix/configure.in  |  8 +++++---
 unix/tkUnixEvent.c |  3 ++-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/unix/configure b/unix/configure
index 7f31ae7..ed4295e 100755
--- a/unix/configure
+++ b/unix/configure
@@ -10772,7 +10772,7 @@ fi
 # Check whether XKeycodeToKeysym is deprecated in X11 headers.
 #--------------------------------------------------------------------
 
-if test $tk_aqua = no; then
+if test $tk_aqua = no && test "$GCC" = yes; then
     echo "$as_me:$LINENO: checking whether XKeycodeToKeysym is deprecated" >&5
 echo $ECHO_N "checking whether XKeycodeToKeysym is deprecated... $ECHO_C" >&6
     tk_oldCFlags=$CFLAGS
@@ -10819,7 +10819,15 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
-	echo "$as_me:$LINENO: result: yes" >&5
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+    echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\_ACEOF
@@ -10827,12 +10835,6 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
diff --git a/unix/configure.in b/unix/configure.in
index bc22472..7339983 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -592,7 +592,7 @@ fi
 # Check whether XKeycodeToKeysym is deprecated in X11 headers.
 #--------------------------------------------------------------------
 
-if test $tk_aqua = no; then
+if test $tk_aqua = no && test "$GCC" = yes; then
     AC_MSG_CHECKING([whether XKeycodeToKeysym is deprecated])
     tk_oldCFlags=$CFLAGS
     CFLAGS="$CFLAGS -Werror"
@@ -601,9 +601,11 @@ if test $tk_aqua = no; then
     ], [
 	XKeycodeToKeysym(0,0,0);
     ], [
-	AC_MSG_RESULT([yes])
+	AC_MSG_RESULT([no])
+    ], [
+    AC_MSG_RESULT([yes])
 	AC_DEFINE(XKEYCODETOKEYSYM_IS_DEPRECATED, 1, [Is XKeycodeToKeysym deprecated?])
-    ], AC_MSG_RESULT([no]))
+	])
     CFLAGS=$tk_oldCFlags
 fi
 
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c
index 7d0a5b7..9a29f51 100644
--- a/unix/tkUnixEvent.c
+++ b/unix/tkUnixEvent.c
@@ -128,7 +128,8 @@ TkpOpenDisplay(
     int minor = 0;
     int reason = 0;
     unsigned int use_xkb = 0;
-#if defined(XKEYCODETOKEYSYM_IS_DEPRECATED) && defined(TCL_THREADS)
+    /* Disabled, until we have a better test. See [Bug 3613668] */
+#if 0 && defined(XKEYCODETOKEYSYM_IS_DEPRECATED) && defined(TCL_THREADS)
     static int xinited = 0;
     static Tcl_Mutex xinitMutex = NULL;
 
-- 
cgit v0.12