From 951b94d3c2bc951fa942bf5c41594372a880d2d5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 1 Mar 2009 14:37:31 +0200
Subject: [PATCH] Revert "Call XInitThreads early enough"

This reverts commit 364868f96ff0d745905fec4b9df35942fd8c0d7b.
On deeper look, this deadlocks in all kind of places. I guess we'll
have to live with the racy Xlib behavior instead.

Conflicts:

	configure.ac
---
 bin/vlc.c    | 13 +------------
 configure.ac |  3 ---
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index 5220618e07..3a15722d77 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -33,9 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
-#ifdef HAVE_X11_XLIB_H
-# include <X11/Xlib.h>
-#endif
+
 
 /* Explicit HACK */
 extern void LocaleFree (const char *);
@@ -84,15 +82,6 @@ int main( int i_argc, const char *ppsz_argv[] )
 #   endif
 #endif
 
-#ifdef HAVE_X11_XLIB_H
-    /* Initialize Xlib thread support. */
-    if (!XInitThreads ())
-    {
-        fputs ("VLC requires a thread-safe Xlib. Sorry.\n", stderr);
-        return 1;
-    }
-#endif
-
     /* Synchronously intercepted POSIX signals.
      *
      * In a threaded program such as VLC, the only sane way to handle signals
diff --git a/configure.ac b/configure.ac
index d930baea93..c4e777ae7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3964,9 +3964,6 @@ AC_ARG_ENABLE(x11,
 
 CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
 AC_CHECK_HEADERS(X11/Xlib.h, [
-  VLC_ADD_CPPFLAGS([vlc], [${X_CFLAGS}])
-  VLC_ADD_LIBS([vlc], [${X_LIBS} ${X_PRE_LIBS} -lX11])
-
   VLC_ADD_PLUGIN([x11_screen])
   VLC_ADD_CPPFLAGS([x11_screen],[${X_CFLAGS}])
   VLC_ADD_LIBS([x11_screen],[${X_LIBS} ${X_PRE_LIBS} -lX11])
-- 
2.39.2