From 92513c3309b1cd01633e1f359eb03a679c884e0d Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 15 Oct 2008 20:40:04 +0200
Subject: shout: check for vorbisenc library

The switch from ogg.m4 to pkg-config intentionally disabled
libvorbisenc.  Enable it when shout_ogg is used.
---
 configure.ac    | 4 +++-
 src/Makefile.am | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index c92c9a441..e3018a087 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,7 +208,9 @@ if test x$enable_shout_ogg = xyes; then
 		enable_shout_ogg=no
 	fi
 	if test x$enable_shout_ogg = xyes; then
-		AC_DEFINE(HAVE_SHOUT_OGG, 1, [Define to enable ogg streaming support])
+		PKG_CHECK_MODULES(VORBISENC, [vorbisenc],
+			AC_DEFINE(HAVE_SHOUT_OGG, 1, [Define to enable ogg streaming support]),
+			enable_shout_ogg=no)
 	fi
 fi
 
diff --git a/src/Makefile.am b/src/Makefile.am
index e31d442e8..6c8974fec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -196,13 +196,13 @@ mpd_SOURCES = \
 mpd_CFLAGS = $(MPD_CFLAGS)
 mpd_CPPFLAGS = \
 	$(AO_CFLAGS) $(ALSA_CFLAGS) \
-	$(OGGVORBIS_CFLAGS) \
+	$(OGGVORBIS_CFLAGS) $(VORBISENC_CFLAGS) \
 	$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \
 	$(AUDIOFILE_CFLAGS) $(LIBMIKMOD_CFLAGS) \
 	$(GLIB_CFLAGS)
 mpd_LDADD = $(MPD_LIBS) $(MP4FF_LIB) \
 	$(AO_LIBS) $(ALSA_LIBS) \
-	$(OGGVORBIS_LIBS) $(FLAC_LIBS) \
+	$(OGGVORBIS_LIBS) $(VORBISENC_LIBS) $(FLAC_LIBS) \
 	$(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \
 	$(GLIB_LIBS)
 
-- 
cgit v1.2.3