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

shout: check for vorbisenc library

Browse Source 
The switch from ogg.m4 to pkg-config intentionally disabled
libvorbisenc.  Enable it when shout_ogg is used.
This commit is contained in:
Max Kellermann 2008-10-15 20:40:04 +02:00
parent 30cd345581
commit 92513c3309
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -208,7 +208,9 @@ if test x$enable_shout_ogg = xyes; then
enable_shout_ogg=no enable_shout_ogg=no
fi fi
if test x$enable_shout_ogg = xyes; then 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
fi fi

4
src/Makefile.am
View File

@ -196,13 +196,13 @@ mpd_SOURCES = \
mpd_CFLAGS = $(MPD_CFLAGS) mpd_CFLAGS = $(MPD_CFLAGS)
mpd_CPPFLAGS = \ mpd_CPPFLAGS = \
$(AO_CFLAGS) $(ALSA_CFLAGS) \ $(AO_CFLAGS) $(ALSA_CFLAGS) \
$(OGGVORBIS_CFLAGS) \ $(OGGVORBIS_CFLAGS) $(VORBISENC_CFLAGS) \
$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \ $(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \
$(AUDIOFILE_CFLAGS) $(LIBMIKMOD_CFLAGS) \ $(AUDIOFILE_CFLAGS) $(LIBMIKMOD_CFLAGS) \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
mpd_LDADD = $(MPD_LIBS) $(MP4FF_LIB) \ mpd_LDADD = $(MPD_LIBS) $(MP4FF_LIB) \
$(AO_LIBS) $(ALSA_LIBS) \ $(AO_LIBS) $(ALSA_LIBS) \
$(OGGVORBIS_LIBS) $(FLAC_LIBS) \ $(OGGVORBIS_LIBS) $(VORBISENC_LIBS) $(FLAC_LIBS) \
$(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \ $(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \
$(GLIB_LIBS) $(GLIB_LIBS)