mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-04 09:42:19 +00:00
vdpau: Fix pkg-config test
If the pkg-config check doesn't succeed, test with the old method instead of bailing out of configure with an error.
This commit is contained in:
parent
f85c84af1f
commit
16124a1c1e
1 changed files with 28 additions and 27 deletions
51
configure.ac
51
configure.ac
|
@ -1537,35 +1537,36 @@ AG_GST_CHECK_FEATURE(VDPAU, [VDPAU], vdpau, [
|
||||||
VDPAU_LIBS=-lvdpau
|
VDPAU_LIBS=-lvdpau
|
||||||
HAVE_VDPAU=no
|
HAVE_VDPAU=no
|
||||||
|
|
||||||
PKG_CHECK_MODULES(VDPAU, vdpau, [HAVE_VDPAU="yes"])
|
PKG_CHECK_MODULES(VDPAU, vdpau, [HAVE_VDPAU="yes"],
|
||||||
|
[
|
||||||
if test "$HAVE_VDPAU" = "no"; then
|
if test "$HAVE_VDPAU" = "no"; then
|
||||||
saved_CPPFLAGS="$CPPFLAGS"
|
saved_CPPFLAGS="$CPPFLAGS"
|
||||||
AC_CHECK_HEADER([vdpau/vdpau.h], [HAVE_VDPAU_H=yes])
|
|
||||||
|
|
||||||
if test -z "$HAVE_VDPAU_H"; then
|
|
||||||
dnl Didn't find VDPAU header straight away.
|
|
||||||
dnl Try /usr/include/nvidia. Need to clear caching vars first
|
|
||||||
AC_MSG_NOTICE([VDPAU header not in standard path. Checking /usr/include/nvidia])
|
|
||||||
unset ac_cv_header_vdpau_vdpau_h
|
|
||||||
unset ac_cv_header_vdpau_vdpau_x11_h
|
|
||||||
VDPAU_CFLAGS="-I/usr/include/nvidia"
|
|
||||||
VDPAU_LIBS="-L/usr/lib/nvidia -lvdpau"
|
|
||||||
CPPFLAGS="$VDPAU_CFLAGS $saved_CPPFLAGS"
|
|
||||||
AC_CHECK_HEADER([vdpau/vdpau.h], [HAVE_VDPAU_H=yes])
|
AC_CHECK_HEADER([vdpau/vdpau.h], [HAVE_VDPAU_H=yes])
|
||||||
fi
|
|
||||||
|
|
||||||
AC_CHECK_HEADER([vdpau/vdpau_x11.h], [HAVE_VDPAU_X11_H=yes])
|
if test -z "$HAVE_VDPAU_H"; then
|
||||||
|
dnl Didn't find VDPAU header straight away.
|
||||||
|
dnl Try /usr/include/nvidia. Need to clear caching vars first
|
||||||
|
AC_MSG_NOTICE([VDPAU header not in standard path. Checking /usr/include/nvidia])
|
||||||
|
unset ac_cv_header_vdpau_vdpau_h
|
||||||
|
unset ac_cv_header_vdpau_vdpau_x11_h
|
||||||
|
VDPAU_CFLAGS="-I/usr/include/nvidia"
|
||||||
|
VDPAU_LIBS="-L/usr/lib/nvidia -lvdpau"
|
||||||
|
CPPFLAGS="$VDPAU_CFLAGS $saved_CPPFLAGS"
|
||||||
|
AC_CHECK_HEADER([vdpau/vdpau.h], [HAVE_VDPAU_H=yes])
|
||||||
|
fi
|
||||||
|
|
||||||
if test "x$HAVE_VDPAU_H" = "xyes" -a "x$HAVE_VDPAU_X11_H" = "xyes"; then
|
AC_CHECK_HEADER([vdpau/vdpau_x11.h], [HAVE_VDPAU_X11_H=yes])
|
||||||
dnl Found the headers - look for the lib
|
|
||||||
AC_MSG_NOTICE([VDPAU headers found. Checking libraries])
|
if test "x$HAVE_VDPAU_H" = "xyes" -a "x$HAVE_VDPAU_X11_H" = "xyes"; then
|
||||||
saved_LIBS="$LIBS"
|
dnl Found the headers - look for the lib
|
||||||
LIBS="$VDPAU_LIBS $saved_LIBS"
|
AC_MSG_NOTICE([VDPAU headers found. Checking libraries])
|
||||||
AC_CHECK_LIB(vdpau,vdp_device_create_x11,[HAVE_VDPAU="yes"])
|
saved_LIBS="$LIBS"
|
||||||
LIBS="$saved_LIBS"
|
LIBS="$VDPAU_LIBS $saved_LIBS"
|
||||||
|
AC_CHECK_LIB(vdpau,vdp_device_create_x11,[HAVE_VDPAU="yes"])
|
||||||
|
LIBS="$saved_LIBS"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
])
|
||||||
|
|
||||||
if test "$HAVE_VDPAU" = "yes"; then
|
if test "$HAVE_VDPAU" = "yes"; then
|
||||||
AC_MSG_NOTICE([Found up to date VDPAU installation])
|
AC_MSG_NOTICE([Found up to date VDPAU installation])
|
||||||
|
|
Loading…
Reference in a new issue