[xine-cvs] CVS: xine-lib configure.ac,1.170,1.170.2.1

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib
In directory sc8-pr-cvs1:/tmp/cvs-serv17487

Modified Files:
      Tag: xvmc
	configure.ac 
Log Message:
add xvmc patch by Jack Steven Kelliher (with a lot of changes)
note: xvmc branch


Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.ac,v
retrieving revision 1.170
retrieving revision 1.170.2.1
diff -u -r1.170 -r1.170.2.1
--- configure.ac	25 Sep 2003 13:42:19 -0000	1.170
+++ configure.ac	26 Sep 2003 21:56:53 -0000	1.170.2.1
@@ -339,6 +339,16 @@
 
 AC_PREREQ_LIBTOOL(1.4.0, xv_lib="libXv.a", xv_lib="libXv.so")
 
+dnl ---------------------------------------------
+dnl Checks for XvMC extension
+dnl ---------------------------------------------
+dnl static linking with libXvMC is preferred!
+dnl but only dynamic linking is possible when using libtool < 1.4.0
+
+AC_PREREQ_LIBTOOL(1.4.0, xvmc_lib="libXvMC.a", xvmc_lib="libXvMC.so")
+
+AC_PREREQ_LIBTOOL(1.4.0, xvmc_lib_nv="libXvMCNVIDIA.a", xv_lib_nv="libXvMCNVIDIA_dynamic.so.1")
+
 
 dnl ---------------------------------------------
 dnl Check for OpenGL & [GLut | GLU]
@@ -396,6 +406,14 @@
 	  echo "warning: hppa linker - disabling static libXv"
 	  xv_lib="libXv.so"
 	fi
+	if test "$xvmc_lib" = "libXvMC.a"; then
+	  echo "warning: hppa linker - disabling static libXvMC"
+	  xvmc_lib="libXvMC.so"
+	fi
+	if test "$xvmc_lib_nv" = "libXvMCNVIDIA.a"; then
+	  echo "warning: hppa linker - disabling static libXvMCNVIDIA"
+	  xvmc_lib_nv="libXvMCNVIDIA_dynamic.so.1"
+	fi
 	;;
 
   i386-*-freebsd*)
@@ -467,6 +485,46 @@
 AC_SUBST(EXTRA_X_LIBS)
 AC_SUBST(EXTRA_X_CFLAGS)
 
+AC_ARG_WITH(xvmc-path,[  --with-xvmc-path=path     Where $xvmc_lib is installed],
+            xvmc_path="$withval", xvmc_path="/usr/X11R6/lib")
+
+AC_CHECK_LIB(XvMC, XvMCQueryExtension, 
+             [ AC_MSG_CHECKING(for $xvmc_lib location)
+               if test -f "$xvmc_path/$xvmc_lib_nv"; then
+               if test -f "$xvmc_path/$xvmc_lib"; then
+                 AC_MSG_RESULT(found in $xvmc_path)
+                 XVMC_LIB="-L$xvmc_path -lXvMC -lXvMCNVIDIA"
+	         AC_DEFINE(HAVE_XVMC,1,[Define this if you have libXvMC installed])
+	         ac_have_xvmc="yes"
+		 if test x$xvmc_lib = "xlibXvMC.a" ; then
+		   AC_DEFINE(HAVE_XVMC_STATIC,1,[Define this if you have libXvMC.a])
+		 fi
+               else
+                 AC_MSG_RESULT(not found in $xvmc_path)
+	         echo
+                 echo "****************************************************************"
+		 echo "* if you don't have a libXvMC.so on your system, use:          *"
+		 echo "* ld --whole-archive -shared -o libXvMC.so.1 libXvMC.a         *"
+		 echo "* then: ln -s libXvMC.so.1 libXvMC.so                          *"
+	         echo "* to create it or try to use --with-xvmc-path to set the       *"
+                 echo "* location of libXvMC.so                                         *"
+                 echo "****************************************************************"
+	         echo
+		 fi
+               fi ],, [$X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS])
+	   
+AM_CONDITIONAL(HAVE_XVMC, test x$ac_have_xvmc = "xyes")
+AM_CONDITIONAL(HAVE_XVMC_STATIC, test x$ac_have_xvmc = "xyes" -a x$xvmc_lib = "xlibXvMC.a")
+dnl
+dnl xine_check use XvMC functions API.
+dnl
+if test x$ac_have_xvmc = "xyes"; then
+  EXTRA_X_LIBS="-L$xvmc_path $XVMC_LIBS -lXext"
+  EXTRA_X_CFLAGS=""
+fi
+AC_SUBST(XVMC_LIB)
+
+
 dnl ---------------------------------------------
 dnl Checks for Xinerama extension
 dnl ---------------------------------------------
@@ -1655,6 +1713,22 @@
       echo "   - Xv (XVideo *static*)"
     else
       echo "   - Xv (XVideo *shared*)"
+    fi
+  fi
+  dnl XvMC
+  if test x$ac_have_xvmc = "xyes"; then
+    if test x$xvmc_lib="xlibXvMC.a"; then
+      echo "   - XvMC (XVideo *static*)"
+    else
+      echo "   - XvMC (XVideo *shared*)"
+    fi
+  fi
+  dnl XvMCNVIDIA
+  if test x$ac_have_xvmc = "xyes"; then
+    if test x$xvmc_lib="xlibXvMCNVIDIA.a"; then
+      echo "   - XvMCNVIDIA (XVideo *static*)"
+    else
+      echo "   - XvMCNVIDIA (XVideo *shared*)"
     fi
   fi
   if test x$ac_have_opengl = "xyes" -a x$ac_have_glut="xyes" -o \