# HG changeset patch
# User Darren Salt <[EMAIL PROTECTED]>
# Date 1179444501 -3600
# Node ID 5afe213df0ebc87cdd7038cadec438cb4d0f86af
# Parent 2ea376ac0bbad15ad3bfdf932a9cf73a89ddfbaf
Cope with library paths for XvMC and XxMC (and Xv, just in case) being null.
I was seeing '-L -lxvmc', which was resulting in linkage failures
(unresolved symbols) at configure time.
diff -r 5afe213df0ebc87cdd7038cadec438cb4d0f86af -r
2ea376ac0bbad15ad3bfdf932a9cf73a89ddfbaf m4/video_out.m4
--- a/m4/video_out.m4 Fri May 18 00:28:21 2007 +0100
+++ b/m4/video_out.m4 Thu May 17 23:50:10 2007 +0100
@@ -406,7 +406,7 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [
if test x"$xv_try_path" != x"" && test -f
"$xv_try_path/$xv_lib"; then
case $xv_lib in
*.$acl_cv_libext) have_xv_static=yes
xv_try_libs="$xv_try_path/$xv_lib" ;;
- *.$acl_cv_shlibext) have_xv_static=no
xv_try_libs="-L$xv_try_path -lXv" ;;
+ *.$acl_cv_shlibext) have_xv_static=no
xv_try_libs="${xv_try_path:+-L}$xv_try_path -lXv" ;;
esac
ac_save_LIBS="$LIBS" LIBS="$xv_try_libs $X_PRE_LIBS
$X_LIBS $X_EXTRA_LIBS $LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
[[XvShmCreateImage()]])], [have_xv=yes], [])
@@ -454,7 +454,7 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [
ac_save_LIBS="$LIBS"
dnl Check for xxmc
- XXMC_LIBS="-L$with_xxmc_path -l$with_xxmc_lib"
+ XXMC_LIBS="${with_xxmc_path:+-L}$with_xxmc_path -l$with_xxmc_lib"
AC_SUBST(XXMC_LIBS)
AC_MSG_CHECKING([whether to enable the xxmc plugin with VLD
extensions])
AC_MSG_RESULT([])
@@ -479,7 +479,7 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [
fi
dnl Check for xvmc
- XVMC_LIBS="-L$with_xvmc_path -l$with_xvmc_lib"
+ XVMC_LIBS="${with_xvmc_path:+-L}$with_xvmc_path -l$with_xvmc_lib"
AC_SUBST(XVMC_LIBS)
AC_MSG_CHECKING([whether to enable the xvmc plugin])
AC_MSG_RESULT([])
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
