diff options
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | gst-libs/gst/Makefile.am | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 8563f09f..f3704eb0 100644 --- a/configure.ac +++ b/configure.ac @@ -419,11 +419,16 @@ dnl *** Video 4 Linux *** dnl for information about the header/define, see sys/v4l/gstv4lelement.h translit(dnm, m, l) AM_CONDITIONAL(USE_V4L, true) 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> #define _LINUX_TIME_H #include <linux/videodev.h> - ]) + ]) + fi ]) dnl *** Video 4 Linux 2*** diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am index c39924ca..9cb04fea 100644 --- a/gst-libs/gst/Makefile.am +++ b/gst-libs/gst/Makefile.am @@ -1,13 +1,15 @@ if USE_GCONF -GCONF_DIR=gconf +GCONF_DIR = gconf else -GCONF_DIR= +GCONF_DIR = endif if USE_X -X_DIR=xwindowlistener xoverlay +X_DIR = xwindowlistener xoverlay +X_INTERFACE_LIBS = xoverlay/libgstxoverlay.la else -X_DIR= +X_DIR = +X_INTERFACE_LIBS = endif SUBDIRS = audio colorbalance floatcast \ @@ -33,7 +35,7 @@ libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = \ navigation/libgstnavigation.la \ propertyprobe/libgstpropertyprobe.la \ tuner/libgsttuner.la \ - xoverlay/libgstxoverlay.la \ + $(X_INTERFACE_LIBS) \ $(GST_LIBS) libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = @GST_PLUGINS_LT_LDFLAGS@ -version-info @GST_PLUGINS_LIBVERSION@ |