diff options
| author | Max Kellermann <max@duempel.org> | 2008-10-15 20:40:04 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-10-15 20:40:04 +0200 |
| commit | 92513c3309b1cd01633e1f359eb03a679c884e0d (patch) | |
| tree | 308801d1c8ac59377a54154c4ae1d9c2c9fd1080 | |
| parent | 30cd3455812b5a839552d5a0f6fa87a99f09c46a (diff) | |
| download | mpd-92513c3309b1cd01633e1f359eb03a679c884e0d.tar.gz mpd-92513c3309b1cd01633e1f359eb03a679c884e0d.tar.xz mpd-92513c3309b1cd01633e1f359eb03a679c884e0d.zip | |
shout: check for vorbisenc library
The switch from ogg.m4 to pkg-config intentionally disabled
libvorbisenc. Enable it when shout_ogg is used.
Diffstat (limited to '')
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | 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) |