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

configure.ac: Add libogg section

Browse Source 
Add libogg section rather than checking for it every time it's necessary.
This commit is contained in:
Avuton Olrich
2010-04-23 06:48:12 -07:00
parent 681128def4
commit b8b2ef3de1
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@@ -628,6 +628,9 @@ if test x$enable_lastfm = xyes; then
fi fi
AM_CONDITIONAL(ENABLE_LASTFM, test x$enable_lastfm = xyes) AM_CONDITIONAL(ENABLE_LASTFM, test x$enable_lastfm = xyes)
dnl ---------------------------------- libogg ---------------------------------
PKG_CHECK_MODULES(OGG, [ogg], enable_ogg=yes, enable_ogg=no)
dnl ---------------------------------- libmms --------------------------------- dnl ---------------------------------- libmms ---------------------------------
MPD_AUTO_PKG(mms, MMS, [libmms >= 0.4], MPD_AUTO_PKG(mms, MMS, [libmms >= 0.4],
[libmms mms:// protocol support], [libmms not found]) [libmms mms:// protocol support], [libmms not found])
@@ -768,9 +771,12 @@ if test x$enable_flac = xyes; then
LIBS="$oldlibs" LIBS="$oldlibs"
if test x$enable_oggflac = xflac; then if test x$enable_oggflac = xflac; then
PKG_CHECK_MODULES(OGG, [ogg], FLAC_LIBS="${FLAC_LIBS} -logg", if test x$enable_ogg = xyes; then
enable_oggflac=yes; FLAC_LIBS="${FLAC_LIBS} -logg",
AC_MSG_WARN("FLAC has the ogg API built in, but couldn't find ogg. Disabling oggflac.")) else
enable_oggflac=yes
AC_MSG_WARN("FLAC has the ogg API built in, but couldn't find ogg. Disabling oggflac.")
fi
fi fi
fi fi
@@ -970,9 +976,14 @@ AM_CONDITIONAL(HAVE_OGGFLAC, test x$enable_oggflac = xyes)
dnl -------------------------------- Ogg Vorbis ------------------------------- dnl -------------------------------- Ogg Vorbis -------------------------------
if test x$enable_tremor != xno && test x$enable_vorbis = xyes; then if test x$enable_tremor != xno && test x$enable_vorbis = xyes; then
PKG_CHECK_MODULES(VORBIS, [ogg vorbis vorbisfile], if test x$enable_ogg = xyes; then
AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]), PKG_CHECK_MODULES(VORBIS, [vorbis vorbisfile],
enable_vorbis=no) AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]),
enable_vorbis=no)
else
AC_MSG_WARN("Ogg not detected, could not enable Vorbis.")
enable_vorbis=no
fi
fi fi
AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes) AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes)