[vlc-commits] commit: Always check for X11/Xlib.h ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Sun Apr 11 18:52:52 CEST 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Apr 11 19:51:09 2010 +0300| [f3bef788226766f2251c5acdaa4667c2728089d3] | committer: Rémi Denis-Courmont 

Always check for X11/Xlib.h

HAVE_X11_XLIB_H is used in several files (unfortunately)

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

 configure.ac |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b3e0ee2..cc6db08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3298,6 +3298,9 @@ dnl  Xlib
 dnl
 
 AC_PATH_XTRA()
+AC_CHECK_HEADERS(X11/Xlib.h, [
+  VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11])
+])
 
 dnl
 dnl  X C Bindings modules
@@ -3611,8 +3614,6 @@ AC_ARG_ENABLE(omapfb,
     then
       AC_CHECK_HEADERS(asm/arch-omap/omapfb.h, [
         VLC_ADD_PLUGIN([omapfb])
-        AC_CHECK_HEADERS(X11/Xlib.h, [
-          VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11]) ])
       ])
       VLC_ADD_PLUGIN([swscale_omap])
     fi



More information about the vlc-commits mailing list