summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2005-04-18 14:17:33 +0000
committerTim-Philipp Müller <tim@centricular.net>2005-04-18 14:17:33 +0000
commit238f266051c86474409be2802b507b67c800eed7 (patch)
treecaa42bd34a34ededae2b12585adb227e3bb5c6b9
parent4ade52ec5ed490e22352fb49ab881a813ff58f7e (diff)
downloadgst-plugins-bad-238f266051c86474409be2802b507b67c800eed7.tar.gz
gst-plugins-bad-238f266051c86474409be2802b507b67c800eed7.tar.bz2
gst-plugins-bad-238f266051c86474409be2802b507b67c800eed7.zip
configure.ac: Add X_CFLAGS to CFLAGS while checking for
Original commit message from CVS: * configure.ac: Add X_CFLAGS to CFLAGS while checking for X11/Xlib.h, otherwise we won't find X if it's installed in an unusual location (fixes #300495).
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac3
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a468d764..48c2fbd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-18 Tim-Philipp Müller <tim at centricular dot net>
+
+ * configure.ac:
+ Add X_CFLAGS to CFLAGS while checking for
+ X11/Xlib.h, otherwise we won't find X if it's
+ installed in an unusual location (fixes #300495).
+
2005-04-18 Edward Hervey <bilboed@bilboed.com>
* ext/snapshot/gstsnapshot.c: (gst_snapshot_chain):
diff --git a/configure.ac b/configure.ac
index 518585cb..eabda12f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -607,7 +607,10 @@ GST_CHECK_FEATURE(X, [X libraries and plugins],
[ximagesink], [
AC_PATH_XTRA
dnl now try to find the HEADER
+ save_cflags=$CFLAGS
+ CFLAGS="$CFLAGS $X_CFLAGS"
AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no")
+ CFLAGS="$save_cflags"
if test "x$HAVE_X" = "xno"
then