From 30336aacf67d08014b6b17e4a1a50eccc9a05a92 Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <mroi@users.sourceforge.net>
Date: Mon, 27 Dec 2004 17:22:30 +0000
Subject: **BUGFIX**  (<- testing whether my automated-merging-idea works) fix
 xine-lib builds without X11: HAVE_XV must not be defined conditionally,
 otherwise configure will complain also fix the Xv test for old shells with
 broken handling of empty variables

CVS patchset: 7307
CVS date: 2004/12/27 17:22:30
---
 m4/xv.m4 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'm4')

diff --git a/m4/xv.m4 b/m4/xv.m4
index b2a6aff51..430c4d7ed 100644
--- a/m4/xv.m4
+++ b/m4/xv.m4
@@ -43,8 +43,6 @@ AC_DEFUN([AC_TEST_LIBXV],
      ,
   [$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 -----------------------------------------------
@@ -66,7 +64,7 @@ AC_DEFUN([AC_FIND_LIBXV],
   AC_REQUIRE([AC_PATH_XTRA])
 
   # Set xv_path if its not done already
-  if test -z $xv_path; then
+  if test x$xv_path = x; then
     xv_path=`echo $X_LIBS | sed -e 's/\-L\(.*\)/\1/'`
   fi
 
@@ -77,7 +75,7 @@ AC_DEFUN([AC_FIND_LIBXV],
   fi
   
   # Try the other lib if prefered failed
-  if test -z $XV_LIB; then
+  if test x$XV_LIB = x; then
     if ! test "x$xv_prefer_shared" = "xyes"; then  
       AC_PATH_LIBXV_IMPL([libXv.so])
     else
@@ -85,7 +83,7 @@ AC_DEFUN([AC_FIND_LIBXV],
     fi
   fi
 
-  if ! test -z $XV_LIB; then
+  if ! test x$XV_LIB = x; then
     AC_TEST_LIBXV
   fi
 ])
-- 
cgit v1.2.3