Ensure that -lXv is output if we're using libXv.so.

CVS patchset: 7250
CVS date: 2004/12/13 21:35:21

1 files changed, 11 insertions, 4 deletions

diff --git a/m4/xv.m4 b/m4/xv.m4
index 5a0de42a5..b2a6aff51 100644
--- a/m4/xv.m4
+++ b/m4/xv.m4
@@ -24,15 +24,22 @@ AC_DEFUN([AC_TEST_LIBXV],
         [Define this if you have libXv installed])
 
      ac_have_xv="yes"
-     if test x$XV_LIB = "xlibXv.a" ; then
-     
+     case x$XV_LIB in
+      x*.a)
         AC_DEFINE(HAVE_XV_STATIC,
                 1,
                 [Define this if you have libXv.a])
         ac_have_xv_static="yes"
         XV_LIB="$xv_path/$XV_LIB"
-        
-  fi],
+        ;;
+      x*.so)
+        XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.so$//'`
+        ;;
+      *)
+        AC_MSG_ERROR([sorry, I don't know about $XV_LIB])
+        ;;
+     esac
+    ],
      ,
   [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])