mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-30 19:18:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: ximagesrc has moved to -good, so no need to check for the required X libs here any more.

Browse source 
Original commit message from CVS:
* configure.ac:
ximagesrc has moved to -good, so no need to check for
the required X libs here any more.
This commit is contained in:
Tim-Philipp Müller 2008-02-06 18:56:40 +00:00
parent b830c4bd7d
commit 20751bdbd3
3 changed files with 7 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-02-06 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
ximagesrc has moved to -good, so no need to check for
the required X libs here any more.
2008-02-06 Sebastian Dröge <slomo@circular-chaos.org>
Patch by: Wouter Cloetens <wouter at mind dot be>

2
common

@ -1 +1 @@
Subproject commit 3c5473161ce19a3530bad279b842d542895b1500
Subproject commit 8b37d7ee833fab1d25b484d8574df3dae231b5f2

31
configure.ac
View file

@ -320,36 +320,6 @@ AG_GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [
AC_CHECK_HEADER(linux/cdrom.h, HAVE_VCD="yes", HAVE_VCD="no")
])
dnl Check for X11
translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
AG_GST_CHECK_FEATURE(X, [X libraries and plugins],
[ximagesrc], [
AC_PATH_XTRA
dnl now try to find the HEADER
ac_cflags_save="$CFLAGS"
ac_cppflags_save="$CPPFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
AC_CHECK_HEADER(X11/X.h, HAVE_X="yes", HAVE_X="no")
if test "x$HAVE_X" = "xno"
then
AC_MSG_NOTICE([cannot find X11 development files])
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,
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)
fi
AC_SUBST(HAVE_X)
CFLAGS="$ac_cflags_save"
CPPFLAGS="$ac_cppflags_save"
])
dnl *** ext plug-ins ***
dnl keep this list sorted alphabetically !
@ -993,7 +963,6 @@ dnl but we still need to set the conditionals
AM_CONDITIONAL(USE_OPENGL, false)
AM_CONDITIONAL(USE_QUICKTIME, false)
AM_CONDITIONAL(USE_VCD, false)
AM_CONDITIONAL(USE_X, false)
AM_CONDITIONAL(USE_ALSA, false)
AM_CONDITIONAL(USE_AMRWB, false)
AM_CONDITIONAL(USE_BZ2, false)