diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | sys/Makefile.am | 2 |
3 files changed, 16 insertions, 6 deletions
@@ -1,5 +1,15 @@ 2004-08-30 Thomas Vander Stichele <thomas at apestaart dot org> + Patch by: David Schleef + + * configure.ac: + * sys/Makefile.am: + rename our detection macro for V4L2. Fixes #151236. + +2004-08-30 Thomas Vander Stichele <thomas at apestaart dot org> + + Patch by: David Schleef + * configure.ac: check to define LAMEPRESET. Fixes #151232. diff --git a/configure.ac b/configure.ac index 1a5ff31a..9766ee1f 100644 --- a/configure.ac +++ b/configure.ac @@ -675,8 +675,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) -GST_CHECK_FEATURE(V4L2, [Video 4 Linux 2], v4l2src, [ - HAVE_V4L2="no" +GST_CHECK_FEATURE(GST_V4L2, [Video 4 Linux 2], v4l2src, [ + HAVE_GST_V4L2="no" if test "$HAVE_X" = "yes" then AC_MSG_CHECKING([Checking for uptodate v4l2 installation]) @@ -690,15 +690,15 @@ GST_CHECK_FEATURE(V4L2, [Video 4 Linux 2], v4l2src, [ #endif ], [ return 0; - ], [ HAVE_V4L2="yes" && AC_MSG_RESULT(yes)], - [ HAVE_V4L2="no" && AC_MSG_RESULT(no) && + ], [ HAVE_GST_V4L2="yes" && AC_MSG_RESULT(yes)], + [ HAVE_GST_V4L2="no" && AC_MSG_RESULT(no) && AC_CHECK_HEADER(linux/videodev2.h, [ AC_MSG_WARN([video4linux2 headers were found, but they're old. Please update v4l2 to compile the v4l2 plugins])], [ AC_MSG_WARN([video4linux2 was not found])]) ]) fi dnl check for missing v4l2_buffer declaration (see #135919) - if [ test x$HAVE_V4L2 = xyes ]; then + if [ test x$HAVE_GST_V4L2 = xyes ]; then MISSING_DECL=0 AC_MSG_CHECKING(struct v4l2_buffer declaration) AC_TRY_COMPILE([ diff --git a/sys/Makefile.am b/sys/Makefile.am index 7028846a..a9b35763 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -40,7 +40,7 @@ else V4L_DIR= endif -if USE_V4L2 +if USE_GST_V4L2 V4L2_DIR=v4l2 else V4L2_DIR= |