diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-08-26 17:06:43 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-08-26 17:06:43 +0200 |
commit | 567fb2d4ff1270a3c425688bd410edadc12428a2 (patch) | |
tree | 93b92ebf01ce3526cb2d4eb74fe52d3502e5ecc5 | |
parent | 2f29d651b5bd843411315861f2946dc64dbd4ac7 (diff) |
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>
-rw-r--r-- | a52/Makefile.am | 3 | ||||
-rw-r--r-- | a52/pcm_a52.c | 2 | ||||
-rw-r--r-- | configure.in | 43 | ||||
-rw-r--r-- | rate-lavc/Makefile.am | 3 | ||||
-rw-r--r-- | rate-lavc/rate_lavcrate.c | 2 |
5 files changed, 35 insertions, 18 deletions
diff --git a/a52/Makefile.am b/a52/Makefile.am index 30c5c51..4929c53 100644 --- 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 97acfe7..1abfdaa 100644 --- 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 3731249..301dea3 100644 --- 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 ca5b5d8..126cfcf 100644 --- 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 ce48495..ea2e2f5 100644 --- 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; |