Skip to content

GitLab

Commit 120dd9b4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

VLC_ADD_PLUGINS -> VLC_ADD_PLUGIN

parent bd9b90d8
Hide whitespace changes
Inline Side-by-side
configure.ac
View file @ 120dd9b4
......@@ -472,7 +472,7 @@ AC_FUNC_ALLOCA
AH_BOTTOM([#include <vlc_fixups.h>])
AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGINS([access_mmap])])
AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGIN([access_mmap])])
AS_IF([test "${SYS}" = "linux"], [
AC_CHECK_FUNCS(tee)
......@@ -845,14 +845,14 @@ then
PKG_CHECK_MODULES(HAL, hal >= 0.5.0,
[ AC_DEFINE( HAVE_HAL_1, 1 , [Define if you have the new HAL library API])
AC_DEFINE( HAVE_HAL, 1, [Define if you have the HAL library] )
VLC_ADD_PLUGINS([hal])
VLC_ADD_PLUGINS([probe_hal])
VLC_ADD_PLUGIN([hal])
VLC_ADD_PLUGIN([probe_hal])
VLC_ADD_LIBS([libvlc hal probe_hal],[$HAL_LIBS])
VLC_ADD_CFLAGS([libvlc hal probe_hal],[$HAL_CFLAGS])],
dnl No hal 0.5 Test for 0.2
[ PKG_CHECK_MODULES( HAL, hal >= 0.2.97,
[AC_DEFINE(HAVE_HAL, 1, [Define if you have the HAL library])
VLC_ADD_PLUGINS([hal])
VLC_ADD_PLUGIN([hal])
VLC_ADD_LIBS([libvlc hal],[$HAL_LIBS])
VLC_ADD_CFLAGS([libvlc hal],[$HAL_CFLAGS])],
[AC_MSG_WARN(HAL library not found)])
......@@ -879,19 +879,19 @@ then
AC_ARG_ENABLE(dbus-control, [ --disable-dbus-control D-BUS control interface (default enabled)])
if test "${enable_dbus_control}" != "no"
then
VLC_ADD_PLUGINS([dbus])
VLC_ADD_PLUGIN([dbus])
VLC_ADD_LIBS([dbus],[$DBUS_LIBS])
VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS])
fi
dnl Check for Telepathy
AC_ARG_ENABLE(telepathy, [ --enable-telepathy Telepathy Presence plugin through DBus(default enabled)])
if test "${enable_telepathy}" != "no"; then
VLC_ADD_PLUGINS([telepathy])
VLC_ADD_PLUGIN([telepathy])
VLC_ADD_LIBS([telepathy],[$DBUS_LIBS])
VLC_ADD_CFLAGS([telepathy],[$DBUS_CFLAGS])
fi
dnl Power Management Inhibiter
VLC_ADD_PLUGINS([inhibit])
VLC_ADD_PLUGIN([inhibit])
VLC_ADD_LIBS([inhibit],[$DBUS_LIBS])
VLC_ADD_CFLAGS([inhibit],[$DBUS_CFLAGS])
],
......@@ -1183,119 +1183,119 @@ test "${enable_cprof}" != "yes" && enable_cprof="no"
dnl
dnl default modules
dnl
VLC_ADD_PLUGINS([dummy])
VLC_ADD_PLUGINS([logger])
VLC_ADD_PLUGINS([memcpy])
VLC_ADD_PLUGIN([dummy])
VLC_ADD_PLUGIN([logger])
VLC_ADD_PLUGIN([memcpy])
dnl Demuxers:
VLC_ADD_PLUGINS([mpgv])
VLC_ADD_PLUGINS([mpga])
VLC_ADD_PLUGINS([m4v])
VLC_ADD_PLUGINS([m4a])
VLC_ADD_PLUGINS([h264])
VLC_ADD_PLUGINS([vc1])
VLC_ADD_PLUGINS([demux_cdg])
VLC_ADD_PLUGINS([cdg])
VLC_ADD_PLUGINS([ps])
VLC_ADD_PLUGINS([pva])
VLC_ADD_PLUGINS([avi])
VLC_ADD_PLUGINS([asf])
VLC_ADD_PLUGINS([mp4])
VLC_ADD_PLUGINS([rawdv])
VLC_ADD_PLUGINS([rawvid])
VLC_ADD_PLUGINS([nsv])
VLC_ADD_PLUGINS([real])
VLC_ADD_PLUGINS([aiff])
VLC_ADD_PLUGINS([mjpeg])
VLC_ADD_PLUGINS([wav])
VLC_ADD_PLUGINS([voc])
VLC_ADD_PLUGINS([smf])
VLC_ADD_PLUGINS([demuxdump])
VLC_ADD_PLUGINS([flacsys])
VLC_ADD_PLUGINS([tta])
VLC_ADD_PLUGINS([subtitle])
VLC_ADD_PLUGINS([vobsub])
VLC_ADD_PLUGINS([a52sys])
VLC_ADD_PLUGINS([dtssys])
VLC_ADD_PLUGINS([au])
VLC_ADD_PLUGINS([ty])
VLC_ADD_PLUGINS([xa])
VLC_ADD_PLUGINS([nuv])
VLC_ADD_PLUGIN([mpgv])
VLC_ADD_PLUGIN([mpga])
VLC_ADD_PLUGIN([m4v])
VLC_ADD_PLUGIN([m4a])
VLC_ADD_PLUGIN([h264])
VLC_ADD_PLUGIN([vc1])
VLC_ADD_PLUGIN([demux_cdg])
VLC_ADD_PLUGIN([cdg])
VLC_ADD_PLUGIN([ps])
VLC_ADD_PLUGIN([pva])
VLC_ADD_PLUGIN([avi])
VLC_ADD_PLUGIN([asf])
VLC_ADD_PLUGIN([mp4])
VLC_ADD_PLUGIN([rawdv])
VLC_ADD_PLUGIN([rawvid])
VLC_ADD_PLUGIN([nsv])
VLC_ADD_PLUGIN([real])
VLC_ADD_PLUGIN([aiff])
VLC_ADD_PLUGIN([mjpeg])
VLC_ADD_PLUGIN([wav])
VLC_ADD_PLUGIN([voc])
VLC_ADD_PLUGIN([smf])
VLC_ADD_PLUGIN([demuxdump])
VLC_ADD_PLUGIN([flacsys])
VLC_ADD_PLUGIN([tta])
VLC_ADD_PLUGIN([subtitle])
VLC_ADD_PLUGIN([vobsub])
VLC_ADD_PLUGIN([a52sys])
VLC_ADD_PLUGIN([dtssys])
VLC_ADD_PLUGIN([au])
VLC_ADD_PLUGIN([ty])
VLC_ADD_PLUGIN([xa])
VLC_ADD_PLUGIN([nuv])
dnl Text codecs:
VLC_ADD_PLUGINS([cvdsub])
VLC_ADD_PLUGINS([svcdsub])
VLC_ADD_PLUGINS([spudec])
VLC_ADD_PLUGINS([subsdec])
VLC_ADD_PLUGINS([subsusf])
VLC_ADD_PLUGINS([t140])
VLC_ADD_PLUGINS([dvbsub])
VLC_ADD_PLUGINS([cc])
VLC_ADD_PLUGIN([cvdsub])
VLC_ADD_PLUGIN([svcdsub])
VLC_ADD_PLUGIN([spudec])
VLC_ADD_PLUGIN([subsdec])
VLC_ADD_PLUGIN([subsusf])
VLC_ADD_PLUGIN([t140])
VLC_ADD_PLUGIN([dvbsub])
VLC_ADD_PLUGIN([cc])
dnl Video codecs:
VLC_ADD_PLUGINS([cinepak])
VLC_ADD_PLUGIN([cinepak])
dnl Audio codecs:
VLC_ADD_PLUGINS([araw])
VLC_ADD_PLUGINS([adpcm])
VLC_ADD_PLUGINS([mpeg_audio])
VLC_ADD_PLUGINS([lpcm])
VLC_ADD_PLUGINS([a52])
VLC_ADD_PLUGINS([dts])
VLC_ADD_PLUGINS([flac])
VLC_ADD_PLUGIN([araw])
VLC_ADD_PLUGIN([adpcm])
VLC_ADD_PLUGIN([mpeg_audio])
VLC_ADD_PLUGIN([lpcm])
VLC_ADD_PLUGIN([a52])
VLC_ADD_PLUGIN([dts])
VLC_ADD_PLUGIN([flac])
dnl Video filters:
VLC_ADD_PLUGINS([deinterlace])
VLC_ADD_PLUGINS([invert])
VLC_ADD_PLUGINS([adjust])
VLC_ADD_PLUGINS([transform])
VLC_ADD_PLUGINS([wave])
VLC_ADD_PLUGINS([ripple])
VLC_ADD_PLUGINS([psychedelic])
VLC_ADD_PLUGINS([gradient])
VLC_ADD_PLUGINS([motionblur])
VLC_ADD_PLUGINS([rv32])
VLC_ADD_PLUGINS([rotate])
VLC_ADD_PLUGINS([noise])
VLC_ADD_PLUGINS([grain])
VLC_ADD_PLUGINS([extract])
VLC_ADD_PLUGINS([sharpen])
VLC_ADD_PLUGINS([seamcarving])
VLC_ADD_PLUGINS([croppadd])
VLC_ADD_PLUGINS([blendbench])
VLC_ADD_PLUGINS([blend])
VLC_ADD_PLUGINS([scale])
VLC_ADD_PLUGINS([image])
VLC_ADD_PLUGINS([vmem])
VLC_ADD_PLUGINS([logo])
VLC_ADD_PLUGINS([magnify])
VLC_ADD_PLUGINS([puzzle])
VLC_ADD_PLUGINS([colorthres])
VLC_ADD_PLUGIN([deinterlace])
VLC_ADD_PLUGIN([invert])
VLC_ADD_PLUGIN([adjust])
VLC_ADD_PLUGIN([transform])
VLC_ADD_PLUGIN([wave])
VLC_ADD_PLUGIN([ripple])
VLC_ADD_PLUGIN([psychedelic])
VLC_ADD_PLUGIN([gradient])
VLC_ADD_PLUGIN([motionblur])
VLC_ADD_PLUGIN([rv32])
VLC_ADD_PLUGIN([rotate])
VLC_ADD_PLUGIN([noise])
VLC_ADD_PLUGIN([grain])
VLC_ADD_PLUGIN([extract])
VLC_ADD_PLUGIN([sharpen])
VLC_ADD_PLUGIN([seamcarving])
VLC_ADD_PLUGIN([croppadd])
VLC_ADD_PLUGIN([blendbench])
VLC_ADD_PLUGIN([blend])
VLC_ADD_PLUGIN([scale])
VLC_ADD_PLUGIN([image])
VLC_ADD_PLUGIN([vmem])
VLC_ADD_PLUGIN([logo])
VLC_ADD_PLUGIN([magnify])
VLC_ADD_PLUGIN([puzzle])
VLC_ADD_PLUGIN([colorthres])
dnl Meta demuxers:
VLC_ADD_PLUGINS([playlist])
VLC_ADD_PLUGINS([export])
VLC_ADD_PLUGINS([nsc])
VLC_ADD_PLUGINS([xtag])
VLC_ADD_PLUGIN([playlist])
VLC_ADD_PLUGIN([export])
VLC_ADD_PLUGIN([nsc])
VLC_ADD_PLUGIN([xtag])
dnl Channel mixing audio filters:
VLC_ADD_PLUGINS([converter_fixed])
VLC_ADD_PLUGINS([mono])
VLC_ADD_PLUGINS([trivial_channel_mixer])
VLC_ADD_PLUGIN([converter_fixed])
VLC_ADD_PLUGIN([mono])
VLC_ADD_PLUGIN([trivial_channel_mixer])
dnl Resampling audio filters:
VLC_ADD_PLUGINS([trivial_resampler])
VLC_ADD_PLUGINS([ugly_resampler])
VLC_ADD_PLUGIN([trivial_resampler])
VLC_ADD_PLUGIN([ugly_resampler])
dnl Audio mixers:
VLC_ADD_PLUGINS([trivial_mixer])
VLC_ADD_PLUGIN([trivial_mixer])
dnl Video chromas:
VLC_ADD_PLUGINS([i420_rgb])
VLC_ADD_PLUGINS([grey_yuv])
VLC_ADD_PLUGIN([i420_rgb])
VLC_ADD_PLUGIN([grey_yuv])
dnl Video codecs:
VLC_ADD_PLUGINS([rawvideo])
VLC_ADD_PLUGIN([rawvideo])
dnl Access filters:
VLC_ADD_PLUGINS([access_filter_timeshift])
VLC_ADD_PLUGINS([access_filter_record])
VLC_ADD_PLUGINS([access_filter_dump])
VLC_ADD_PLUGINS([access_filter_bandwidth])
VLC_ADD_PLUGIN([access_filter_timeshift])
VLC_ADD_PLUGIN([access_filter_record])
VLC_ADD_PLUGIN([access_filter_dump])
VLC_ADD_PLUGIN([access_filter_bandwidth])
dnl Packetizers:
VLC_ADD_PLUGINS([packetizer_mpegvideo])
VLC_ADD_PLUGINS([packetizer_h264])
VLC_ADD_PLUGINS([packetizer_mpeg4video])
VLC_ADD_PLUGINS([packetizer_mpeg4audio])
VLC_ADD_PLUGINS([packetizer_vc1])
VLC_ADD_PLUGIN([packetizer_mpegvideo])
VLC_ADD_PLUGIN([packetizer_h264])
VLC_ADD_PLUGIN([packetizer_mpeg4video])
VLC_ADD_PLUGIN([packetizer_mpeg4audio])
VLC_ADD_PLUGIN([packetizer_vc1])
ALIASES="${ALIASES} cvlc"
......@@ -1303,53 +1303,53 @@ dnl
dnl default modules that need g++
dnl
AC_LANG_PUSH(C++)
VLC_ADD_PLUGINS([spatializer])
VLC_ADD_PLUGIN([spatializer])
AC_LANG_POP(C++)
if test "${SYS}" != "mingwce"; then
VLC_ADD_PLUGINS([gestures])
VLC_ADD_PLUGINS([rc])
VLC_ADD_PLUGINS([telnet])
VLC_ADD_PLUGINS([hotkeys])
VLC_ADD_PLUGINS([showintf])
VLC_ADD_PLUGINS([marq])
VLC_ADD_PLUGINS([podcast])
VLC_ADD_PLUGINS([shout])
VLC_ADD_PLUGINS([sap])
VLC_ADD_PLUGINS([fake])
VLC_ADD_PLUGINS([folder])
VLC_ADD_PLUGINS([rss])
VLC_ADD_PLUGINS([mosaic])
VLC_ADD_PLUGINS([wall])
VLC_ADD_PLUGINS([motiondetect])
VLC_ADD_PLUGINS([clone])
VLC_ADD_PLUGINS([crop])
VLC_ADD_PLUGINS([erase])
VLC_ADD_PLUGINS([bluescreen])
VLC_ADD_PLUGINS([alphamask])
VLC_ADD_PLUGINS([gaussianblur])
VLC_ADD_PLUGINS([i420_yuy2])
VLC_ADD_PLUGINS([i422_yuy2])
VLC_ADD_PLUGINS([i420_ymga])
VLC_ADD_PLUGINS([i422_i420])
VLC_ADD_PLUGINS([yuy2_i422])
VLC_ADD_PLUGINS([yuy2_i420])
VLC_ADD_PLUGINS([chroma_chain])
VLC_ADD_PLUGINS([aout_file])
VLC_ADD_PLUGINS([linear_resampler])
VLC_ADD_PLUGINS([bandlimited_resampler])
VLC_ADD_PLUGINS([float32_mixer])
VLC_ADD_PLUGINS([spdif_mixer])
VLC_ADD_PLUGINS([simple_channel_mixer])
VLC_ADD_PLUGINS([dolby_surround_decoder])
VLC_ADD_PLUGINS([headphone_channel_mixer])
VLC_ADD_PLUGINS([normvol])
VLC_ADD_PLUGINS([equalizer])
VLC_ADD_PLUGINS([param_eq])
VLC_ADD_PLUGINS([converter_float])
VLC_ADD_PLUGINS([a52tospdif])
VLC_ADD_PLUGINS([dtstospdif])
VLC_ADD_PLUGINS([audio_format])
VLC_ADD_PLUGIN([gestures])
VLC_ADD_PLUGIN([rc])
VLC_ADD_PLUGIN([telnet])
VLC_ADD_PLUGIN([hotkeys])
VLC_ADD_PLUGIN([showintf])
VLC_ADD_PLUGIN([marq])
VLC_ADD_PLUGIN([podcast])
VLC_ADD_PLUGIN([shout])
VLC_ADD_PLUGIN([sap])
VLC_ADD_PLUGIN([fake])
VLC_ADD_PLUGIN([folder])
VLC_ADD_PLUGIN([rss])
VLC_ADD_PLUGIN([mosaic])
VLC_ADD_PLUGIN([wall])
VLC_ADD_PLUGIN([motiondetect])
VLC_ADD_PLUGIN([clone])
VLC_ADD_PLUGIN([crop])
VLC_ADD_PLUGIN([erase])
VLC_ADD_PLUGIN([bluescreen])
VLC_ADD_PLUGIN([alphamask])
VLC_ADD_PLUGIN([gaussianblur])
VLC_ADD_PLUGIN([i420_yuy2])
VLC_ADD_PLUGIN([i422_yuy2])
VLC_ADD_PLUGIN([i420_ymga])
VLC_ADD_PLUGIN([i422_i420])
VLC_ADD_PLUGIN([yuy2_i422])
VLC_ADD_PLUGIN([yuy2_i420])
VLC_ADD_PLUGIN([chroma_chain])
VLC_ADD_PLUGIN([aout_file])
VLC_ADD_PLUGIN([linear_resampler])
VLC_ADD_PLUGIN([bandlimited_resampler])
VLC_ADD_PLUGIN([float32_mixer])
VLC_ADD_PLUGIN([spdif_mixer])
VLC_ADD_PLUGIN([simple_channel_mixer])
VLC_ADD_PLUGIN([dolby_surround_decoder])
VLC_ADD_PLUGIN([headphone_channel_mixer])
VLC_ADD_PLUGIN([normvol])
VLC_ADD_PLUGIN([equalizer])
VLC_ADD_PLUGIN([param_eq])
VLC_ADD_PLUGIN([converter_float])
VLC_ADD_PLUGIN([a52tospdif])
VLC_ADD_PLUGIN([dtstospdif])
VLC_ADD_PLUGIN([audio_format])
ALIASES="${ALIASES} rvlc"
fi
......@@ -1357,20 +1357,20 @@ dnl
dnl Some plugins aren't useful on some platforms
dnl
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
VLC_ADD_PLUGINS([screensaver])
VLC_ADD_PLUGINS([motion])
VLC_ADD_PLUGINS([dynamicoverlay])
VLC_ADD_PLUGIN([screensaver])
VLC_ADD_PLUGIN([motion])
VLC_ADD_PLUGIN([dynamicoverlay])
elif test "${SYS}" != "mingwce"; then
VLC_ADD_PLUGINS([ntservice])
VLC_ADD_PLUGINS([access_smb])
VLC_ADD_PLUGINS([dmo])
VLC_ADD_PLUGINS([msn])
VLC_ADD_PLUGIN([ntservice])
VLC_ADD_PLUGIN([access_smb])
VLC_ADD_PLUGIN([dmo])
VLC_ADD_PLUGIN([msn])
VLC_ADD_LIBS([dmo],[-lole32 -luuid])
else
VLC_ADD_PLUGINS([win32text])
VLC_ADD_PLUGIN([win32text])
fi
if test "${SYS}" = "darwin"; then
VLC_ADD_PLUGINS([quartztext])
VLC_ADD_PLUGIN([quartztext])
VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,Carbon,-framework,ApplicationServices])
fi
......@@ -1428,11 +1428,11 @@ AS_IF([test "${enable_mmx}" != "no"], [
AS_IF([test "${ac_cv_mmx_inline}" != "no"], [
AC_DEFINE(CAN_COMPILE_MMX, 1,
[Define to 1 inline MMX assembly is available.])
VLC_ADD_PLUGINS([memcpymmx])
VLC_ADD_PLUGINS([i420_rgb_mmx])
VLC_ADD_PLUGINS([i420_yuy2_mmx])
VLC_ADD_PLUGINS([i422_yuy2_mmx])
VLC_ADD_PLUGINS([i420_ymga_mmx])
VLC_ADD_PLUGIN([memcpymmx])
VLC_ADD_PLUGIN([i420_rgb_mmx])
VLC_ADD_PLUGIN([i420_yuy2_mmx])
VLC_ADD_PLUGIN([i422_yuy2_mmx])
VLC_ADD_PLUGIN([i420_ymga_mmx])
])
AC_CACHE_CHECK([if $CC groks MMX EXT inline assembly],
......@@ -1443,7 +1443,7 @@ AS_IF([test "${enable_mmx}" != "no"], [
AS_IF([test "${ac_cv_mmxext_inline}" != "no"], [
AC_DEFINE(CAN_COMPILE_MMXEXT, 1,
[Define to 1 if MMX EXT inline assembly is available.])
VLC_ADD_PLUGINS([memcpymmxext])
VLC_ADD_PLUGIN([memcpymmxext])
])
])
......@@ -1505,9 +1505,9 @@ AS_IF([test "${enable_sse}" != "no"], [
AS_IF([test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris"], [
AC_DEFINE(CAN_COMPILE_SSE2, 1,
[Define to 1 if SSE2 inline assembly is available.])
VLC_ADD_PLUGINS([i420_rgb_sse2])
VLC_ADD_PLUGINS([i420_yuy2_sse2])
VLC_ADD_PLUGINS([i422_yuy2_sse2])
VLC_ADD_PLUGIN([i420_rgb_sse2])
VLC_ADD_PLUGIN([i420_yuy2_sse2])
VLC_ADD_PLUGIN([i422_yuy2_sse2])
])
])
......@@ -1519,7 +1519,7 @@ AC_CACHE_CHECK([if $CC groks 3D Now! inline assembly],
AS_IF([test "${ac_cv_3dnow_inline}" != "no"], [
AC_DEFINE(CAN_COMPILE_3DNOW, 1,
[Define to 1 if 3D Now! inline assembly is available.])
VLC_ADD_PLUGINS([memcpy3dn])
VLC_ADD_PLUGIN([memcpy3dn])
])
AC_ARG_ENABLE(altivec,
......@@ -1549,8 +1549,8 @@ AS_IF([test "${enable_altivec}" = "yes"], [
VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}])
VLC_ADD_CFLAGS([libvlc],[${ac_cv_altivec_inline}])
])
VLC_ADD_PLUGINS([memcpyaltivec])
VLC_ADD_PLUGINS([i420_yuy2_altivec])
VLC_ADD_PLUGIN([memcpyaltivec])
VLC_ADD_PLUGIN([i420_yuy2_altivec])
])
dnl The AltiVec C extensions
......@@ -1612,8 +1612,8 @@ dnl - Others: test should fail
VLC_ADD_CFLAGS([libvlc],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
VLC_ADD_PLUGINS([memcpyaltivec])
VLC_ADD_PLUGINS([i420_yuy2_altivec])
VLC_ADD_PLUGIN([memcpyaltivec])
VLC_ADD_PLUGIN([i420_yuy2_altivec])
])
AC_CACHE_CHECK([if linker needs -framework vecLib],
......@@ -1728,37 +1728,37 @@ AC_ARG_ENABLE(sout,
if test "${enable_sout}" != "no"
then
dnl Access outputs:
VLC_ADD_PLUGINS([access_output_dummy])
VLC_ADD_PLUGINS([access_output_udp])
VLC_ADD_PLUGINS([access_output_file])
VLC_ADD_PLUGINS([access_output_http])
VLC_ADD_PLUGIN([access_output_dummy])
VLC_ADD_PLUGIN([access_output_udp])
VLC_ADD_PLUGIN([access_output_file])
VLC_ADD_PLUGIN([access_output_http])
dnl Muxers:
VLC_ADD_PLUGINS([mux_ps])
VLC_ADD_PLUGINS([mux_avi])
VLC_ADD_PLUGINS([mux_mp4])
VLC_ADD_PLUGINS([mux_asf])
VLC_ADD_PLUGINS([mux_dummy])
VLC_ADD_PLUGINS([mux_wav])
VLC_ADD_PLUGINS([mux_mpjpeg])
VLC_ADD_PLUGIN([mux_ps])
VLC_ADD_PLUGIN([mux_avi])
VLC_ADD_PLUGIN([mux_mp4])
VLC_ADD_PLUGIN([mux_asf])
VLC_ADD_PLUGIN([mux_dummy])
VLC_ADD_PLUGIN([mux_wav])
VLC_ADD_PLUGIN([mux_mpjpeg])
dnl Packetizers (FIXME: why are the others outside --enable-sout??):
VLC_ADD_PLUGINS([packetizer_copy])
VLC_ADD_PLUGIN([packetizer_copy])
dnl Stream outputs:
VLC_ADD_PLUGINS([stream_out_dummy])
VLC_ADD_PLUGINS([stream_out_standard])
VLC_ADD_PLUGINS([stream_out_es])
VLC_ADD_PLUGINS([stream_out_rtp])
VLC_ADD_PLUGINS([stream_out_description])
VLC_ADD_PLUGINS([stream_out_duplicate])
VLC_ADD_PLUGINS([stream_out_display])
VLC_ADD_PLUGINS([stream_out_transcode])
VLC_ADD_PLUGINS([stream_out_bridge])
VLC_ADD_PLUGINS([stream_out_mosaic_bridge])
VLC_ADD_PLUGINS([stream_out_autodel])
VLC_ADD_PLUGINS([stream_out_gather])
# VLC_ADD_PLUGINS([stream_out_transrate])
VLC_ADD_PLUGIN([stream_out_dummy])
VLC_ADD_PLUGIN([stream_out_standard])
VLC_ADD_PLUGIN([stream_out_es])
VLC_ADD_PLUGIN([stream_out_rtp])
VLC_ADD_PLUGIN([stream_out_description])
VLC_ADD_PLUGIN([stream_out_duplicate])
VLC_ADD_PLUGIN([stream_out_display])
VLC_ADD_PLUGIN([stream_out_transcode])
VLC_ADD_PLUGIN([stream_out_bridge])
VLC_ADD_PLUGIN([stream_out_mosaic_bridge])
VLC_ADD_PLUGIN([stream_out_autodel])
VLC_ADD_PLUGIN([stream_out_gather])
# VLC_ADD_PLUGIN([stream_out_transrate])
dnl Misc:
VLC_ADD_PLUGINS([vod_rtsp])
VLC_ADD_PLUGINS([profile_parser])
VLC_ADD_PLUGIN([vod_rtsp])
VLC_ADD_PLUGIN([profile_parser])
AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support)
fi
......@@ -1772,7 +1772,7 @@ AC_ARG_ENABLE(shout,
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_PLUGINS([access_output_shout])
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)])
......@@ -1809,7 +1809,7 @@ then
])
if test "x${have_lua}" = "xyes" ; then
AC_DEFINE(HAVE_LUA, 1, [Define if you have the lua library])
VLC_ADD_PLUGINS([lua])
VLC_ADD_PLUGIN([lua])
VLC_ADD_LIBS([lua],[$LUA_LIBS])
VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS])
fi
......@@ -1823,7 +1823,7 @@ AC_ARG_ENABLE(httpd,
[ --enable-httpd HTTP daemon (default enabled)])
if test "${enable_httpd}" != "no"
then
VLC_ADD_PLUGINS([http])
VLC_ADD_PLUGIN([http])
AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support)
fi
AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
......@@ -1844,9 +1844,9 @@ dnl
AC_ARG_ENABLE(growl,
[ --enable-growl growl notification plugin (default enabled)])
AS_IF([test "${enable_growl}" != "no"], [
VLC_ADD_PLUGINS([growl_udp])
VLC_ADD_PLUGIN([growl_udp])
AC_CHECK_HEADERS(Growl/GrowlDefines.h, [
VLC_ADD_PLUGINS([growl])
VLC_ADD_PLUGIN([growl])
VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit])
])
]
......@@ -1861,7 +1861,7 @@ AC_ARG_ENABLE(notify,
AS_IF([test "${enable_notify}" != "no" -a "${SYS}" != "mingw32"], [
PKG_CHECK_MODULES(NOTIFY, libnotify,
[
VLC_ADD_PLUGINS([notify])
VLC_ADD_PLUGIN([notify])
VLC_ADD_CFLAGS(notify, [$NOTIFY_CFLAGS])
VLC_ADD_LIBS(notify, [$NOTIFY_LIBS])
],[
......@@ -1877,7 +1877,7 @@ dnl
AC_ARG_ENABLE(audioscrobbler,
[ --disable-audioscrobbler Last.fm submission plugin (default enabled)])
AS_IF([test "${enable_audioscrobbler}" != "no"], [
VLC_ADD_PLUGINS([audioscrobbler])
VLC_ADD_PLUGIN([audioscrobbler])
])
dnl
......@@ -1887,7 +1887,7 @@ AC_ARG_ENABLE(musicbrainz,
[ --enable-musicbrainz MusicBrainz support (default disabled) ])
AS_IF([test "${enable_musicbrainz}" = "yes"],[
PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz,
[ VLC_ADD_PLUGINS([musicbrainz])
[ VLC_ADD_PLUGIN([musicbrainz])
VLC_ADD_LIBS([musicbrainz],[$MUSICBRAINZ_LIBS])
VLC_ADD_CFLAGS([musicbrainz],[$MUSICBRAINZ_CFLAGS]) ],
[AC_MSG_WARN(MusicBrainz library not found)])
......@@ -1902,7 +1902,7 @@ AC_ARG_ENABLE(taglib,
AS_IF([test "${enable_taglib}" != "no"],[
PKG_CHECK_MODULES(TAGLIB, taglib,
[ AC_DEFINE( HAVE_TAGLIB, 1, [Define if you have taglib plugin built] )
VLC_ADD_PLUGINS([taglib])
VLC_ADD_PLUGIN([taglib])
VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz])
VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ],
[AC_MSG_WARN(TagLib library not found)])
......@@ -1953,7 +1953,7 @@ if test "${enable_live555}" != "no"; then
VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
AC_CHECK_LIB(liveMedia_pic, main, [
# We have -lliveMedia_pic, build plugins
VLC_ADD_PLUGINS([live555])
VLC_ADD_PLUGIN([live555])
VLC_ADD_LIBS([live555], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic])
], [
AC_CHECK_LIB(liveMedia, main, [
......@@ -2020,7 +2020,7 @@ then
AC_CHECK_LIB( raw1394, raw1394_get_nodecount, [
AC_CHECK_HEADERS(libdc1394/dc1394_control.h , [
dnl AC_CHECK_LIB( dc1394_control, dc1394_setup_capture, [
VLC_ADD_PLUGINS([dc1394])
VLC_ADD_PLUGIN([dc1394])
VLC_ADD_LIBS([dc1394],[-ldc1394_control -lraw1394])
dnl ],
dnl [
......@@ -2059,7 +2059,7 @@ then
then
dnl Use ${with_dv_raw1394}/include/libraw1394/raw1394.h
AC_MSG_RESULT(yes)
VLC_ADD_PLUGINS([access_dv])
VLC_ADD_PLUGIN([access_dv])
VLC_ADD_LIBS([access_dv],[-L${with_dv_raw1394}/lib -lraw1394 -lpthread])
VLC_ADD_CPPFLAGS([access_dv],[-I${with_dv_raw1394}/include])
else
......@@ -2069,7 +2069,7 @@ then
fi
else
AC_CHECK_HEADERS(libraw1394/raw1394.h,
[ VLC_ADD_PLUGINS([access_dv])
[ VLC_ADD_PLUGIN([access_dv])
VLC_ADD_LIBS([access_dv],[-lraw1394 -lavc1394])
],[
if test -n "${enable_dv}"
......@@ -2185,7 +2185,7 @@ then
if test -z "${with_dvdread_tree}"
then
AC_CHECK_HEADERS(dvdread/dvd_reader.h,
[ VLC_ADD_PLUGINS([dvdread])
[ VLC_ADD_PLUGIN([dvdread])
VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}])
],[
if test -n "${enable_dvdread}"
......@@ -2221,7 +2221,7 @@ then
then
dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h
AC_MSG_RESULT(yes)
VLC_ADD_PLUGINS([dvdread])
VLC_ADD_PLUGIN([dvdread])
VLC_ADD_LIBS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LIBS_dvdcss}])
VLC_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include])
else
......@@ -2254,7 +2254,7 @@ then
AC_PATH_PROG(DVDNAV_CONFIG, dvdnav-config, no, ${DVDNAV_PATH})
if test "${DVDNAV_CONFIG}" != "no"
then
VLC_ADD_PLUGINS([dvdnav])
VLC_ADD_PLUGIN([dvdnav])
VLC_ADD_CFLAGS([dvdnav],[`${DVDNAV_CONFIG} --cflags`])
VLC_ADD_LIBS([dvdnav],[`${DVDNAV_CONFIG} --libs`])
fi
......@@ -2271,7 +2271,7 @@ then
then
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(dshow.h,
[ VLC_ADD_PLUGINS([dshow])
[ VLC_ADD_PLUGIN([dshow])
VLC_ADD_CXXFLAGS([dshow],[])
VLC_ADD_LIBS([dshow],[-lole32 -loleaut32 -luuid]) ])
AC_LANG_POP(C++)
......@@ -2288,7 +2288,7 @@ then