**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

3 files changed, 7 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index feb5b6d79..61d49db2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+xine-lib (1.0.1)
+  * fixed builds with Xv or the entire X11 unavailble
+
 xine-lib (1.0)
   * unbreak DXR3 plugin
   * fix crash in the AIFF demuxer on oversized chunks
diff --git a/configure.ac b/configure.ac
index 349da779f..9ca5ef69c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -495,9 +495,6 @@ dnl ----------------------------------------------
 dnl With recent XFree86 or Xorg, dynamic linking is preferred!
 dnl Only dynamic linking is possible when using libtool < 1.4.0
 
-dnl ----------------------------------------------
-dnl SECTION: Check for Xv and XvMC support (iconv is also tested here?)
-dnl ----------------------------------------------
 AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [where libXv is installed]),
             xv_path="$withval",)
 
@@ -507,13 +504,9 @@ AC_ARG_ENABLE(shared-xv,
         xv_prefer_shared="yes")
 
 if test x"$no_x" != "xyes"; then
-
-  dnl -----------------------------------------------
-  dnl   Finding install Xv library
-  dnl -----------------------------------------------
   AC_FIND_LIBXV
-
 fi
+AM_CONDITIONAL(HAVE_XV, test x$ac_have_xv = "xyes")
 
 
 host_or_hostalias="$host"
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
 ])