[vlc-commits] caca doesn't use x11 on OSX

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Thu May 17 13:16:17 2012 -0400| [3b9f212d5c954d9f3def1de2181288d30d1dc2d0] | committer: Rafaël Carré

caca doesn't use x11 on OSX

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

 modules/video_output/Modules.am |    2 ++
 modules/video_output/caca.c     |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 9ea89e7..9ffde18 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -136,8 +136,10 @@ libcaca_plugin_la_SOURCES = caca.c
 libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
 libcaca_plugin_la_LIBADD = $(AM_LIBADD) $(CACA_LIBS)
 if !HAVE_WIN32
+if !HAVE_DARWIN
 libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
 endif
+endif
 libcaca_plugin_la_DEPENDENCIES =
 EXTRA_LTLIBRARIES += libcaca_plugin.la
 libvlc_LTLIBRARIES += $(LTLIBcaca)
diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 5c9c1cb..31cd2b8 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -34,7 +34,7 @@
 #include <vlc_plugin.h>
 #include <vlc_vout_display.h>
 #include <vlc_picture_pool.h>
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
 # ifdef X_DISPLAY_MISSING
 #  error Xlib required due to XInitThreads
 # endif