summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-01-21 22:50:19 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-01-21 22:50:19 +0000
commit6fc1e27bd88db652d47ac0c2ab05688af7e891b0 (patch)
tree6cf86089b1b53642f85ceb24382f460495ce495e
parent3b1ea7a4b95dbc0cfb4c38fb0923a089efae36f2 (diff)
downloadgstreamer-plugins-bad-6fc1e27bd88db652d47ac0c2ab05688af7e891b0.tar.gz
stray x check
Original commit message from CVS: stray x check
-rw-r--r--configure.ac8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 5de15eac5..9c39cb676 100644
--- a/configure.ac
+++ b/configure.ac
@@ -364,7 +364,12 @@ dnl non-PIC libXv, if not then don not use Xv.
dnl FIXME: perhaps warn user if they have a shared libXv since
dnl this is an error until XFree86 starts shipping one
translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true)
+
GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink videosink, [
+ dnl use X_CFLAGS for check
+ save_FLAGS=$CFLAGS
+ CFLAGS=$X_CFLAGS
+
dnl check for PIC static lib
GST_CHECK_LIBHEADER(XVIDEO, Xv_pic, XvQueryExtension, $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS, X11/extensions/Xvlib.h, XVIDEO_LIBS="-lXv_pic -lXext")
if test x$HAVE_XVIDEO = xno; then
@@ -372,6 +377,9 @@ GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink videosink, [
GST_CHECK_LIBHEADER(XVIDEO, Xv, XvQueryExtension, $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS, X11/extensions/Xvlib.h, XVIDEO_LIBS="-lXv -lXext")
fi
AC_SUBST(XVIDEO_LIBS)
+
+ dnl restore CFLAGS
+ CFLAGS=$save_CFLAGS
])
dnl Next, check for the optional libraries: