diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-25 19:47:27 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-11-25 19:47:27 +0000 |
| commit | abdd7c762e646a27d0db6951364148163a0d7925 (patch) | |
| tree | beeaa0437e8ed6c8f29b5d7419d363ea768a54b3 | |
| parent | 3941eb3a9ce0ce94b5b8002eef60a587b9bbc0ea (diff) | |
| download | xine-lib-abdd7c762e646a27d0db6951364148163a0d7925.tar.gz xine-lib-abdd7c762e646a27d0db6951364148163a0d7925.tar.bz2 | |
Port nsf plugin build-disabling option to 1.2.
| -rw-r--r-- | m4/decoders.m4 | 5 | ||||
| -rw-r--r-- | m4/summary.m4 | 5 | ||||
| -rw-r--r-- | src/combined/Makefile.am | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/m4/decoders.m4 b/m4/decoders.m4 index fa008bc10..3552ba6a2 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -52,6 +52,11 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ [test x"$enableval" != x"no" && enable_asf="yes"]) AM_CONDITIONAL([ENABLE_ASF], [test x"$enable_asf" != x"no"]) + dnl Nosefart (optional, enabled by default) + AC_ARG_ENABLE([nosefart], + [AS_HELP_STRING([--enable-nosefart], [Enable support for nosefart player (default: enabled)])], + [test x"$enableval" != x"no" && enable_nosefart="yes"]) + AM_CONDITIONAL([ENABLE_NOSEFART], [test "x$enable_nosefart" != "xno"]) dnl FAAD (optional; enabled by default) AC_ARG_ENABLE([faad], diff --git a/m4/summary.m4 b/m4/summary.m4 index 54b8e1ca9..996374424 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -60,6 +60,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ fi fi test x"$enable_asf" != x"no" && echo " - asf" + test x"$enable_nosefart" != xno && echo " - Nosefart (NSF)" test x"$enable_mng" != x"no" && echo " - mng" test x"$have_modplug" = x"yes" && echo " - mod" test x"$have_libflac" = x"yes" && echo " - FLAC (with libFLAC)" @@ -102,9 +103,9 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ dnl audio decoders echo " * audio decoder plugins:" - echo " - GSM 06.10" - echo " - linear PCM - Nosefart (NSF)" + echo " - GSM 06.10 - linear PCM" test x"$enable_faad" != x"no" && echo " - faad" + test x"$enable_nosefart" != xno && echo " - Nosefart (NSF)" test x"$have_libflac" = x"yes" && echo " - FLAC (with libFLAC)" test x"$have_speex" = x"yes" && echo " - speex" test x"$have_vorbis" = x"yes" && echo " - vorbis" diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am index a32b886d4..0784b8044 100644 --- a/src/combined/Makefile.am +++ b/src/combined/Makefile.am @@ -7,6 +7,10 @@ if ENABLE_WAVPACK xineplug_wavpack = xineplug_wavpack.la endif +if ENABLE_NOSEFART +xineplug_nsf = xineplug_nsf.la +endif + if ENABLE_LIBFLAC xineplug_flac = xineplug_flac.la endif @@ -17,7 +21,7 @@ $(top_builddir)/contrib/nosefart/libnosefart.la: xineplug_LTLIBRARIES = \ $(xineplug_wavpack) \ $(xineplug_flac) \ - xineplug_nsf.la + $(xineplug_nsf) xineplug_wavpack_la_SOURCES = wavpack_demuxer.c wavpack_decoder.c wavpack_combined.c wavpack_combined.h xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS) |