mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix X dependencies

Browse source 
Original commit message from CVS:
fix X dependencies
This commit is contained in:
Thomas Vander Stichele 2003-12-03 12:49:29 +00:00
parent b3caa1ac7c
commit 24cf217717
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
configure.ac
View file

@ -419,11 +419,16 @@ dnl *** Video 4 Linux ***
dnl for information about the header/define, see sys/v4l/gstv4lelement.h dnl for information about the header/define, see sys/v4l/gstv4lelement.h
translit(dnm, m, l) AM_CONDITIONAL(USE_V4L, true) translit(dnm, m, l) AM_CONDITIONAL(USE_V4L, true)
GST_CHECK_FEATURE(V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [ GST_CHECK_FEATURE(V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [
AC_CHECK_DECL(VID_TYPE_MPEG_ENCODER, HAVE_V4L="yes", HAVE_V4L="no", [ # first check X
HAVE_V4L="no"
if test "$HAVE_X" == "yes"
then
AC_CHECK_DECL(VID_TYPE_MPEG_ENCODER, HAVE_V4L="yes", HAVE_V4L="no", [
#include <sys/types.h> #include <sys/types.h>
#define _LINUX_TIME_H #define _LINUX_TIME_H
#include <linux/videodev.h> #include <linux/videodev.h>
]) ])
fi
]) ])
dnl *** Video 4 Linux 2*** dnl *** Video 4 Linux 2***

12
gst-libs/gst/Makefile.am
View file

@ -1,13 +1,15 @@
if USE_GCONF if USE_GCONF
GCONF_DIR=gconf GCONF_DIR = gconf
else else
GCONF_DIR= GCONF_DIR =
endif endif
if USE_X if USE_X
X_DIR=xwindowlistener xoverlay X_DIR = xwindowlistener xoverlay
X_INTERFACE_LIBS = xoverlay/libgstxoverlay.la
else else
X_DIR= X_DIR =
X_INTERFACE_LIBS =
endif endif
SUBDIRS = audio colorbalance floatcast \ SUBDIRS = audio colorbalance floatcast \
@ -33,7 +35,7 @@ libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = \
navigation/libgstnavigation.la \ navigation/libgstnavigation.la \
propertyprobe/libgstpropertyprobe.la \ propertyprobe/libgstpropertyprobe.la \
tuner/libgsttuner.la \ tuner/libgsttuner.la \
xoverlay/libgstxoverlay.la \ $(X_INTERFACE_LIBS) \
$(GST_LIBS) $(GST_LIBS)
libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@ libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@