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
1c4eb87d8a
commit
0e04196b71
12
configure.ac
12
configure.ac
@ -425,18 +425,24 @@ 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"
|
|
||||||
|
|
||||||
|
if test x$HAVE_XVIDEO = xyes; then
|
||||||
|
XVIDEO_LIBS="-lXv_pic -lXext"
|
||||||
|
AC_SUBST(XVIDEO_LIBS)
|
||||||
|
else
|
||||||
dnl try again using something else if we didn't find it first
|
dnl try again using something else if we didn't find it first
|
||||||
if test x$HAVE_XVIDEO = xno; then
|
if test x$HAVE_XVIDEO = xno; then
|
||||||
AC_CHECK_LIB(Xv, XvQueryExtension,
|
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
|
|
||||||
|
|
||||||
|
if test x$HAVE_XVIDEO = xyes; then
|
||||||
|
XVIDEO_LIBS="-lXv -lXext"
|
||||||
AC_SUBST(XVIDEO_LIBS)
|
AC_SUBST(XVIDEO_LIBS)
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl Next, check for the optional libraries:
|
dnl Next, check for the optional libraries:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user