mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 08:17:01 +00:00
fixing up X test and general features test
Original commit message from CVS: fixing up X test and general features test
This commit is contained in:
parent
971f3208d4
commit
d83f9a59f2
4 changed files with 30 additions and 20 deletions
|
@ -1,3 +1,9 @@
|
|||
2003-12-03 set REAL_NAME environment variable <thomas at apestaart dot org>
|
||||
|
||||
* common/m4/gst-feature.m4: *** instead of newline when not built
|
||||
* configure.ac: fix X detection when no X stuff present
|
||||
* gst-libs/gst/Makefile.am: put X dependencies inside conditional
|
||||
|
||||
2003-07-12 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||
|
||||
* gst-plugins.spec.in: fix up spec file
|
||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit b5288e8215c6eacf0782880f6c5b6dea8f445a34
|
||||
Subproject commit fcdc6ccbcc674dd487021d87a0313abf02bae396
|
12
configure.ac
12
configure.ac
|
@ -489,9 +489,13 @@ dnl ;;
|
|||
])
|
||||
|
||||
dnl Check for X11
|
||||
translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
|
||||
GST_CHECK_FEATURE(X, [X libraries and plugins],
|
||||
[ximagesink], [
|
||||
AC_PATH_XTRA
|
||||
if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
|
||||
AC_MSG_NOTICE([cannot find X11, the build system needs fixage])
|
||||
if test "x$X_CFLAGS" == "x" -o "$X_CFLAGS" == "-DX_DISPLAY_MISSING"
|
||||
then
|
||||
AC_MSG_NOTICE([cannot find X11 development files])
|
||||
HAVE_X="no"
|
||||
else
|
||||
dnl this is much more than we want
|
||||
|
@ -501,10 +505,10 @@ else
|
|||
X_LIBS="$X_LIBS -lX11"
|
||||
AC_SUBST(X_CFLAGS)
|
||||
AC_SUBST(X_LIBS)
|
||||
HAVE_X="yes";
|
||||
HAVE_X="yes"
|
||||
fi
|
||||
AC_SUBST(HAVE_X)
|
||||
AM_CONDITIONAL(USE_X, test "-DX_DISPLAY_MISSING" != "$X_CFLAGS")
|
||||
])
|
||||
|
||||
dnl *** XVideo ***
|
||||
dnl Look for the PIC library first, Debian requires it.
|
||||
|
|
|
@ -5,7 +5,7 @@ GCONF_DIR=
|
|||
endif
|
||||
|
||||
if USE_X
|
||||
X_DIR=xwindowlistener
|
||||
X_DIR=xwindowlistener xoverlay
|
||||
else
|
||||
X_DIR=
|
||||
endif
|
||||
|
@ -14,7 +14,7 @@ SUBDIRS = audio colorbalance floatcast \
|
|||
$(GCONF_DIR) idct media-info \
|
||||
mixer navigation play propertyprobe \
|
||||
resample riff tuner video \
|
||||
xoverlay $(X_DIR)
|
||||
$(X_DIR)
|
||||
|
||||
DIST_SUBDIRS = audio colorbalance floatcast \
|
||||
gconf idct media-info \
|
||||
|
|
Loading…
Reference in a new issue