mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 20:21:24 +00:00
test for regular shm instead of XShm
Original commit message from CVS: test for regular shm instead of XShm
This commit is contained in:
parent
7198372b61
commit
441423050e
1 changed files with 19 additions and 15 deletions
34
configure.ac
34
configure.ac
|
@ -229,6 +229,8 @@ dnl ====================================
|
||||||
|
|
||||||
GST_GLIB2_CHECK()
|
GST_GLIB2_CHECK()
|
||||||
|
|
||||||
|
dnl Check for additional libraries that we might use:
|
||||||
|
dnl =================================================
|
||||||
dnl GTK
|
dnl GTK
|
||||||
HAVE_GTK=NO
|
HAVE_GTK=NO
|
||||||
PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no)
|
PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no)
|
||||||
|
@ -252,7 +254,6 @@ AC_SUBST(GTK_CFLAGS)
|
||||||
AC_SUBST(HAVE_GTK)
|
AC_SUBST(HAVE_GTK)
|
||||||
AM_CONDITIONAL(HAVE_GDK_LOADERS, test "x$HAVE_GTK_22" = "xyes")
|
AM_CONDITIONAL(HAVE_GDK_LOADERS, test "x$HAVE_GTK_22" = "xyes")
|
||||||
|
|
||||||
|
|
||||||
dnl Check for X11 extensions
|
dnl Check for X11 extensions
|
||||||
AC_PATH_XTRA
|
AC_PATH_XTRA
|
||||||
if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
|
if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
|
||||||
|
@ -473,6 +474,17 @@ dnl ;;
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
|
dnl *** X check ***
|
||||||
|
translit(dnm, m, l) AM_CONDITIONAL(USE_XFREE, true)
|
||||||
|
GST_CHECK_FEATURE(XFREE, [X11 XFree86],
|
||||||
|
[ximagesink xvideosink], [
|
||||||
|
if test "$X_CFLAGS" = "-DX_DISPLAY_MISSING"; then
|
||||||
|
HAVE_XFREE=no
|
||||||
|
else
|
||||||
|
HAVE_XFREE=yes
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
dnl *** XVideo ***
|
dnl *** XVideo ***
|
||||||
dnl Look for the PIC library first, Debian requires it.
|
dnl Look for the PIC library first, Debian requires it.
|
||||||
dnl Check debian-devel archives for gory details.
|
dnl Check debian-devel archives for gory details.
|
||||||
|
@ -487,18 +499,11 @@ dnl FIXME: add check if this platform can support linking to a
|
||||||
dnl non-PIC libXv, if not then don not use Xv.
|
dnl non-PIC libXv, if not then don not use Xv.
|
||||||
dnl FIXME: perhaps warn user if they have a shared libXv since
|
dnl FIXME: perhaps warn user if they have a shared libXv since
|
||||||
dnl this is an error until XFree86 starts shipping one
|
dnl this is an error until XFree86 starts shipping one
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_XFREE, true)
|
|
||||||
GST_CHECK_FEATURE(XFREE, [X11 XFree86], xvideosink-X, [
|
|
||||||
if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
|
|
||||||
HAVE_XFREE=no
|
|
||||||
else
|
|
||||||
HAVE_XFREE=yes
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
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)
|
||||||
GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink-Xv, [
|
GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions],
|
||||||
|
[xvimagesink xvideosink], [
|
||||||
if test x$HAVE_XFREE = xyes; then
|
if test x$HAVE_XFREE = xyes; then
|
||||||
AC_CHECK_LIB(Xv_pic, XvQueryExtension,
|
AC_CHECK_LIB(Xv_pic, XvQueryExtension,
|
||||||
HAVE_XVIDEO="yes", HAVE_XVIDEO="no",
|
HAVE_XVIDEO="yes", HAVE_XVIDEO="no",
|
||||||
|
@ -523,11 +528,10 @@ GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink-Xv, [
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl check for XShm
|
dnl check for Shm
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_XSHM, true)
|
translit(dnm, m, l) AM_CONDITIONAL(USE_SHM, true)
|
||||||
GST_CHECK_FEATURE(XSHM, [X11 Shared Memory], ximage, [
|
GST_CHECK_FEATURE(SHM, [Shared Memory], ximage with shm, [
|
||||||
AC_CHECK_HEADER(X11/extensions/XShm.h,
|
AC_CHECK_HEADER(sys/shm.h, HAVE_SHM="yes", HAVE_SHM="no")
|
||||||
HAVE_XSHM=yes, HAVE_XSHM=no)
|
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl Next, check for the optional libraries:
|
dnl Next, check for the optional libraries:
|
||||||
|
|
Loading…
Reference in a new issue