diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | ext/cdaudio/Makefile.am | 1 | ||||
| -rw-r--r-- | sys/Makefile.am | 2 |
4 files changed, 15 insertions, 7 deletions
@@ -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> * ext/dv/gstdvdec.c: (gst_dvdec_video_getcaps), diff --git a/configure.ac b/configure.ac index d4e0525a..f5bf7eb3 100644 --- a/configure.ac +++ b/configure.ac @@ -647,13 +647,14 @@ dnl v4l/v4l2 checks have been moved down because they require X 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, [ +dnl renamed to GST_V4L in accordance with V4L2 below +translit(dnm, m, l) AM_CONDITIONAL(USE_GST_V4L, true) +GST_CHECK_FEATURE(GST_V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [ # first check X - HAVE_V4L="no" + HAVE_GST_V4L="no" if test "$HAVE_X" = "yes" 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> #define _LINUX_TIME_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 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, [ HAVE_GST_V4L2="no" if test "$HAVE_X" = "yes" diff --git a/ext/cdaudio/Makefile.am b/ext/cdaudio/Makefile.am index 0fb0ff16..f16bbdb0 100644 --- a/ext/cdaudio/Makefile.am +++ b/ext/cdaudio/Makefile.am @@ -1,4 +1,3 @@ - plugin_LTLIBRARIES = libgstcdaudio.la libgstcdaudio_la_SOURCES = gstcdaudio.c diff --git a/sys/Makefile.am b/sys/Makefile.am index a9b35763..e27534da 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -34,7 +34,7 @@ else SUNAUDIO_DIR= endif -if USE_V4L +if USE_GST_V4L V4L_DIR=v4l else V4L_DIR= |