diff options
| -rw-r--r-- | configure.ac | 56 | ||||
| -rw-r--r-- | ext/Makefile.am | 35 |
2 files changed, 75 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 23812d8c..1c8288fd 100644 --- a/configure.ac +++ b/configure.ac @@ -378,6 +378,50 @@ GST_CHECK_FEATURE(AALIB, [aasink plug-in], aasink, [ AS_SCRUB_INCLUDE(AALIB_CFLAGS) ]) +dnl *** AMR-NB *** +translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true) +GST_CHECK_FEATURE(AMRNB, [AMR-NB], amrnbdec amrnbenc, [ + GST_CHECK_LIBHEADER(AMRNB, amrnb, + Decoder_Interface_init, -lm, + amrnb/interf_dec.h, + AMRNB_LIBS="-lamrnb -lm" + AC_SUBST(AMRNB_LIBS)) +]) + +dnl **** Free AAC Decoder (FAAD) **** +translit(dnm, m, l) AM_CONDITIONAL(USE_FAAD, true) +GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [ + HAVE_FAAD="yes" + GST_CHECK_LIBHEADER(FAAD, faad, faacDecOpen, -lm, faad.h, FAAD_LIBS="-lfaad -lm", HAVE_FAAD="no") + if test $HAVE_FAAD = "yes"; then + AC_MSG_CHECKING([Checking for FAAD >= 2]) + AC_TRY_RUN([ + +#include <faad.h> +#if !defined(FAAD2_VERSION) || !defined(FAAD_FMT_DOUBLE) +#error Not faad2 +#else +#include <string.h> + +int main() +{ +char version[9] = FAAD2_VERSION; +// a release candidate of 2.0 is not enought for us +if ( strstr( version, "2.0 RC" ) ) { return 1; } + +return 0; +} + +#endif + ], + [ HAVE_FAAD="yes" && AC_MSG_RESULT(yes)], + [ HAVE_FAAD="no" && AC_MSG_RESULT(no)]) + fi; + AS_SCRUB_INCLUDE(FAAD_CFLAGS) + AC_SUBST(FAAD_LIBS) +]) + + dnl *** libcaca *** translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true) GST_CHECK_FEATURE(LIBCACA, [libcaca], libcaca, [ @@ -434,6 +478,15 @@ GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [ ]) AC_SUBST(MAD_LIBS) +dnl *** mpeg2dec *** +translit(dnm, m, l) AM_CONDITIONAL(USE_MPEG2DEC, true) +GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [ + PKG_CHECK_MODULES(MPEG2DEC, libmpeg2 >= 0.4.0, + HAVE_MPEG2DEC="yes", HAVE_MPEG2DEC="no") + AC_SUBST(MPEG2DEC_CFLAGS) + AC_SUBST(MPEG2DEC_LIBS) +]) + dnl *** dv1394 *** translit(dnm, m, l) AM_CONDITIONAL(USE_DV1394, true) GST_CHECK_FEATURE(DV1394, [raw1394 and avc1394 library], dv1394src, [ @@ -555,6 +608,9 @@ ext/raw1394/Makefile ext/shout2/Makefile ext/sidplay/Makefile ext/esd/Makefile +ext/mpeg2dec/Makefile +ext/faad/Makefile +ext/amrnb/Makefile po/Makefile.in common/Makefile common/m4/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 7aac9970..13e48435 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -10,11 +10,11 @@ else AALIB_DIR= endif -# if USE_AMRNB -# AMRNB_DIR=amrnb -# else -AMRNB_DIR= -# endif +if USE_AMRNB + AMRNB_DIR=amrnb +else + AMRNB_DIR= +endif # if USE_ARTS # ARTS_DIR=arts @@ -106,11 +106,11 @@ endif FAAC_DIR= # endif -# if USE_FAAD -# FAAD_DIR=faad -# else -FAAD_DIR= -# endif +if USE_FAAD + FAAD_DIR=faad +else + FAAD_DIR= +endif ## if USE_FESTIVAL ## FESTIVAL_DIR=festival @@ -238,11 +238,11 @@ endif MIKMOD_DIR= # endif -# if USE_MPEG2DEC -# MPEG2DEC_DIR=mpeg2dec -# else -MPEG2DEC_DIR= -#endif +if USE_MPEG2DEC + MPEG2DEC_DIR=mpeg2dec +else + MPEG2DEC_DIR= +endif # if USE_MPEG2ENC # MPEG2ENC_DIR=mpeg2enc @@ -440,4 +440,7 @@ DIST_SUBDIRS=\ libcaca \ esd \ raw1394 \ - dv + dv \ + amrnb \ + faad \ + mpeg2dec |