From c3580b925a6c33105ee483d3c616a16f8ce0bba9 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sun, 15 Mar 2009 21:25:16 +0000
Subject: Complain if both <ffmpeg/avutil.h> and <libavutil/avutil.h> are
 present. (Should have done this ages ago...)

---
 configure.ac | 4 ++++
 1 file changed, 4 insertions(+)

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
-- 
cgit v1.2.3