Fix build with recent ffmpeg

Add a check of pkgconfig libavcodec in configure script.
Since the header file was moved to <libavcodec/*>, its location has
to be checked in configure, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/a52/Makefile.am b/a52/Makefile.am
index 30c5c51d9d368a265dd2c79ac70f7efc8fe0e7a6..4929c5311cac28e9c26d7abf914fbc4426c6f64b 100644 (file)
--- a/a52/Makefile.am
+++ b/a52/Makefile.am
@@ -2,7 +2,8 @@ asound_module_pcm_a52_LTLIBRARIES = libasound_module_pcm_a52.la
 
 asound_module_pcm_a52dir = @ALSA_PLUGIN_DIR@
 
-AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@
+AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@ \
+       -DAVCODEC_HEADER="@AVCODEC_HEADER@"
 AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined
 
 libasound_module_pcm_a52_la_SOURCES = pcm_a52.c

diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
index 97acfe7913530050beaa399f6087feb1f049df32..1abfdaa60d070dff46bb3bfdcecce2bb6225d374 100644 (file)
--- a/a52/pcm_a52.c
+++ b/a52/pcm_a52.c
@@ -25,7 +25,7 @@
 #include <alsa/asoundlib.h>
 #include <alsa/pcm_external.h>
 #include <alsa/pcm_plugin.h>
-#include <ffmpeg/avcodec.h>
+#include AVCODEC_HEADER
 
 struct a52_ctx {
        snd_pcm_ioplug_t io;

diff --git a/configure.in b/configure.in
index 373124953c2df7cf61c2856b119da6c876b67c0c..301dea317bc5fb336d26dc52dd7b19cf2a5b8536 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -45,28 +45,42 @@ if test "$use_maemo_rm" = "yes"; then
         fi
 fi
 
-AC_ARG_WITH([avcodec-includedir],
+PKG_CHECK_MODULES(AVCODEC, [libavcodec], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
+if test "$HAVE_AVCODEC" != "yes"; then
+  AC_ARG_WITH([avcodec-includedir],
        AS_HELP_STRING([--with-avcodec-includedir=dir],
                [AVcodec include directory]),
        [AVCODEC_CFLAGS="-I$withval"], [AVCODEC_CFLAGS=""])
-AC_ARG_WITH([avcodec-libdir],
+  AC_ARG_WITH([avcodec-libdir],
        AS_HELP_STRING([--with-avcodec-libdir=dir],
                [AVcodec library directory]),
        [AVCODEC_LIBS="-L$withval"], [AVCODEC_LIBS=""])
-CFLAGS_saved="$CFLAGS"
-LDFLAGS_saved="$LDFLAGS"
-CFLAGS="$CFLAGS $AVCODEC_CFLAGS"
-LDFLAGS="$LDFLAGS $AVCODEC_LIBS"
-AC_SUBST(AVCODEC_CFLAGS)
-AVCODEC_LIBS="$AVCODEC_LIBS -lavcodec"
-AC_SUBST(AVCODEC_LIBS)
-AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
-if test x$HAVE_AVCODEC = xyes; then
-  AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no])
+
+  CFLAGS_saved="$CFLAGS"
+  LDFLAGS_saved="$LDFLAGS"
+  CFLAGS="$CFLAGS $AVCODEC_CFLAGS"
+  LDFLAGS="$LDFLAGS $AVCODEC_LIBS"
+  AVCODEC_LIBS="$AVCODEC_LIBS -lavcodec"
+  AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
+  CFLAGS="$CFLAGS_saved"
+  LDFLAGS="$LDFLAGS_saved"
+fi
+
+if test $HAVE_AVCODEC = yes; then
+  AVCODEC_HEADER=""
+  AC_CHECK_HEADER([ffmpeg/avcodec.h], [AVCODEC_HEADER='<ffmpeg/avcodec.h>'])
+  if test -z "$AVCODEC_HEADER"; then
+    AC_CHECK_HEADER([libavcodec/avcodec.h], [AVCODEC_HEADER='<libavcodec/avcodec.h>'])
+  fi
+  if test -z "$AVCODEC_HEADER"; then
+    HAVE_AVCODEC=no
+  fi
 fi
+
 AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes)
-CFLAGS="$CFLAGS_saved"
-LDFLAGS="$LDFLAGS_saved"
+AC_SUBST(AVCODEC_CFLAGS)
+AC_SUBST(AVCODEC_LIBS)
+AC_SUBST(AVCODEC_HEADER)
 
 USE_LIBSPEEX=""
 AC_ARG_WITH([speex],
@@ -155,6 +169,7 @@ echo "A52, lavc plugins:  $HAVE_AVCODEC"
 if test "$HAVE_AVCODEC" = "yes"; then
   echo "  AVCODEC_CFLAGS: $AVCODEC_CFLAGS"
   echo "  AVCODEC_LIBS: $AVCODEC_LIBS"
+  echo "  AVCODEC_HEADER: $AVCODEC_HEADER"
 fi
 echo "Speex rate plugin:  $PPH"
 if test "$PPH" = "lib"; then

diff --git a/rate-lavc/Makefile.am b/rate-lavc/Makefile.am
index ca5b5d81036e5a25d60cb357d490b23edce2f3cc..126cfcf5fe0d7dbdc6f02cfcd7d1f8e28f30ea3d 100644 (file)
--- a/rate-lavc/Makefile.am
+++ b/rate-lavc/Makefile.am
@@ -2,7 +2,8 @@ asound_module_rate_lavcrate_LTLIBRARIES = libasound_module_rate_lavcrate.la
 
 asound_module_rate_lavcratedir = @ALSA_PLUGIN_DIR@
 
-AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@
+AM_CFLAGS = -Wall -g @ALSA_CFLAGS@ @AVCODEC_CFLAGS@ \
+       -DAVCODEC_HEADER="@AVCODEC_HEADER@"
 AM_LDFLAGS = -module -avoid-version -export-dynamic -no-undefined
 
 libasound_module_rate_lavcrate_la_SOURCES = rate_lavcrate.c

diff --git a/rate-lavc/rate_lavcrate.c b/rate-lavc/rate_lavcrate.c
index ce484957979747ae511ce32c2caa6ee470ec2504..ea2e2f54e8a8da0e255d7c734231bf3ff7edda8a 100644 (file)
--- a/rate-lavc/rate_lavcrate.c
+++ b/rate-lavc/rate_lavcrate.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <alsa/asoundlib.h>
 #include <alsa/pcm_rate.h>
-#include <ffmpeg/avcodec.h>
+#include AVCODEC_HEADER
 #include "gcd.h"
 
 static int filter_size = 16;