Commit 30f9eb49 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Simplify shout, libproxy detection

parent 79ff1143
......@@ -1702,16 +1702,7 @@ AS_IF([test "${enable_sout}" != "no"], [
AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
dnl Check for libshout
AC_ARG_ENABLE(shout,
[ --enable-shout libshout output plugin (default disabled)])
if test "${enable_shout}" = "yes"; then
PKG_CHECK_MODULES(SHOUT, shout >= 2.1,
[AC_DEFINE(HAVE_SHOUT, 1, [Define if you have the libshout library])
VLC_ADD_PLUGIN([access_output_shout])
VLC_ADD_LIBS([access_output_shout],[$SHOUT_LIBS])
VLC_ADD_CFLAGS([access_output_shout],[$SHOUT_CFLAGS])],
[AC_MSG_WARN(libshout library not found)])
fi
PKG_ENABLE_MODULES_VLC([access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
dnl Lua modules
AC_ARG_ENABLE(lua,
......@@ -1766,19 +1757,8 @@ AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
dnl
dnl libproxy support
dnl
AC_ARG_ENABLE(libproxy,
[ --enable-libproxy libproxy support (default auto)])
AS_IF([test "${enable_libproxy}" != "no"], [
PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, [
AC_DEFINE(HAVE_LIBPROXY, 1, [Define if libproxy is available])
VLC_ADD_CFLAGS([access_http],[$LIBPROXY_CFLAGS])
VLC_ADD_LIBS([access_http],[$LIBPROXY_LIBS])
], [
AS_IF([test "x${enable_libproxy}" != "x"], [
AC_MSG_ERROR([libproxy could not be found on your system])
])
])
])
PKG_ENABLE_MODULES_VLC([LIBPROXY], [libproxy-1.0], [libproxy support], [auto])
dnl
dnl VideoLAN manager
......@@ -1852,7 +1832,6 @@ AC_ARG_ENABLE(taglib,
[AC_MSG_WARN(TagLib library not found)])
])
dnl
dnl Input plugins
dnl
......
......@@ -82,7 +82,7 @@ AC_DEFUN([PKG_ENABLE_MODULES_VLC],
[
PKG_WITH_MODULES([$1],[$2],
VLC_ADD_PLUGIN(m4_tolower([$1]))
VLC_ADD_CFLAGS(m4_tolower([$1]),[$$1_CFLAGS] [$5] )
VLC_ADD_CFLAGS(m4_tolower([$1]),[$$1_CFLAGS] [$5])
VLC_ADD_LIBS(m4_tolower([$1]),[$$1_LIBS] [$6]),
AS_IF([test x"$AS_TR_SH([enable_]m4_tolower([$1]))" = "xyes"],
[AC_MSG_ERROR(Library [$2] needed for [m4_tolower([$1]) was not found])],
......
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