mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-05 06:58:56 +00:00
Now set XVIDEO_LIBS only if the Xv library is found. Fixed matroska check so that it doesn't stop the configure if i...
Original commit message from CVS: Now set XVIDEO_LIBS only if the Xv library is found. Fixed matroska check so that it doesn't stop the configure if it fails.
This commit is contained in:
parent
5d91be3043
commit
241c826ffa
1 changed files with 13 additions and 7 deletions
20
configure.ac
20
configure.ac
|
@ -425,17 +425,23 @@ GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink-Xv, [
|
||||||
AC_CHECK_LIB(Xv_pic, XvQueryExtension,
|
AC_CHECK_LIB(Xv_pic, XvQueryExtension,
|
||||||
HAVE_XVIDEO="yes", HAVE_XVIDEO="no",
|
HAVE_XVIDEO="yes", HAVE_XVIDEO="no",
|
||||||
$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
||||||
XVIDEO_LIBS="-lXv_pic -lXext"
|
|
||||||
|
|
||||||
dnl try again using something else if we didn't find it first
|
if test x$HAVE_XVIDEO = xyes; then
|
||||||
if test x$HAVE_XVIDEO = xno; then
|
XVIDEO_LIBS="-lXv_pic -lXext"
|
||||||
AC_CHECK_LIB(Xv, XvQueryExtension,
|
AC_SUBST(XVIDEO_LIBS)
|
||||||
|
else
|
||||||
|
dnl try again using something else if we didn't find it first
|
||||||
|
if test x$HAVE_XVIDEO = xno; then
|
||||||
|
AC_CHECK_LIB(Xv, XvQueryExtension,
|
||||||
HAVE_XVIDEO="yes", HAVE_XVIDEO="no",
|
HAVE_XVIDEO="yes", HAVE_XVIDEO="no",
|
||||||
$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
|
||||||
XVIDEO_LIBS="-lXv -lXext"
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_SUBST(XVIDEO_LIBS)
|
if test x$HAVE_XVIDEO = xyes; then
|
||||||
|
XVIDEO_LIBS="-lXv -lXext"
|
||||||
|
AC_SUBST(XVIDEO_LIBS)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue