Skip to content

M
mpd
Commit f1fb4e99 authored by Avuton Olrich's avatar Avuton Olrich Committed by Max Kellermann
Browse files
Options

configure: Always run pkg-config for shout, define AC_DEFINE if enabled

[mk: don't run pkg-config when shout is disabled]
parent 04b092bb
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 11 deletions
configure.ac
View file @ f1fb4e99
...@@ -593,10 +593,10 @@ AC_ARG_ENABLE(shout, ...@@ -593,10 +593,10 @@ AC_ARG_ENABLE(shout,
[enables the shoutcast streaming output (default: disable)]),, [enables the shoutcast streaming output (default: disable)]),,
[enable_shout=no]) [enable_shout=no])
if test x$enable_oggvorbis_encoder = xyes || test x$enable_lame_encoder = xyes; then if test x$enable_shout = xyes; then
PKG_CHECK_MODULES([SHOUT], [shout],, PKG_CHECK_MODULES([SHOUT], [shout],
[enable_oggvorbis_encoder=no; enable_lame_encoder=no; AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]),
AC_MSG_WARN([disabling shout streaming support because libshout is not available])]) enable_shout=no)
fi fi
if test x$enable_oggvorbis_encoder = xyes; then if test x$enable_oggvorbis_encoder = xyes; then
...@@ -628,13 +628,6 @@ if test x$enable_lame_encoder = xyes; then ...@@ -628,13 +628,6 @@ if test x$enable_lame_encoder = xyes; then
fi fi
fi fi
if test x$enable_oggvorbis_encoder = xyes || test x$enable_lame_encoder = xyes; then
enable_shout=yes
AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support])
else
enable_shout=no
fi
AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes) AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes)
AM_CONDITIONAL(ENABLE_ENCODER, test x$enable_shout = xyes || test x$enable_httpd_output = xyes) AM_CONDITIONAL(ENABLE_ENCODER, test x$enable_shout = xyes || test x$enable_httpd_output = xyes)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment