Now set XVIDEO_LIBS only if the Xv library is found. Fixed matroska check so that...

Original commit message from CVS:
Now set XVIDEO_LIBS only if the Xv library is found.  Fixed matroska check
so that it doesn't stop the configure if it fails.

diff --git a/configure.ac b/configure.ac
index 8f78d7bc720362361d89a2ef8134a207fece14e2..57f2e3e568b99f39bf76c4986878c9b6dfbf10fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -425,17 +425,23 @@ GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink-Xv, [
     AC_CHECK_LIB(Xv_pic, XvQueryExtension,
                 HAVE_XVIDEO="yes", HAVE_XVIDEO="no",
                 $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
-    XVIDEO_LIBS="-lXv_pic -lXext"
 
-    dnl try again using something else if we didn't find it first
-    if test x$HAVE_XVIDEO = xno; then
-      AC_CHECK_LIB(Xv, XvQueryExtension,
+    if test x$HAVE_XVIDEO = xyes; then
+      XVIDEO_LIBS="-lXv_pic -lXext"
+      AC_SUBST(XVIDEO_LIBS)
+    else
+      dnl try again using something else if we didn't find it first
+      if test x$HAVE_XVIDEO = xno; then
+        AC_CHECK_LIB(Xv, XvQueryExtension,
                   HAVE_XVIDEO="yes", HAVE_XVIDEO="no",
                   $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
-      XVIDEO_LIBS="-lXv -lXext"
-    fi
 
-    AC_SUBST(XVIDEO_LIBS)
+        if test x$HAVE_XVIDEO = xyes; then
+          XVIDEO_LIBS="-lXv -lXext"
+          AC_SUBST(XVIDEO_LIBS)
+        fi
+      fi
+    fi
   fi
 ])