[vlc-commits] xosd: require and link against Xlib.

[Alexis Ballier]

vlc/vlc-1.2 | branch: master | Alexis Ballier <aballier at gentoo.org> | Fri Dec  9 16:10:10 2011 -0300| [9d337403f2e2e61fff1f5e6a7fbc7ca67d73bd8c] | committer: Rémi Denis-Courmont

xosd: require and link against Xlib.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit 3254502d3b2995908a06387a397f14c89e76621d)

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

 configure.ac |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b2ffe50..dd789a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3848,8 +3848,13 @@ if test "${enable_xosd}" = "yes"
 then
   AC_CHECK_HEADERS(xosd.h,
     AC_CHECK_LIB(xosd, xosd_set_horizontal_offset, [
-      VLC_ADD_PLUGIN([xosd])
-      VLC_ADD_LIBS([xosd],[-lxosd])
+      AS_IF([test "${no_x}" != "yes"], [
+          VLC_ADD_PLUGIN([xosd])
+          VLC_ADD_LIBS([xosd],[-lxosd ${X_LIBS} ${X_PRE_LIBS} -lX11])
+          VLC_ADD_CFLAGS([xosd],[${X_CFLAGS}])
+        ],[
+          AC_MSG_ERROR([Xlib is required with xosd.])
+        ])
     ])
   )
 fi