mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix X check explain version check

Browse source 
Original commit message from CVS:
fix X check
explain version check
This commit is contained in:
Thomas Vander Stichele 2004-03-16 18:00:18 +00:00
parent 01273c716a
commit 1506c66aef
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
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> 2004-03-16 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: bump nano to 1 * configure.ac: bump nano to 1

12
configure.ac
View file

@ -507,20 +507,20 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
GST_CHECK_FEATURE(X, [X libraries and plugins], GST_CHECK_FEATURE(X, [X libraries and plugins],
[ximagesink], [ [ximagesink], [
AC_PATH_XTRA AC_PATH_XTRA
dnl if test "x$X_CFLAGS" == "x" -o "$X_CFLAGS" == "-DX_DISPLAY_MISSING" dnl now try to find the HEADER
if test "x$X_DISPLAY_MISSING" = "x1" AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no")
if test "x$HAVE_X" = "xno"
then then
AC_MSG_NOTICE([cannot find X11 development files]) AC_MSG_NOTICE([cannot find X11 development files])
HAVE_X="no"
else else
dnl this is much more than we want dnl this is much more than we want
X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS" 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 AC_PATH_XTRA only defines the path needed to find the X libs,
dnl therefore we add them here dnl it does not add the libs; therefore we add them here
X_LIBS="$X_LIBS -lX11" X_LIBS="$X_LIBS -lX11"
AC_SUBST(X_CFLAGS) AC_SUBST(X_CFLAGS)
AC_SUBST(X_LIBS) AC_SUBST(X_LIBS)
HAVE_X="yes"
fi fi
AC_SUBST(HAVE_X) AC_SUBST(HAVE_X)
]) ])