mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-11 19:06:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix build on older automake

Browse source 
Original commit message from CVS:
fix build on older automake
This commit is contained in:
Thomas Vander Stichele 2004-10-27 00:21:33 +00:00
parent 2a0f723c85
commit 54ec63a763
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-10-27 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:
* ext/cdaudio/Makefile.am:
* sys/Makefile.am:
fix build on older automake
2004-10-26 Wim Taymans <wim@fluendo.com> 2004-10-26 Wim Taymans <wim@fluendo.com>
* ext/dv/gstdvdec.c: (gst_dvdec_video_getcaps), * ext/dv/gstdvdec.c: (gst_dvdec_video_getcaps),

12
configure.ac
View file

@ -647,13 +647,14 @@ dnl v4l/v4l2 checks have been moved down because they require X
dnl *** Video 4 Linux *** 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) dnl renamed to GST_V4L in accordance with V4L2 below
GST_CHECK_FEATURE(V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [ translit(dnm, m, l) AM_CONDITIONAL(USE_GST_V4L, true)
GST_CHECK_FEATURE(GST_V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [
# first check X # first check X
HAVE_V4L="no" HAVE_GST_V4L="no"
if test "$HAVE_X" = "yes" if test "$HAVE_X" = "yes"
then then
AC_CHECK_DECL(VID_TYPE_MPEG_ENCODER, HAVE_V4L="yes", HAVE_V4L="no", [ AC_CHECK_DECL(VID_TYPE_MPEG_ENCODER, HAVE_GST_V4L="yes", HAVE_GST_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>
@ -663,7 +664,8 @@ GST_CHECK_FEATURE(V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [
dnl *** Video 4 Linux 2 *** dnl *** Video 4 Linux 2 ***
dnl for information about the header/define, see sys/v4l2/gstv4l2element.h dnl for information about the header/define, see sys/v4l2/gstv4l2element.h
translit(dnm, m, l) AM_CONDITIONAL(USE_V4L2, true) dnl renamed to GST_V4L2 because of some conflict with kernel headers
translit(dnm, m, l) AM_CONDITIONAL(USE_GST_V4L2, true)
GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2src, [ GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2src, [
HAVE_GST_V4L2="no" HAVE_GST_V4L2="no"
if test "$HAVE_X" = "yes" if test "$HAVE_X" = "yes"