Commit 332313a3 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Reordering

parent 015989f3
...@@ -943,12 +943,6 @@ fi ...@@ -943,12 +943,6 @@ fi
AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ]) AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
dnl Check for hal
PKG_ENABLE_MODULES_VLC([HAL], [], [hal >= 0.5.0], [Linux HAL services discovery], [auto])
dnl Check for mtp
PKG_ENABLE_MODULES_VLC([MTP], [], [libmtp >= 0.3.0],[MTP devices support],[auto])
dnl Check for dbus dnl Check for dbus
AC_ARG_ENABLE(dbus, AC_ARG_ENABLE(dbus,
[ --enable-dbus Linux D-BUS message bus system (default enabled)]) [ --enable-dbus Linux D-BUS message bus system (default enabled)])
...@@ -1674,9 +1668,6 @@ AS_IF([test "${enable_sout}" != "no"], [ ...@@ -1674,9 +1668,6 @@ AS_IF([test "${enable_sout}" != "no"], [
]) ])
AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"]) AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
dnl Check for libshout
PKG_ENABLE_MODULES_VLC([shout], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
dnl Lua modules dnl Lua modules
AC_ARG_ENABLE(lua, AC_ARG_ENABLE(lua,
AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface
...@@ -2565,6 +2556,11 @@ if test "${enable_sout}" != "no"; then ...@@ -2565,6 +2556,11 @@ if test "${enable_sout}" != "no"; then
PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg demux support], [auto]) PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg demux support], [auto])
fi fi
if test "${enable_sout}" != "no"; then
dnl Check for libshout
PKG_ENABLE_MODULES_VLC([shout], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
fi
dnl dnl
dnl matroska demux plugin dnl matroska demux plugin
dnl dnl
...@@ -4652,9 +4648,16 @@ fi ...@@ -4652,9 +4648,16 @@ fi
dnl dnl
dnl Bonjour services discovery dnl Bonjour services discovery
dnl
PKG_ENABLE_MODULES_VLC([BONJOUR], [], [avahi-client >= 0.6], [Bonjour services discovery], [auto]) PKG_ENABLE_MODULES_VLC([BONJOUR], [], [avahi-client >= 0.6], [Bonjour services discovery], [auto])
dnl
dnl HAL services discovery
PKG_ENABLE_MODULES_VLC([HAL], [], [hal >= 0.5.0], [Linux HAL services discovery], [auto])
dnl
dnl MTP devices services discovery
PKG_ENABLE_MODULES_VLC([MTP], [], [libmtp >= 0.3.0],[MTP devices support],[auto])
dnl dnl
dnl Lirc plugin dnl Lirc plugin
dnl dnl
......
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