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

4 files changed, 23 insertions, 23 deletions

diff --git a/Makefile.am b/Makefile.am
index 36137d109..268f03224 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -291,7 +291,7 @@ endif
 # decoder plugins
 
 DECODER_CFLAGS = \
-	$(OGGVORBIS_CFLAGS) $(TREMOR_CFLAGS) \
+	$(VORBIS_CFLAGS) $(TREMOR_CFLAGS) \
 	$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \
 	$(AUDIOFILE_CFLAGS) \
 	$(LIBMIKMOD_CFLAGS) \
@@ -304,7 +304,7 @@ DECODER_CFLAGS = \
 	$(CUE_CFLAGS)
 
 DECODER_LIBS = \
-	$(OGGVORBIS_LIBS) $(TREMOR_LIBS) \
+	$(VORBIS_LIBS) $(TREMOR_LIBS) \
 	$(FLAC_LIBS) \
 	$(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \
 	$(MODPLUG_LIBS) \
@@ -348,7 +348,7 @@ if HAVE_FLAC_COMMON
 DECODER_SRC += src/decoder/_flac_common.c
 endif
 
-if HAVE_OGGVORBIS
+if ENABLE_VORBIS_DECODER
 DECODER_SRC += src/decoder/vorbis_plugin.c
 endif
 
diff --git a/configure.ac b/configure.ac
index 2f09f5988..0a00c90fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -440,10 +440,10 @@ AC_ARG_ENABLE(oggflac,
 		[disable OggFLAC support (default: enable)]),,
 	enable_oggflac=yes)
 
-AC_ARG_ENABLE(oggvorbis,
-	AS_HELP_STRING([--disable-oggvorbis],
+AC_ARG_ENABLE(vorbis,
+	AS_HELP_STRING([--disable-vorbis],
 		[disable Ogg Vorbis support (default: enable)]),,
-	enable_oggvorbis=yes)
+	enable_vorbis=yes)
 
 dnl ###
 dnl Ogg Tremor
@@ -780,20 +780,20 @@ if test x$use_tremor = xyes; then
 	ac_save_LIBS="$LIBS"
 	CFLAGS="$CFLAGS $TREMOR_CFLAGS"
 	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]))
 	CFLAGS="$ac_save_CFLAGS"
 	LIBS="$ac_save_LIBS"
-	if test x$enable_oggvorbis = xyes; then
-		AC_DEFINE(HAVE_OGGVORBIS, 1, [Define for Ogg Vorbis support])
+	if test x$enable_vorbis = xyes; then
+		AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support])
 	fi
-elif test x$enable_oggvorbis = xyes; then
-	PKG_CHECK_MODULES(OGGVORBIS, [ogg vorbis vorbisfile],
-		AC_DEFINE(HAVE_OGGVORBIS, 1, [Define for Ogg Vorbis support]),
-		enable_oggvorbis=no)
+elif test x$enable_vorbis = xyes; then
+	PKG_CHECK_MODULES(VORBIS, [ogg vorbis vorbisfile],
+		AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]),
+		enable_vorbis=no)
 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
 	AC_DEFINE(HAVE_TREMOR,1,
@@ -844,7 +844,7 @@ AM_CONDITIONAL(HAVE_OGGFLAC, test x$enable_oggflac = xyes)
 AM_CONDITIONAL(HAVE_FLAC_COMMON,
 	  test x$enable_flac = xyes || test x$enable_oggflac = xyes)
 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
 	PKG_CHECK_MODULES(AUDIOFILE, [audiofile >= 0.1.7],
@@ -1330,7 +1330,7 @@ flac)
 	;;
 esac
 
-if test x$enable_oggvorbis = xyes; then
+if test x$enable_vorbis = xyes; then
 	echo " Ogg Vorbis support ............enabled"
 	if test x$use_tremor = xyes; then
 		echo "   using tremor.................yes"
@@ -1363,7 +1363,7 @@ fi
 
 if
 	test x$enable_mad = xno &&
-	test x$enable_oggvorbis = xno &&
+	test x$enable_vorbis = xno &&
 	test x$enable_flac = xno && 
 	test x$enable_oggflac = xno &&
 	test x$enable_audiofile = xno && 
diff --git a/scripts/test.sh b/scripts/test.sh
index aacc3e9e8..9419ee07f 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -26,7 +26,7 @@ $MAKE distclean
 ./configure --prefix=$PREFIX/small \
     --disable-dependency-tracking --enable-debug --enable-werror \
     --disable-un \
-    --disable-flac --disable-oggvorbis --enable-oggflac
+    --disable-flac --disable-vorbis --enable-oggflac
 $MAKE install
 $MAKE distclean
 
@@ -40,7 +40,7 @@ CFLAGS="$CFLAGS -DNDEBUG" \
     --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
     --disable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
     --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 \
     --with-zeroconf=no
 $MAKE install
@@ -55,7 +55,7 @@ $MAKE distclean
     --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
     --enable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
     --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
 $MAKE install
 $MAKE distclean
@@ -69,7 +69,7 @@ $MAKE distclean
     --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
     --disable-shout-ogg --enable-shout-mp3 --enable-lame-encoder \
     --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
 $MAKE install
 $MAKE distclean
@@ -84,7 +84,7 @@ $MAKE distclean
     --disable-ao --disable-alsa --disable-jack --disable-pulse --disable-fifo \
     --disable-shout-ogg --disable-shout-mp3 --disable-lame-encoder \
     --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
 $MAKE install
 $MAKE distclean
diff --git a/src/decoder_list.c b/src/decoder_list.c
index 8422db2df..8ae268241 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -47,7 +47,7 @@ static const struct decoder_plugin *const decoder_plugins[] = {
 #ifdef HAVE_MAD
 	&mad_decoder_plugin,
 #endif
-#ifdef HAVE_OGGVORBIS
+#ifdef ENABLE_VORBIS_DECODER
 	&vorbis_decoder_plugin,
 #endif
 #if defined(HAVE_FLAC) || defined(HAVE_OGGFLAC)