From fdb56f0113e1f25a2f6172a86d9163d829a68f56 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Wed, 20 Nov 2002 23:21:17 +0000
Subject: avoid failure with clients that use xine lib (xine_check use X calls,
 for all Xv stuff, and it's not dlsymable, since libXv.a is the standard,
 maybe it's time to think about a plugin for those X related checks).

CVS patchset: 3324
CVS date: 2002/11/20 23:21:17
---
 configure.ac        | 9 +++++++++
 misc/xine-config.in | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 761ca8833..8f07915f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,7 +381,16 @@ AC_CHECK_LIB(Xv, XvShmCreateImage,
 	         echo
                fi ],, [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
 AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
+dnl
+dnl xine_check use Xv functions API.
+dnl
+if test x$ac_have_xv = "xyes"; then
+  EXTRA_X_LIBS="$XV_LIBS -lXext"
+  EXTRA_X_CFLAGS="-L$xv_path"
+fi
 AC_SUBST(XV_LIB)
+AC_SUBST(EXTRA_X_LIBS)
+AC_SUBST(EXTRA_X_CFLAGS)
 
 dnl ---------------------------------------------
 dnl Checks for Xinerama extension
diff --git a/misc/xine-config.in b/misc/xine-config.in
index 7d35873d1..f4b5ebc84 100644
--- a/misc/xine-config.in
+++ b/misc/xine-config.in
@@ -96,11 +96,11 @@ if test "$echo_acflags" = "yes"; then
 fi
 
 if test "$echo_cflags" = "yes"; then
-      echo -I@includedir@ @THREAD_CFLAGS@
+      echo -I@includedir@ @THREAD_CFLAGS@ @EXTRA_X_CFLAGS@
 fi
 
 if test "$echo_libs" = "yes"; then
-      echo -L@libdir@ -lxine @ZLIB_LIBS@ @THREAD_LIBS@
+      echo -L@libdir@ -lxine @ZLIB_LIBS@ @THREAD_LIBS@ @EXTRA_X_LIBS@
 fi      
 if test "$echo_plugindir" = "yes"; then
       echo "@XINE_PLUGINPATH@"
-- 
cgit v1.2.3