mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 17:52:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: use pkg-config to detect x11 and simplify checks

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 18:55:07 +01:00
parent 6ea83d97c5
commit 09b1ba9491
1 changed files with 18 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
configure.ac
View file

@ -554,55 +554,28 @@ dnl Check for 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],
[ximagesrc], [ [ximagesrc], [
AG_GST_CHECK_X PKG_CHECK_MODULES(X, x11, [
if test "x$HAVE_X" = "xyes"
then
dnl check for Xfixes dnl check for Xfixes
PKG_CHECK_MODULES(XFIXES, xfixes, HAVE_XFIXES="yes", HAVE_XFIXES="no") PKG_CHECK_MODULES(XFIXES, xfixes, [
if test "x$HAVE_XFIXES" = "xyes" AC_DEFINE(HAVE_XFIXES, 1, [Defined if Xfixes is available])
then ])
XFIXES_CFLAGS="-DHAVE_XFIXES $XFIXES_CFLAGS"
fi
AC_SUBST(XFIXES_LIBS)
AC_SUBST(XFIXES_CFLAGS)
dnl check for Xdamage dnl check for Xdamage
PKG_CHECK_MODULES(XDAMAGE, xdamage, HAVE_XDAMAGE="yes", HAVE_XDAMAGE="no") PKG_CHECK_MODULES(XDAMAGE, xdamage, [
if test "x$HAVE_XDAMAGE" = "xyes" AC_DEFINE(HAVE_XDAMAGE, 1, [Defined if Xdamage is available])
then ])
XDAMAGE_CFLAGS="-DHAVE_XDAMAGE $XDAMAGE_CFLAGS"
fi
AC_SUBST(XDAMAGE_LIBS)
AC_SUBST(XDAMAGE_CFLAGS)
fi
])
dnl FIXME: this should be rolled into the test above, it's just an additional dnl check for X Shm
dnl feature of the ximagesrc plug-in PKG_CHECK_MODULES(XEXT, xext, [
dnl This is the same as in gst-plugins-base AC_CHECK_LIB(Xext, XShmAttach, [
dnl check for X Shm AC_DEFINE(HAVE_XSHM, 1, [Defined if XShm is available])
translit(dnm, m, l) AM_CONDITIONAL(USE_XSHM, true) XSHM_LIBS="$XEXT_LIBS"
AG_GST_CHECK_FEATURE(XSHM, [X Shared Memory extension], , [ XSHM_CFLAGS="$XEXT_CFLAGS"
if test x$HAVE_X = xyes; then ], [ $X_LIBS ])
AC_CHECK_LIB(Xext, XShmAttach, ])
HAVE_XSHM="yes", HAVE_XSHM="no", AC_SUBST(XSHM_LIBS)
$X_LIBS) AC_SUBST(XSHM_CFLAGS)
if test "x$HAVE_XSHM" = "xyes"; then ])
XSHM_LIBS="-lXext"
else
dnl On AIX, it is in XextSam instead, but we still need -lXext
AC_CHECK_LIB(XextSam, XShmAttach,
HAVE_XSHM="yes", HAVE_XSHM="no",
$X_LIBS)
if test "x$HAVE_XSHM" = "xyes"; then
XSHM_LIBS="-lXext -lXextSam"
fi
fi
fi
], ,[
AC_SUBST(HAVE_XSHM)
AC_SUBST(XSHM_LIBS)
]) ])
dnl *** ext plug-ins *** dnl *** ext plug-ins ***
@ -940,7 +913,6 @@ AM_CONDITIONAL(USE_VPX, false)
AM_CONDITIONAL(USE_WAVEFORM, false) AM_CONDITIONAL(USE_WAVEFORM, false)
AM_CONDITIONAL(USE_WAVPACK, false) AM_CONDITIONAL(USE_WAVPACK, false)
AM_CONDITIONAL(USE_X, false) AM_CONDITIONAL(USE_X, false)
AM_CONDITIONAL(USE_XSHM, false)
AM_CONDITIONAL(USE_ZLIB, false) AM_CONDITIONAL(USE_ZLIB, false)
fi dnl of EXT plugins fi dnl of EXT plugins