oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure.ac: renamed --enable-oggvorbis to --enable-vorbis

This commit is contained in:
Max Kellermann 2009-04-01 22:45:17 +02:00
parent b914d3f6eb
commit 5242305a90
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -291,7 +291,7 @@ endif
# decoder plugins # decoder plugins
DECODER_CFLAGS = \ DECODER_CFLAGS = \
$(OGGVORBIS_CFLAGS) $(TREMOR_CFLAGS) \ $(VORBIS_CFLAGS) $(TREMOR_CFLAGS) \
$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \ $(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \
$(AUDIOFILE_CFLAGS) \ $(AUDIOFILE_CFLAGS) \
$(LIBMIKMOD_CFLAGS) \ $(LIBMIKMOD_CFLAGS) \
@ -304,7 +304,7 @@ DECODER_CFLAGS = \
$(CUE_CFLAGS) $(CUE_CFLAGS)
DECODER_LIBS = \ DECODER_LIBS = \
$(OGGVORBIS_LIBS) $(TREMOR_LIBS) \ $(VORBIS_LIBS) $(TREMOR_LIBS) \
$(FLAC_LIBS) \ $(FLAC_LIBS) \
$(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \ $(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \
$(MODPLUG_LIBS) \ $(MODPLUG_LIBS) \
@ -348,7 +348,7 @@ if HAVE_FLAC_COMMON
DECODER_SRC += src/decoder/_flac_common.c DECODER_SRC += src/decoder/_flac_common.c
endif endif
if HAVE_OGGVORBIS if ENABLE_VORBIS_DECODER
DECODER_SRC += src/decoder/vorbis_plugin.c DECODER_SRC += src/decoder/vorbis_plugin.c
endif endif

28
configure.ac
View File

@ -440,10 +440,10 @@ AC_ARG_ENABLE(oggflac,
[disable OggFLAC support (default: enable)]),, [disable OggFLAC support (default: enable)]),,
enable_oggflac=yes) enable_oggflac=yes)
AC_ARG_ENABLE(oggvorbis, AC_ARG_ENABLE(vorbis,
AS_HELP_STRING([--disable-oggvorbis], AS_HELP_STRING([--disable-vorbis],
[disable Ogg Vorbis support (default: enable)]),, [disable Ogg Vorbis support (default: enable)]),,
enable_oggvorbis=yes) enable_vorbis=yes)
dnl ### dnl ###
dnl Ogg Tremor dnl Ogg Tremor
@ -780,20 +780,20 @@ if test x$use_tremor = xyes; then
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $TREMOR_CFLAGS" CFLAGS="$CFLAGS $TREMOR_CFLAGS"
LIBS="$LIBS $TREMOR_LIBS" LIBS="$LIBS $TREMOR_LIBS"
AC_CHECK_LIB(vorbisidec,ov_read,enable_oggvorbis=yes,enable_oggvorbis=no; AC_CHECK_LIB(vorbisidec,ov_read,enable_vorbis=yes,enable_vorbis=no;
AC_MSG_WARN([vorbisidec lib needed for ogg support with tremor -- disabling ogg support])) AC_MSG_WARN([vorbisidec lib needed for ogg support with tremor -- disabling ogg support]))
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
if test x$enable_oggvorbis = xyes; then if test x$enable_vorbis = xyes; then
AC_DEFINE(HAVE_OGGVORBIS, 1, [Define for Ogg Vorbis support]) AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support])
fi fi
elif test x$enable_oggvorbis = xyes; then elif test x$enable_vorbis = xyes; then
PKG_CHECK_MODULES(OGGVORBIS, [ogg vorbis vorbisfile], PKG_CHECK_MODULES(VORBIS, [ogg vorbis vorbisfile],
AC_DEFINE(HAVE_OGGVORBIS, 1, [Define for Ogg Vorbis support]), AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]),
enable_oggvorbis=no) enable_vorbis=no)
fi fi
AM_CONDITIONAL(HAVE_OGGVORBIS, test x$enable_oggvorbis = xyes) AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes)
if test x$use_tremor = xyes; then if test x$use_tremor = xyes; then
AC_DEFINE(HAVE_TREMOR,1, AC_DEFINE(HAVE_TREMOR,1,
@ -844,7 +844,7 @@ AM_CONDITIONAL(HAVE_OGGFLAC, test x$enable_oggflac = xyes)
AM_CONDITIONAL(HAVE_FLAC_COMMON, AM_CONDITIONAL(HAVE_FLAC_COMMON,
test x$enable_flac = xyes || test x$enable_oggflac = xyes) test x$enable_flac = xyes || test x$enable_oggflac = xyes)
AM_CONDITIONAL(HAVE_OGG_COMMON, AM_CONDITIONAL(HAVE_OGG_COMMON,
test x$enable_oggvorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes) test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
if test x$enable_audiofile = xyes; then if test x$enable_audiofile = xyes; then
PKG_CHECK_MODULES(AUDIOFILE, [audiofile >= 0.1.7], PKG_CHECK_MODULES(AUDIOFILE, [audiofile >= 0.1.7],
@ -1330,7 +1330,7 @@ flac)
;; ;;
esac esac
if test x$enable_oggvorbis = xyes; then if test x$enable_vorbis = xyes; then
echo " Ogg Vorbis support ............enabled" echo " Ogg Vorbis support ............enabled"
if test x$use_tremor = xyes; then if test x$use_tremor = xyes; then
echo " using tremor.................yes" echo " using tremor.................yes"
@ -1363,7 +1363,7 @@ fi
if if
test x$enable_mad = xno && test x$enable_mad = xno &&
test x$enable_oggvorbis = xno && test x$enable_vorbis = xno &&
test x$enable_flac = xno && test x$enable_flac = xno &&
test x$enable_oggflac = xno && test x$enable_oggflac = xno &&
test x$enable_audiofile = xno && test x$enable_audiofile = xno &&

10
scripts/test.sh
View File

@ -26,7 +26,7 @@ $MAKE distclean
./configure --prefix=$PREFIX/small \ ./configure --prefix=$PREFIX/small \
--disable-dependency-tracking --enable-debug --enable-werror \ --disable-dependency-tracking --enable-debug --enable-werror \
--disable-un \ --disable-un \
--disable-flac --disable-oggvorbis --enable-oggflac --disable-flac --disable-vorbis --enable-oggflac
$MAKE install $MAKE install
$MAKE distclean $MAKE distclean
@ -40,7 +40,7 @@ CFLAGS="$CFLAGS -DNDEBUG" \
--disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \ --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
--disable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \ --disable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
--disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \ --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
--disable-flac --disable-oggvorbis --disable-oggflac --disable-audiofile \ --disable-flac --disable-vorbis --disable-oggflac --disable-audiofile \
--disable-cue \ --disable-cue \
--with-zeroconf=no --with-zeroconf=no
$MAKE install $MAKE install
@ -55,7 +55,7 @@ $MAKE distclean
--disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \ --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
--enable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \ --enable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
--disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \ --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
--disable-flac --enable-oggvorbis --disable-oggflac --disable-audiofile \ --disable-flac --enable-vorbis --disable-oggflac --disable-audiofile \
--with-zeroconf=no --with-zeroconf=no
$MAKE install $MAKE install
$MAKE distclean $MAKE distclean
@ -69,7 +69,7 @@ $MAKE distclean
--disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \ --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
--disable-shout-ogg --enable-shout-mp3 --enable-lame-encoder \ --disable-shout-ogg --enable-shout-mp3 --enable-lame-encoder \
--disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \ --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
--disable-flac --disable-oggvorbis --disable-oggflac --disable-audiofile \ --disable-flac --disable-vorbis --disable-oggflac --disable-audiofile \
--with-zeroconf=no --with-zeroconf=no
$MAKE install $MAKE install
$MAKE distclean $MAKE distclean
@ -84,7 +84,7 @@ $MAKE distclean
--disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \ --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
--disable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \ --disable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
--disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \ --disable-ffmpeg --disable-wavpack --disable-mpc --disable-aac \
--disable-flac --enable-oggvorbis --enable-oggflac --disable-audiofile \ --disable-flac --enable-vorbis --enable-oggflac --disable-audiofile \
--with-zeroconf=no --with-zeroconf=no
$MAKE install $MAKE install
$MAKE distclean $MAKE distclean

2
src/decoder_list.c
View File

@ -47,7 +47,7 @@ static const struct decoder_plugin *const decoder_plugins[] = {
#ifdef HAVE_MAD #ifdef HAVE_MAD
&mad_decoder_plugin, &mad_decoder_plugin,
#endif #endif
#ifdef HAVE_OGGVORBIS #ifdef ENABLE_VORBIS_DECODER
&vorbis_decoder_plugin, &vorbis_decoder_plugin,
#endif #endif
#if defined(HAVE_FLAC) || defined(HAVE_OGGFLAC) #if defined(HAVE_FLAC) || defined(HAVE_OGGFLAC)