mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: use pkg-config to detect x11 and xv libs

Browse source 
AC_PATH_XTRA macro unnecessarily pulls in libSM and libICE.

https://bugzilla.gnome.org/show_bug.cgi?id=731047
This commit is contained in:
Tim-Philipp Müller 2014-08-10 17:30:18 +01:00
parent d960a25a19
commit f7d6087d53
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
configure.ac
View file

@ -542,34 +542,30 @@ dnl *** X11 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_X, true) translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
AG_GST_CHECK_FEATURE(X, [X libraries and plugins], AG_GST_CHECK_FEATURE(X, [X libraries and plugins],
[ximagesink], [ [ximagesink], [
AG_GST_CHECK_X AG_GST_PKG_CHECK_MODULES(X, x11)
]) ])
dnl Check for Xv extension dnl Check for Xv extension
translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true) translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true)
AG_GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], AG_GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions],
[xvimagesink], [ [xvimagesink], [
AG_GST_CHECK_XV AG_GST_PKG_CHECK_MODULES(XVIDEO, x11 xv)
]) ])
dnl check for X Shm dnl check for X Shm
translit(dnm, m, l) AM_CONDITIONAL(USE_XSHM, true) translit(dnm, m, l) AM_CONDITIONAL(USE_XSHM, true)
AG_GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], , [ AG_GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], [ ], [
if test x$HAVE_X = xyes; then if test x$HAVE_X = xyes; then
AC_CHECK_LIB(Xext, XShmAttach, PKG_CHECK_MODULES(XSHM, xext, [
HAVE_XSHM="yes", HAVE_XSHM="no", AC_CHECK_LIB(Xext, XShmAttach, [
$X_LIBS) HAVE_XSHM="yes"
if test "x$HAVE_XSHM" = "xyes"; then ], [
XSHM_LIBS="-lXext" HAVE_XSHM="no"
else XSHM_LIBS=""
dnl On AIX, it is in XextSam instead, but we still need -lXext ], [ $X_LIBS ])
AC_CHECK_LIB(XextSam, XShmAttach, ], [
HAVE_XSHM="yes", HAVE_XSHM="no", HAVE_XSHM="no"
$X_LIBS) ])
if test "x$HAVE_XSHM" = "xyes"; then
XSHM_LIBS="-lXext -lXextSam"
fi
fi
fi fi
], , [ ], , [
AC_SUBST(HAVE_XSHM) AC_SUBST(HAVE_XSHM)