summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2004-03-16 18:00:18 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2004-03-16 18:00:18 +0000
commit0016a53a84ef1b63ff6af573d3a5e07e6e397b95 (patch)
treed4f0894125145425793d0b07307f96648d3cb224
parent6e19cf02efbbea7bac86a400ab55c2087b337b37 (diff)
downloadgst-plugins-bad-0016a53a84ef1b63ff6af573d3a5e07e6e397b95.tar.gz
gst-plugins-bad-0016a53a84ef1b63ff6af573d3a5e07e6e397b95.tar.bz2
gst-plugins-bad-0016a53a84ef1b63ff6af573d3a5e07e6e397b95.zip
fix X check explain version check
Original commit message from CVS: fix X check explain version check
-rw-r--r--ChangeLog8
-rw-r--r--configure.ac12
2 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 6bdc5d69..654011a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2004-03-16 Thomas Vander Stichele <thomas at apestaart dot org>
+ * common/ChangeLog:
+ * common/gst-autogen.sh:
+ add some explanation about the version detection
+ * configure.ac:
+ fix X check
+
+2004-03-16 Thomas Vander Stichele <thomas at apestaart dot org>
+
* configure.ac: bump nano to 1
=== gst-plugins 0.8.0 ===
diff --git a/configure.ac b/configure.ac
index d63ed49b..b11ebe2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -507,20 +507,20 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
GST_CHECK_FEATURE(X, [X libraries and plugins],
[ximagesink], [
AC_PATH_XTRA
-dnl if test "x$X_CFLAGS" == "x" -o "$X_CFLAGS" == "-DX_DISPLAY_MISSING"
- if test "x$X_DISPLAY_MISSING" = "x1"
+ dnl now try to find the HEADER
+ AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no")
+
+ if test "x$HAVE_X" = "xno"
then
AC_MSG_NOTICE([cannot find X11 development files])
- HAVE_X="no"
else
dnl this is much more than we want
X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
- dnl AC_PATH_XTRA only defines the path needed to find the X libs, not the libs
- dnl therefore we add them here
+ dnl AC_PATH_XTRA only defines the path needed to find the X libs,
+ dnl it does not add the libs; therefore we add them here
X_LIBS="$X_LIBS -lX11"
AC_SUBST(X_CFLAGS)
AC_SUBST(X_LIBS)
- HAVE_X="yes"
fi
AC_SUBST(HAVE_X)
])