diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-07-21 01:36:41 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-07-21 01:36:41 +0000 |
| commit | 1297b9db7f5e540f1fe47360b11d88bd09b84548 (patch) | |
| tree | 7b9ce181ebbe1ad552008e7c567da47a3aff30ba | |
| parent | 50d391287d28c359470fdf77b4d41b7dee7311e5 (diff) | |
| download | xine-lib-1297b9db7f5e540f1fe47360b11d88bd09b84548.tar.gz xine-lib-1297b9db7f5e540f1fe47360b11d88bd09b84548.tar.bz2 | |
faad build can be optional.
CVS patchset: 2332
CVS date: 2002/07/21 01:36:41
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | src/libfaad/Makefile.am | 6 |
2 files changed, 14 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 60e5dc80a..8f4a80acc 100644 --- a/configure.in +++ b/configure.in @@ -613,6 +613,13 @@ AC_ARG_ENABLE(asf, [ --disable-asf Do not build ASF demuxer], enable_asf=no, enable_asf=yes) AM_CONDITIONAL(BUILD_ASF, test x"$enable_asf" = "xyes") +dnl +dnl FAAD build can be optional +dnl +AC_ARG_ENABLE(faad, [ --disable-faad Do not build FAAD decoder], + enable_faad=no, enable_faad=yes) +AM_CONDITIONAL(BUILD_FAAD, test x"$enable_faad" = "xyes") + dnl dnl ip_mreqn @@ -1134,15 +1141,17 @@ echo "" dnl audio decoders echo " * audio decoder plugins:" echo " - a52 - dts" -echo " - mad - faad" -echo " - adpcm - lpcm" -echo " - roqaudio" +echo " - mad - adpcm" +echo " - lpcm - roqaudio" if test x"$no_oggvorbis" = "xno"; then echo " - vorbis" fi if test x"$enable_w32dll" = "xyes"; then echo " - w32dll" fi +if test x"$enable_faad" = "xyes"; then + echo " - faad" +fi echo "" dnl spu decoders diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index ecc1c31c9..83b5319ba 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -8,14 +8,13 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic libdir = $(XINE_PLUGINDIR) - CFLAGS = @CFLAGS@ -I$(srcdir)/fftw DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/fftw -#if HAVE_FAAD +if BUILD_FAAD faad_module = xineplug_decode_faad.la -#endif +endif lib_LTLIBRARIES = $(faad_module) @@ -37,7 +36,6 @@ noinst_HEADERS = analysis.h bits.h common.h data.h decoder.h drc.h error.h \ sbr_dec.h sbr_huff.h sbr_qmf.h sbr_syntax.h \ specrec.h syntax.h tns.h codebook/hcb.h faad.h - debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" |