summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac28
-rw-r--r--m4/xv.m420
-rw-r--r--src/video_out/Makefile.am6
3 files changed, 27 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac
index dfb9ce14b..f654e91d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -659,7 +659,7 @@ case "$host_or_hostalias" in
hppa*)
if test x$ac_have_xv_static = "xyes"; then
echo "warning: hppa linker - disabling static libXv"
- XV_LIB="libXv.so"
+ XV_LIBS="libXv.so"
fi
;;
@@ -694,7 +694,7 @@ if test x$x_includes != "x"; then
CPPFLAGS="$CPPFLAGS -I$x_includes"
fi
-XXMC_LIB="-L$xxmc_path -l$xxmc_stub"
+XXMC_LIBS="-L$xxmc_path -l$xxmc_stub"
AC_MSG_CHECKING(whether to enable the xxmc plugin with vld extensions)
AC_MSG_RESULT()
dnl Check if vld "extended" XvMC is available
@@ -703,15 +703,15 @@ if test x$xxmc_stub == "xXvMCW" && test x$ac_have_xv == "xyes"; then
ac_have_xxmc="yes",
[ac_have_xxmc="no"
AC_MSG_RESULT([*** Could not link with -l$xxmc_stub for vld extensions.])],
- [-L$xxmc_path $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
+ [-L$xxmc_path $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS])
else
if test x$ac_have_xv = "xyes"; then
AC_CHECK_LIB($xxmc_stub, XvMCPutSlice,
[ac_have_xxmc="yes"
- XXMC_LIB="$XXMC_LIB -lXvMC"],
+ XXMC_LIBS="$XXMC_LIBS -lXvMC"],
[ac_have_xxmc="no"
AC_MSG_RESULT([*** Could not link with -l$xxmc_stub -lXvMC for vld extensions.])],
- [-L$xxmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
+ [-L$xxmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS])
else
ac_have_xxmc="no",
fi
@@ -733,15 +733,15 @@ if test x$ac_have_xxmc = "xno"; then
ac_have_xxmc="yes",
[ac_have_xxmc="no"
AC_MSG_RESULT([*** Could not link with -l$xxmc_stub for standard XvMC.])],
- [-L$xxmc_path $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
+ [-L$xxmc_path $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS])
else
if test x$ac_have_xv = "xyes"; then
AC_CHECK_LIB($xxmc_stub, XvMCCreateContext,
[ac_have_xxmc="yes"
- XXMC_LIB="$XXMC_LIB -lXvMC"],
+ XXMC_LIBS="$XXMC_LIBS -lXvMC"],
[ac_have_xxmc="no"
AC_MSG_RESULT([*** Could not link with -lXvMC for standard XvMC.])],
- [-L$xxmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
+ [-L$xxmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS])
else
ac_have_xxmc="no",
fi
@@ -765,7 +765,7 @@ LIBS="$saved_libs"
fi
AM_CONDITIONAL(HAVE_VLDXVMC, test x$ac_have_vldxvmc_h = "xyes")
AM_CONDITIONAL(HAVE_XXMC, test x$ac_have_xxmc = "xyes")
-AC_SUBST(XXMC_LIB)
+AC_SUBST(XXMC_LIBS)
dnl
dnl Check if we can enable the xvmc plugin.
@@ -779,7 +779,7 @@ AC_ARG_WITH(xvmc-lib, AC_HELP_STRING([--with-xvmc-lib=XXXX], [The name of the Xv
libXXXX.so for the xvmc plugin.]),xvmc_stub="$withval",
xvmc_stub="XvMCW")
saved_libs="$LIBS"
-XVMC_LIB="-L$xvmc_path -l$xvmc_stub"
+XVMC_LIBS="-L$xvmc_path -l$xvmc_stub"
AC_MSG_CHECKING(whether to enable the xvmc plugin)
AC_MSG_RESULT()
if test x$xvmc_stub == "xXvMCW"; then
@@ -787,15 +787,15 @@ if test x$xvmc_stub == "xXvMCW"; then
ac_have_xvmc="yes",
[ac_have_xvmc="no"
AC_MSG_RESULT([*** Could not link with -l$xvmc_stub.])],
- [-L$xvmc_path $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
+ [-L$xvmc_path $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS])
else
if test x$ac_have_xv = "xyes"; then
AC_CHECK_LIB($xvmc_stub, XvMCCreateContext,
[ac_have_xvmc="yes"
- XVMC_LIB="$XVMC_LIB -lXvMC"],
+ XVMC_LIBS="$XVMC_LIBS -lXvMC"],
[ac_have_xvmc="no"
AC_MSG_RESULT([*** Could not link with -lXvMC.])],
- [-L$xvmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIB -lXext $X_EXTRA_LIBS])
+ [-L$xvmc_path -lXvMC $X_LIBS $X_PRE_LIBS $XV_LIBS -lXext $X_EXTRA_LIBS])
else
ac_have_xvmc="no",
fi
@@ -814,7 +814,7 @@ CPPFLAGS="$saved_CPPFLAGS"
LIBS="$saved_libs"
fi
AM_CONDITIONAL(HAVE_XVMC, test x$ac_have_xvmc = "xyes")
-AC_SUBST(XVMC_LIB)
+AC_SUBST(XVMC_LIBS)
dnl ---------------------------------------------
diff --git a/m4/xv.m4 b/m4/xv.m4
index b09e23626..6d58cd0e7 100644
--- a/m4/xv.m4
+++ b/m4/xv.m4
@@ -6,11 +6,11 @@ AC_DEFUN([AC_PATH_LIBXV_IMPL],
AC_MSG_CHECKING([for $1])
if test -f "$xv_path/$1"; then
AC_MSG_RESULT([found $1 in $xv_path])
- XV_LIB="$1"
+ XV_LIBS="$1"
else
if test -f "/usr/lib/$1"; then
AC_MSG_RESULT([found $1 in /usr/lib])
- XV_LIB="$1"
+ XV_LIBS="$1"
else
AC_MSG_RESULT([$1 not found in $xv_path])
fi
@@ -29,19 +29,19 @@ AC_DEFUN([AC_TEST_LIBXV],
[Define this if you have libXv installed])
ac_have_xv="yes"
- case x$XV_LIB in
+ case x$XV_LIBS 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"
+ XV_LIBS="$xv_path/$XV_LIBS"
;;
x*.so)
- XV_LIB=`echo $XV_LIB | sed 's/^lib/-l/; s/\.so$//'`
+ XV_LIBS=`echo $XV_LIBS | sed 's/^lib/-l/; s/\.so$//'`
;;
*)
- AC_MSG_ERROR([sorry, I don't know about $XV_LIB])
+ AC_MSG_ERROR([sorry, I don't know about $XV_LIBS])
;;
esac
],
@@ -52,10 +52,10 @@ AC_DEFUN([AC_TEST_LIBXV],
dnl xine_check use Xv functions API.
dnl -----------------------------------------------
if test x$ac_have_xv = "xyes"; then
- EXTRA_X_LIBS="-L$xv_path $XV_LIB -lXext"
+ EXTRA_X_LIBS="-L$xv_path $XV_LIBS -lXext"
EXTRA_X_CFLAGS=""
fi
- AC_SUBST(XV_LIB)
+ AC_SUBST(XV_LIBS)
AC_SUBST(EXTRA_X_LIBS)
AC_SUBST(EXTRA_X_CFLAGS)
])
@@ -84,7 +84,7 @@ AC_DEFUN([AC_FIND_LIBXV],
fi
# Try the other lib if prefered failed
- if test x$XV_LIB = x; then
+ if test x$XV_LIBS = x; then
if ! test "x$xv_prefer_shared" = "xyes"; then
AC_PATH_LIBXV_IMPL([libXv.so])
else
@@ -92,7 +92,7 @@ AC_DEFUN([AC_FIND_LIBXV],
fi
fi
- if ! test x$XV_LIB = x; then
+ if ! test x$XV_LIBS = x; then
AC_TEST_LIBXV
fi
])
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 64d95b4f8..2121c009d 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -95,18 +95,18 @@ xineplug_vo_out_xshm_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(MLIB_CFLAGS) -
xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module
xineplug_vo_out_xv_la_SOURCES = $(X11OSD) deinterlace.c video_out_xv.c
-xineplug_vo_out_xv_la_LIBADD = $(XV_LIB) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
+xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
xineplug_vo_out_xv_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) -fno-strict-aliasing
xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module
xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c video_out_xvmc.c
-xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
+xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIBS) $(XV_LIBS) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
xineplug_vo_out_xvmc_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS)
xineplug_vo_out_xvmc_la_LDFLAGS = -avoid-version -module
xineplug_vo_out_xxmc_la_SOURCES = $(X11OSD) deinterlace.c video_out_xxmc.c\
xvmc_mocomp.c xvmc_vld.c xxmc.h
-xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIB) $(XV_LIB) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
+xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIBS) $(XV_LIBS) $(X_LIBS) -lXext $(X_PRE_LIBS) -lX11 $(XINE_LIB) $(THREAD_LIBS)
xineplug_vo_out_xxmc_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) -fno-strict-aliasing
xineplug_vo_out_xxmc_la_LDFLAGS = -avoid-version -module
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 18:33:52 +0000