1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- configure.ac.orig 2009-06-10 00:32:20.000000000 +0200
+++ configure.ac 2010-07-24 18:02:39.000000000 +0200
@@ -10,7 +10,7 @@
AC_PROG_CXX
AC_PROG_CC
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
@@ -55,15 +55,15 @@
# --- vidio (optional video in-/output) ---
AC_SUBST(novidio, 0)
-AC_CHECK_HEADER(ffmpeg/avcodec.h,,AC_SUBST(novidio, 1))
-AC_CHECK_HEADER(ffmpeg/avformat.h,,AC_SUBST(novidio, 1))
-AC_TRY_COMPILE([#include <ffmpeg/avio.h>
- #include <ffmpeg/avformat.h>],
+AC_CHECK_HEADER(libavcodec/avcodec.h,,AC_SUBST(novidio, 1))
+AC_CHECK_HEADER(libavformat/avformat.h,,AC_SUBST(novidio, 1))
+AC_TRY_COMPILE([#include <libavformat/avio.h>
+ #include <libavformat/avformat.h>],
[AVFormatContext fc; url_fclose(fc.pb);],
- [], [AC_DEFINE(HAVE_OLD_AVFORMAT)])
+ [], [])
AM_CONDITIONAL([have_vidio], [test "$novidio" != 1])
-AC_SUBST(nov4l2, 0)
+AC_SUBST(nov4l2, 1)
AC_CHECK_HEADER(linux/videodev2.h,,AC_SUBST(nov4l2, 1))
AM_CONDITIONAL([have_v4l2], [test "$nov4l2" != 1])
|
