[vlc-devel] commit: Revert "Call XInitThreads early enough" ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 0.9-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar  1 14:38:23 2009 +0200| [a32ad11892a8ade265c59c4529b92c4880ce28a2] | committer: Rémi Denis-Courmont 

Revert "Call XInitThreads early enough"

This reverts commit 826fdf52dba743983d6677c928945f5fabc33ecf.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a32ad11892a8ade265c59c4529b92c4880ce28a2
---

 bin/vlc.c    |   13 +------------
 configure.ac |    2 --
 2 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index 5e327f1..7bc6cb3 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 *);
@@ -88,15 +86,6 @@ int main( int i_argc, const char *ppsz_argv[] )
     /* FIXME: rootwrap (); */
 #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 58b458a..96df16a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3947,8 +3947,6 @@ if test "${enable_x11}" != "no" &&
    test "${enable_x11}" = "yes"); then
   CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}"
   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([panoramix])
     VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11])
     VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}])