xvideo X.Org 7 detection fix by Pavlov Konstantin

diff --git a/THANKS b/THANKS
index 19bd546f00a3be507f277ccbfc573ef361012c97..00f8638ee954ebf5533600e3e7fb1ded7216c551 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -102,6 +102,7 @@ Ondrej Kuda aka Albert <kuda at natur dot cuni dot cz> - HTTP interface tips and
 Øyvind Kolbu <oyvindk at world-online.no> - FreeBSD patches
 Patrick Horn <patrickd0thorn at mindspring d0t com> - DirectShow patch
 Paul Mackerras <paulus at linuxcare.com.au> - AltiVec IDCT and motion
+Pavlov Konstantin “thresh” - several Linux configure.ac fixes
 Philippe Van Hecke <philippe at belnet dot be> - SAP header hash patch
 Pierre Marc Dumuid <pierre.dumuid at adelaide dot edu dot au> - Playlist patches
 Régis Duchesne <regis at via.ecp.fr> - original VLC code

diff --git a/configure.ac b/configure.ac
index 0ee3cdacc6b6d637c0ae771c6dce5f58a45d594d..b430894f62fa060419595b5bd8d12829e0b9b823 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3391,7 +3391,7 @@ if test "${enable_xvideo}" != "no" &&
     AC_CHECK_LIB(Xv,XvPutImage,[
       # If libXv.so is available, xvideo can be a plugin. Otherwise, we
       # test for libXv_pic.
-      if test -f /usr/X11R6/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then
+      if test -f /usr/X11R6/lib/libXv.so -o -f /usr/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then
         VLC_ADD_PLUGINS([xvideo])
         VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}])
         VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv])