diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-15 21:25:16 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-03-15 21:25:16 +0000 |
| commit | c3580b925a6c33105ee483d3c616a16f8ce0bba9 (patch) | |
| tree | dd18f47908a6fe5471ebbcaef5bea620f2acf0e1 | |
| parent | ee2fbe251bffe9f3db12cf448760cf2ff12dc634 (diff) | |
| download | xine-lib-c3580b925a6c33105ee483d3c616a16f8ce0bba9.tar.gz xine-lib-c3580b925a6c33105ee483d3c616a16f8ce0bba9.tar.bz2 | |
Complain if both <ffmpeg/avutil.h> and <libavutil/avutil.h> are present.
(Should have done this ages ago...)
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 102081e58..595b7b3f5 100644 --- a/configure.ac +++ b/configure.ac @@ -353,6 +353,10 @@ if test "x$with_external_ffmpeg" != "xno"; then dnl Check presence of ffmpeg/avutil.h to see if it's old or new dnl style for headers. The new style would be preferred actually... AC_CHECK_HEADERS([ffmpeg/avutil.h]) + AC_CHECK_HEADERS([libavutil/avutil.h]) + if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then + AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!]) + fi AC_MSG_RESULT([using external ffmpeg]) else |