X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=7b3c50ba37d20632e18897ebbd192e2a87d14164;hb=fb19b264f8a5fe4ebb47f863e0f040f2ffe9b0a5;hp=8b0d220470f568001608dc0fc1d061d38d773b92;hpb=f26a646b38f93d0386141ee760fab791697fa84b;p=vlc diff --git a/configure.ac b/configure.ac index 8b0d220470..7b3c50ba37 100644 --- a/configure.ac +++ b/configure.ac @@ -1,16 +1,16 @@ dnl Autoconf settings for vlc -AC_INIT(vlc,0.9.0-svn) +AC_INIT(vlc,0.9.0-git) VERSION_MAJOR="0" VERSION_MINOR="9" VERSION_REVISION="0" -VERSION_EXTRA="svn" +VERSION_EXTRA="git" CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Grishenko" COPYRIGHT_YEARS="1996-2008" -AC_PREREQ(2.59) dnl this really should be 2.59c +AC_PREREQ(2.59c) AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) AC_CANONICAL_BUILD @@ -174,7 +174,7 @@ case "${host_os}" in VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup]) VLC_ADD_LDFLAGS([libvlc_control],[-Wl,dynamic_lookup]) - VLC_ADD_LDFLAGS([ffmpeg i420_rgb_mmx],[-Wl,-read_only_relocs,suppress]) + VLC_ADD_LDFLAGS([ffmpeg i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress]) VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,Cocoa,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation]) @@ -222,9 +222,6 @@ case "${host_os}" in echo " Assuming --disable-glx" enable_xvideo="no" echo " Assuming --disable-xvideo" - - with_macosx_sdk="" - echo " Compiling with default SDK" fi if test ".`uname -p`" = ".i386"; then dnl Due to a ld(64) bug in 10.5 we cannot use our mmx code @@ -275,6 +272,9 @@ case "${host_os}" in AC_CHECK_TOOL(WINDRES, windres, :) case "${host_os}" in + *wince* | *mingwce* | *mingw32ce* | *pe*) + SYS=mingwce + ;; *mingw32*) SYS=mingw32 ;; @@ -287,9 +287,6 @@ case "${host_os}" in #endif], SYS=mingw32, SYS=cygwin) ;; - *wince* | *mingwce* | *pe*) - SYS=mingwce - ;; esac if test "${SYS}" = "mingw32"; then @@ -298,13 +295,14 @@ case "${host_os}" in VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([activex mozilla],[-lgdi32]) VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm]) - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua],[-lws2_32]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua],[-lws2_32]) fi if test "${SYS}" = "mingwce"; then # add ws2 for closesocket, select, recv VLC_ADD_CPPFLAGS([libvlc vlc],[-Dmain(a,b)=maince(a,b)]) VLC_ADD_LDFLAGS([libvlc vlc],[-e WinMainCRTStartup]) - VLC_ADD_LIBS([libvlc access_http access_mms access_udp access_tcp access_ftp access_output_udp sap http netsync],[-lws2]) + VLC_ADD_LIBS([libvlc access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp sap http netsync audioscrobbler growl rtp stream_out_rtp],[-lws2]) + VLC_ADD_LIBS([libvlc],[-lmmtimer]) fi ;; *nto*) @@ -392,7 +390,7 @@ lt_cv_deplibs_check_method=pass_all dnl dnl Gettext stuff dnl -AM_GNU_GETTEXT_VERSION(0.16.1) +AM_GNU_GETTEXT_VERSION([0.17]) AM_GNU_GETTEXT([external]) VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}]) @@ -459,9 +457,6 @@ dnl Plugin compilation stuff VLC_LIBRARY_SUFFIX -VLC_SYMBOL_PREFIX -AC_SUBST(SYMPREF) - dnl The -DSYS_FOO flag CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"; CPPFLAGS="${CPPFLAGS_save}" @@ -469,7 +464,7 @@ dnl Check for system libs needed need_libc=false dnl Check for usual libc functions -AC_CHECK_FUNCS([gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy strdup strndup strnlen atof lldiv posix_fadvise posix_madvise]) +AC_CHECK_FUNCS([gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid_r memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy strdup strndup strnlen atof lldiv posix_fadvise posix_madvise]) AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)]) AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)]) AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)]) @@ -477,11 +472,7 @@ AC_FUNC_ALLOCA AH_BOTTOM([#include ]) -AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGINS([access_mmap])]) - -AS_IF([test "${SYS}" = "linux"], [ - AC_CHECK_FUNCS(tee) -]) +AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGIN([access_mmap])]) dnl Check for setlocal and langinfo AC_CHECK_FUNCS(setlocale) @@ -508,7 +499,7 @@ AC_CHECK_FUNCS(connect,,[ AC_CHECK_FUNCS(send,,[ AC_CHECK_LIB(socket,send,[ - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard growl_udp],[-lsocket]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp sap access_output_udp stream_out_standard growl_udp],[-lsocket]) ]) ]) @@ -646,6 +637,9 @@ AC_CHECK_LIB(m,ceil,[ AC_CHECK_LIB(m,exp,[ VLC_ADD_LIBS([gaussianblur],[-lm]) ]) +AC_CHECK_LIB(m,round,[ + VLC_ADD_LIBS([dbus],[-lm]) +]) AC_CHECK_LIB(mx,sqrtf,[ VLC_ADD_LIBS([x264],[-lmx]) ]) @@ -850,13 +844,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 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)]) @@ -883,19 +878,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]) ], @@ -970,15 +965,6 @@ CFLAGS="${CFLAGS_save}" RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast cast-align write-strings missing-prototypes volatile-register-var]) RDC_PROG_CC_FLAGS_IFELSE([-pipe]) -dnl This helps detect broken plugins with undefined symbols -dnl Better fail loudly at build-time than silenty at run-time. -dnl Unfortunately, this sucks on FreeBSD (won't even link with -lc) -if test `uname -s` != FreeBSD; then - RDC_PROG_LINK_FLAGS_IFELSE([-Wl,-z,defs], [ - VLC_ADD_LDFLAGS([plugin],[-Wl,-z,defs]) - ]) -fi - dnl Check for various optimization flags AC_CACHE_CHECK([if \$CC accepts -Os], [ac_cv_c_os], @@ -1062,6 +1048,10 @@ if test "${ac_cv_c_omit_frame_pointer}" != "no"; then fi dnl Check for -fvisibility=hidden +dnl Don't test on mingw32, because it is going to work with just a warning +dnl even if it doesn't support it +if test "${SYS}" != "mingw32" +then AC_CACHE_CHECK([if \$CC accepts -fvisibility=hidden], [ac_cv_c_visibility_hidden], [CFLAGS="${CFLAGS_save} -fvisibility=hidden" @@ -1069,6 +1059,7 @@ AC_CACHE_CHECK([if \$CC accepts -fvisibility=hidden], if test "${ac_cv_c_visibility_hidden}" != "no"; then VLC_ADD_CFLAGS([libvlc plugin],[-fvisibility=hidden]) fi +fi AM_CONDITIONAL(HAVE_COMPILER_EXPORT, [test "$SYS" = "mingw32" -o "${ac_cv_c_visibility_hidden}" != "no"]) @@ -1191,22 +1182,113 @@ test "${enable_cprof}" != "yes" && enable_cprof="no" dnl dnl default modules dnl -VLC_ADD_PLUGINS([dummy logger memcpy]) -VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 demux_cdg cdg ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta]) -VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf t140 dvbsub cc mpeg_audio lpcm a52 dts cinepak flac]) -VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving]) -VLC_ADD_PLUGINS([converter_fixed mono]) -VLC_ADD_PLUGINS([trivial_resampler ugly_resampler]) -VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer]) -VLC_ADD_PLUGINS([playlist export nsc xtag]) -VLC_ADD_PLUGINS([i420_rgb grey_yuv rawvideo blend scale image logo magnify puzzle colorthres]) -VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv smf]) -VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp]) -VLC_ADD_PLUGINS([access_http access_mms access_ftp access_rtmp]) -VLC_ADD_PLUGINS([access_filter_bandwidth]) -VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) -VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) -VLC_ADD_PLUGINS([packetizer_vc1]) +VLC_ADD_PLUGIN([dummy]) +VLC_ADD_PLUGIN([logger]) +VLC_ADD_PLUGIN([memcpy]) +dnl Demuxers: +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_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_PLUGIN([cinepak]) +dnl Audio codecs: +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_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_PLUGIN([playlist]) +VLC_ADD_PLUGIN([export]) +VLC_ADD_PLUGIN([nsc]) +VLC_ADD_PLUGIN([xtag]) +dnl Channel mixing audio filters: +VLC_ADD_PLUGIN([converter_fixed]) +VLC_ADD_PLUGIN([mono]) +VLC_ADD_PLUGIN([trivial_channel_mixer]) +dnl Resampling audio filters: +VLC_ADD_PLUGIN([trivial_resampler]) +VLC_ADD_PLUGIN([ugly_resampler]) +dnl Audio mixers: +VLC_ADD_PLUGIN([trivial_mixer]) +dnl Video chromas: +VLC_ADD_PLUGIN([i420_rgb]) +VLC_ADD_PLUGIN([grey_yuv]) +dnl Video codecs: +VLC_ADD_PLUGIN([rawvideo]) +dnl Access filters: +VLC_ADD_PLUGIN([access_filter_timeshift]) +VLC_ADD_PLUGIN([access_filter_record]) +VLC_ADD_PLUGIN([access_filter_dump]) +VLC_ADD_PLUGIN([access_filter_bandwidth]) ALIASES="${ALIASES} cvlc" @@ -1214,18 +1296,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([access_fake access_filter_timeshift access_filter_record access_filter_dump]) - VLC_ADD_PLUGINS([gestures rc telnet hotkeys showintf marq podcast shout sap fake folder]) - VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop erase bluescreen alphamask gaussianblur]) - VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga i422_i420 yuy2_i422 yuy2_i420 chroma_chain]) - VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler]) - VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer]) - VLC_ADD_PLUGINS([dolby_surround_decoder headphone_channel_mixer normvol equalizer param_eq]) - VLC_ADD_PLUGINS([converter_float a52tospdif dtstospdif 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 @@ -1233,35 +1350,47 @@ dnl dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - VLC_ADD_PLUGINS([screensaver motion]) + VLC_ADD_PLUGIN([screensaver]) + VLC_ADD_PLUGIN([motion]) + VLC_ADD_PLUGIN([dynamicoverlay]) elif test "${SYS}" != "mingwce"; then - VLC_ADD_PLUGINS([ntservice access_smb dmo 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 dnl dnl Accelerated modules dnl -MMX_MODULES="memcpymmx i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx i420_ymga_mmx" -#MMX_MODULES="${MMX_MODULES} idctmmx motionmmx" -MMXEXT_MODULES="memcpymmxext" -#MMXEXT_MODULES="${MMXEXT_MODULES} idctmmxext motionmmxext" -THREEDNOW_MODULES="memcpy3dn" -SSE_MODULES="" -SSE2_MODULES="i420_rgb_sse2 i420_yuy2_sse2 i422_yuy2_sse2" -ALTIVEC_MODULES="memcpyaltivec i420_yuy2_altivec" -#ALTIVEC_MODULES="${ALTIVEC_MODULES} idctaltivec motionaltivec" - -dnl Check for fully workin MMX intrinsics +AC_ARG_WITH(,[]) +AC_ARG_WITH(,[Optimization options:]) + +dnl Check for fully working MMX intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) -AC_CACHE_CHECK([if \$CC groks MMX intrinsics], +AC_ARG_ENABLE(mmx, +[ --disable-mmx disable MMX optimizations (default auto)],,[ + case "${host_cpu}" in + i?86|x86_64) + enable_mmx="yes" + ;; + *) + enable_mmx="no" + ;; + esac +]) +AS_IF([test "${enable_mmx}" != "no"], [ + ARCH="${ARCH} mmx" + + AC_CACHE_CHECK([if $CC groks MMX intrinsics], [ac_cv_c_mmx_intrinsics], [CFLAGS="${CFLAGS_save} -O -mmmx" AC_TRY_COMPILE([#include @@ -1278,15 +1407,57 @@ AC_CACHE_CHECK([if \$CC groks MMX intrinsics], frobzor = (uint64_t)a;], [ac_cv_c_mmx_intrinsics=yes], [ac_cv_c_mmx_intrinsics=no])]) -if test "${ac_cv_c_mmx_intrinsics}" != "no"; then - AC_DEFINE(HAVE_MMX_INTRINSICS, 1, Define if MMX intrinsics are available.) - VLC_ADD_CFLAGS([${MMX_MODULES}],[-mmmx]) -fi + AS_IF([test "${ac_cv_c_mmx_intrinsics}" != "no"], [ + AC_DEFINE(HAVE_MMX_INTRINSICS, 1, + [Define to 1 if MMX intrinsics are available.]) + VLC_ADD_CFLAGS([memcpymmx i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx i420_ymga_mmx],[-mmmx]) + ]) + + AC_CACHE_CHECK([if $CC groks MMX inline assembly], + [ac_cv_mmx_inline], + [CFLAGS="${CFLAGS_save}" + AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));], + ac_cv_mmx_inline=yes, ac_cv_mmx_inline=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_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], + [ac_cv_mmxext_inline], + [CFLAGS="${CFLAGS_save}" + AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));], + ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=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_PLUGIN([memcpymmxext]) + ]) +]) dnl Check for fully workin SSE2 intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) -AC_CACHE_CHECK([if \$CC groks SSE2 intrinsics], +AC_ARG_ENABLE(sse, +[ --disable-sse disable SSE (1 and 2) optimizations (default auto)],, [ + case "${host_cpu}" in + i686|x86_64) + enable_sse=yes + ;; + *) + enable_sse=no + ;; + esac +]) +AS_IF([test "${enable_sse}" != "no"], [ + ARCH="${ARCH} sse sse2" + + AC_CACHE_CHECK([if $CC groks SSE2 intrinsics], [ac_cv_c_sse2_intrinsics], [CFLAGS="${CFLAGS_save} -O -msse2" AC_TRY_COMPILE([#include @@ -1303,83 +1474,77 @@ AC_CACHE_CHECK([if \$CC groks SSE2 intrinsics], frobzor = (uint64_t)_mm_movepi64_pi64(a);], [ac_cv_c_sse2_intrinsics=yes], [ac_cv_c_sse2_intrinsics=no])]) -if test "${ac_cv_c_sse2_intrinsics}" != "no"; then - AC_DEFINE(HAVE_SSE2_INTRINSICS, 1, Define if SSE2 intrinsics are available.) - VLC_ADD_CFLAGS([${SSE2_MODULES}],[-msse2]) -fi - -AC_CACHE_CHECK([if \$CC groks MMX inline assembly], - [ac_cv_mmx_inline], - [CFLAGS="${CFLAGS_save}" - AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));], - ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)]) -if test "${ac_cv_mmx_inline}" != "no"; then - AC_DEFINE(CAN_COMPILE_MMX, 1, Define if \$CC groks MMX inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}" -fi - -AC_CACHE_CHECK([if \$CC groks MMX EXT inline assembly], - [ac_cv_mmxext_inline], - [CFLAGS="${CFLAGS_save}" - AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));], - ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)]) -if test "${ac_cv_mmxext_inline}" != "no"; then - AC_DEFINE(CAN_COMPILE_MMXEXT, 1, Define if \$CC groks MMX EXT inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}" -fi - -AC_CACHE_CHECK([if \$CC groks 3D Now! inline assembly], - [ac_cv_3dnow_inline], - [CFLAGS="${CFLAGS_save}" - AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));], - ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)]) -if test "${ac_cv_3dnow_inline}" != "no"; then - AC_DEFINE(CAN_COMPILE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}" -fi + AS_IF([test "${ac_cv_c_sse2_intrinsics}" != "no"], [ + AC_DEFINE(HAVE_SSE2_INTRINSICS, 1, + [Define to 1 if SSE2 intrinsics are available.]) + VLC_ADD_CFLAGS([i420_rgb_sse2 i420_yuy2_sse2 i422_yuy2_sse2],[-msse2]) + ]) -AC_CACHE_CHECK([if \$CC groks SSE inline assembly], + AC_CACHE_CHECK([if $CC groks SSE inline assembly], [ac_cv_sse_inline], [CFLAGS="${CFLAGS_save}" AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));], ac_cv_sse_inline=yes, ac_cv_sse_inline=no)]) -if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris"; then - AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" -fi + AS_IF([test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris"], [ + AC_DEFINE(CAN_COMPILE_SSE, 1, + [Define to 1 if SSE inline assembly is available.]) + ]) -AC_CACHE_CHECK([if \$CC groks SSE2 inline assembly], + AC_CACHE_CHECK([if $CC groks SSE2 inline assembly], [ac_cv_sse2_inline], [CFLAGS="${CFLAGS_save}" AC_TRY_COMPILE(,[void *p;asm volatile("punpckhqdq %%xmm1,%%xmm2"::"r"(p));], ac_cv_sse2_inline=yes, ac_cv_sse2_inline=no)]) -if test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris"; then - AC_DEFINE(CAN_COMPILE_SSE2, 1, Define if \$CC groks SSE2 inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${SSE2_MODULES}" -fi + 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_PLUGIN([i420_rgb_sse2]) + VLC_ADD_PLUGIN([i420_yuy2_sse2]) + VLC_ADD_PLUGIN([i422_yuy2_sse2]) + ]) +]) -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then -AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly], +AC_CACHE_CHECK([if $CC groks 3D Now! inline assembly], + [ac_cv_3dnow_inline], + [CFLAGS="${CFLAGS_save}" + AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));], + ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)]) +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_PLUGIN([memcpy3dn]) +]) + +AC_ARG_ENABLE(altivec, +[ --disable-altivec disable AltiVec optimizations (default auto)],, [ + AS_IF([test "${host_cpu}" = "powerpc"], + [enable_altivec=yes], [enable_altivec=no]) +]) +AS_IF([test "${enable_altivec}" = "yes"], [ + ARCH="${ARCH} altivec"; + AC_CACHE_CHECK([if $CC groks AltiVec inline assembly], [ac_cv_altivec_inline], [CFLAGS="${CFLAGS_save}" AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], - ac_cv_altivec_inline=yes, + ac_cv_altivec_inline="yes", [CFLAGS="${CFLAGS_save} -Wa,-m7400" AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], [ac_cv_altivec_inline="-Wa,-m7400"], ac_cv_altivec_inline=no) ])]) -if test "${ac_cv_altivec_inline}" != "no"; then - AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks AltiVec inline assembly.) - if test "${ac_cv_altivec_inline}" != "yes"; then - VLC_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}]) - VLC_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}]) - VLC_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}]) - VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}]) - VLC_ADD_CFLAGS([libvlc],[${ac_cv_altivec_inline}]) - fi - ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" -fi + AS_IF([test "${ac_cv_altivec_inline}" != "no"], [ + AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, + [Define to 1 if AltiVec inline assembly is available.]) + AS_IF([test "${ac_cv_altivec_inline}" != "yes"], [ + VLC_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}]) + VLC_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}]) + VLC_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}]) + VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}]) + VLC_ADD_CFLAGS([libvlc],[${ac_cv_altivec_inline}]) + ]) + VLC_ADD_PLUGIN([memcpyaltivec]) + VLC_ADD_PLUGIN([i420_yuy2_altivec]) + ]) dnl The AltiVec C extensions dnl @@ -1391,7 +1556,7 @@ dnl - Linux PPC, gcc 3.4, 4.x: need which requires -maltivec dnl - Linux PPC, gcc 3.3: need and -maltivec -mabi=altivec dnl - Linux PPC, gcc 3.x: need and -fvec dnl - Others: test should fail -AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], + AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], [ac_cv_c_altivec], [# OS X/PPC test (gcc 4.x) CFLAGS="${CFLAGS_save} -mpim-altivec -force_cpusubtype_ALL" @@ -1427,42 +1592,33 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], ]) CFLAGS="${CFLAGS_save}" ]) + AS_IF([test "${ac_cv_c_altivec}" != "no"], [ + CPPFLAGS="${CPPFLAGS_save} ${ac_cv_c_altivec}" + ]) -if test "${ac_cv_c_altivec}" != "no"; then - CPPFLAGS="${CPPFLAGS_save} ${ac_cv_c_altivec}" -fi - -AS_IF( test "${enable_altivec}" != "no", -[ AC_CHECK_HEADERS(altivec.h) CPPFLAGS="${CPPFLAGS_save}" - if test "${ac_cv_c_altivec}" != "no"; then - AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.) + AS_IF([test "${ac_cv_c_altivec}" != "no"], [ + AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, + [Define to 1 if C AltiVec extensions are available.]) 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}]) - if test "${ac_cv_altivec_inline}" = "no"; then - ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" - fi - fi -],[ - CPPFLAGS="${CPPFLAGS_save}" -]) + VLC_ADD_PLUGIN([memcpyaltivec]) + VLC_ADD_PLUGIN([i420_yuy2_altivec]) + ]) -AC_CACHE_CHECK([if linker needs -framework vecLib], + AC_CACHE_CHECK([if linker needs -framework vecLib], [ac_cv_ld_altivec], [LDFLAGS="${LDFLAGS_vlc} -Wl,-framework,vecLib" AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no) LDFLAGS="${LDFLAGS_save}" ]) -if test "${ac_cv_ld_altivec}" != "no"; then - VLC_ADD_LDFLAGS([libvlc idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib]) -fi -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" - -AC_ARG_WITH(,[]) -AC_ARG_WITH(,[Optimization options:]) + AS_IF([test "${ac_cv_ld_altivec}" != "no"], [ + VLC_ADD_LDFLAGS([libvlc idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib]) + ]) +]) dnl dnl Special arch tuning @@ -1502,24 +1658,6 @@ AS_IF([test "${CFLAGS_TUNING}"], CFLAGS="${CFLAGS_save}" ]) -dnl -dnl x86 accelerations -dnl -AC_ARG_ENABLE(mmx, -[ --disable-mmx disable MMX optimizations (default enabled on x86)], -[ if test "${enable_mmx}" = "yes"; then ARCH="${ARCH} mmx"; - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ], -[ if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "x86_64"; then - ARCH="${ARCH} mmx" - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ]) - -AC_ARG_ENABLE(sse, -[ --disable-sse disable SSE (1 and 2) optimizations (default enabled on i686 and x86_64)], -[ if test "${enable_sse}" = "yes"; then ARCH="${ARCH} sse sse2"; - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ], -[ if test "${host_cpu}" = "i686" -o "${host_cpu}" = "x86_64"; then ARCH="${ARCH} sse sse2"; - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ]) - dnl dnl Memory usage dnl @@ -1542,16 +1680,6 @@ if test "${enable_optimizations}" != "no"; then fi fi -dnl -dnl AltiVec acceleration -dnl -AC_ARG_ENABLE(altivec, -[ --disable-altivec disable AltiVec optimizations (default enabled on PPC)], -[ if test "${enable_altivec}" = "yes"; then ARCH="${ARCH} altivec"; - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ], -[ if test "${host_cpu}" = "powerpc"; then ARCH="${ARCH} altivec"; - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ]) - dnl dnl Debugging mode dnl @@ -1590,21 +1718,10 @@ dnl Stream output dnl AC_ARG_ENABLE(sout, [ --enable-sout Stream output modules (default enabled)]) -if test "${enable_sout}" != "no" -then - VLC_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http]) - VLC_ADD_PLUGINS([mux_ps mux_avi mux_mp4 mux_asf mux_dummy mux_wav mux_mpjpeg]) - VLC_ADD_PLUGINS([packetizer_copy]) - - VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp stream_out_description vod_rtsp]) - VLC_ADD_PLUGINS([stream_out_duplicate stream_out_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge stream_out_autodel]) - VLC_ADD_PLUGINS([stream_out_gather]) -# VLC_ADD_PLUGINS([stream_out_transrate]) -# VLC_ADD_PLUGINS([rtcp]) - VLC_ADD_PLUGINS([profile_parser]) - - AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support) -fi +AS_IF([test "${enable_sout}" != "no"], [ + AC_DEFINE(ENABLE_SOUT, 1, [Define to 1 for stream output support.]) +]) +AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"]) AC_ARG_ENABLE(switcher, [ --enable-switcher Stream-out switcher plugin (default disabled)]) @@ -1615,7 +1732,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)]) @@ -1632,31 +1749,31 @@ then AC_MSG_WARN([lua5.1 not found, trying lua >= 5.1 instead]) PKG_CHECK_MODULES(LUA, lua >= 5.1, [ have_lua=yes ], - [ + [ have_lua=yes - AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], - [], + AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], + [], [ have_lua=no ] ) - AC_CHECK_LIB( lua5.1 , luaL_newstate, + AC_CHECK_LIB( lua5.1 , luaL_newstate, [LUA_LIBS="-llua5.1"], - AC_CHECK_LIB( lua51 , luaL_newstate, + AC_CHECK_LIB( lua51 , luaL_newstate, [LUA_LIBS="-llua51"], - AC_CHECK_LIB( lua , luaL_newstate, - [LUA_LIBS="-llua"], - [ have_lua=no + AC_CHECK_LIB( lua , luaL_newstate, + [LUA_LIBS="-llua"], + [ have_lua=no AC_MSG_WARN([lua >= 5.1 not found!]) ]) - ) - ) + ) + ) ]) ]) 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_LIBS([lua],[$LUA_LIBS]) VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS]) fi fi +AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"]) dnl dnl HTTP daemon @@ -1665,9 +1782,10 @@ 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"]) dnl dnl VideoLAN manager @@ -1685,9 +1803,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]) ]) ] @@ -1702,7 +1820,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]) ],[ @@ -1718,7 +1836,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 @@ -1728,7 +1846,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)]) @@ -1743,7 +1861,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)]) @@ -1794,12 +1912,12 @@ 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, [ # We only have -lliveMedia, do builtins - VLC_ADD_BUILTINS([live555]) + VLC_ADD_PLUGIN([live555]) VLC_ADD_LIBS([live555], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment]) ]) ]) @@ -1821,7 +1939,7 @@ if test "${enable_live555}" != "no"; then if test -f "${real_live555_tree}/liveMedia/libliveMedia.a"; then AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a) - VLC_ADD_BUILTINS([live555]) + VLC_ADD_PLUGIN([live555]) if test "${SYS}" = "mingw32"; then # add ws2_32 for closesocket, select, recv @@ -1861,7 +1979,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 [ @@ -1900,7 +2018,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 @@ -1910,7 +2028,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}" @@ -2026,7 +2144,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}" @@ -2062,7 +2180,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 @@ -2095,7 +2213,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 @@ -2112,7 +2230,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++) @@ -2129,7 +2247,7 @@ then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" then AC_CHECK_HEADERS(dshow.h, - [ VLC_ADD_PLUGINS([bda]) + [ VLC_ADD_PLUGIN([bda]) VLC_ADD_CXXFLAGS([bda],[]) VLC_ADD_LIBS([bda],[-lstrmiids -lole32 -loleaut32 -luuid]) ]) fi @@ -2154,11 +2272,11 @@ then -a -f ${with_opencv_tree}/cvaux/include/cvaux.h -a -f ${with_opencv_tree}/otherlibs/highgui/highgui.h then AC_MSG_RESULT(yes) - VLC_ADD_PLUGINS([opencv_wrapper]) + VLC_ADD_PLUGIN([opencv_wrapper]) VLC_ADD_LIBS([opencv_wrapper],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui]) VLC_ADD_CFLAGS([opencv_wrapper],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui]) AC_LANG_PUSH(C++) - VLC_ADD_PLUGINS([opencv_example]) + VLC_ADD_PLUGIN([opencv_example]) VLC_ADD_LIBS([opencv_example],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui]) VLC_ADD_CXXFLAGS([opencv_example],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui]) AC_LANG_POP(C++) @@ -2181,7 +2299,7 @@ AC_ARG_ENABLE(smb, [ --enable-smb smb input module (default enabled)]) if test "${enable_smb}" != "no"; then AC_CHECK_HEADERS(libsmbclient.h, - [ VLC_ADD_PLUGINS([access_smb]) + [ VLC_ADD_PLUGIN([access_smb]) VLC_ADD_LIBS([access_smb],[-lsmbclient]) ], [ if test -n "${enable_smb}"; then AC_MSG_ERROR([cannot find libsmbclient headers]) @@ -2207,9 +2325,9 @@ then if test -z "${with_dvbpsi_tree}" then AC_CHECK_HEADERS(dvbpsi/dr.h, - [ VLC_ADD_PLUGINS([ts]) + [ VLC_ADD_PLUGIN([ts]) if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGINS([mux_ts]) + VLC_ADD_PLUGIN([mux_ts]) fi VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi]) ], [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], @@ -2263,9 +2381,9 @@ then fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" AC_CHECK_HEADERS([dvbpsi/dr.h],[ - VLC_ADD_PLUGINS([ts]) + VLC_ADD_PLUGIN([ts]) if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGINS([mux_ts]) + VLC_ADD_PLUGIN([mux_ts]) fi VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}]) VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi]) @@ -2301,7 +2419,7 @@ then CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l}" AC_CHECK_HEADERS(linux/videodev.h, [ - VLC_ADD_PLUGINS([v4l]) + VLC_ADD_PLUGIN([v4l]) ],[]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -2335,7 +2453,7 @@ then CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" AC_CHECK_HEADERS(linux/videodev2.h, [ - VLC_ADD_PLUGINS([v4l2]) + VLC_ADD_PLUGIN([v4l2]) ],[]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -2348,7 +2466,7 @@ AC_ARG_ENABLE(pvr, [ --enable-pvr PVR cards access module (default disabled)]) if test "${enable_pvr}" = "yes" then - VLC_ADD_PLUGINS([pvr]) + VLC_ADD_PLUGIN([pvr]) AC_ARG_WITH(videodev2, [ --with-videodev2=FILE Location of videodev2.h file (default /usr/include/linux/videodev2.h)],[],[]) if test "${with_videodev2}" != "no" -a -n "${with_videodev2}" @@ -2386,7 +2504,7 @@ then VLC_ADD_LIBS([access_gnomevfs],[$GNOMEVFS_LIBS]) VLC_ADD_CPPFLAGS([access_gnomevfs],[$GNOMEVFS_CPPFLAGS]) VLC_ADD_CFLAGS([access_gnomevfs],[$GNOMEVFS_CFLAGS]) - VLC_ADD_PLUGINS([access_gnomevfs]), + VLC_ADD_PLUGIN([access_gnomevfs]), AC_MSG_WARN([GnomeVFS support disabled because GnomeVFS development headers not found])) fi @@ -2428,7 +2546,7 @@ then AC_DEFINE(HAVE_CDDAX, 1, [Define for the audio CD plugin using libcdio]) VLC_ADD_LIBS([cddax],[$LIBCDIO_LIBS]) VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS]) - VLC_ADD_PLUGINS([cddax]) + VLC_ADD_PLUGIN([cddax]) PKG_CHECK_MODULES(LIBCDIO_PARANOIA, libcdio_paranoia >= 0.72, [ VLC_ADD_LIBS([cddax],[$LIBCDIO_CDDA_LIBS $LIBCDIO_CDDA_LIBS $LIBCDIO_PARANOIA_LIBS])], AC_MSG_WARN([CD Paranoia support disabled because no libcdio >= 0.72 found])) @@ -2476,7 +2594,7 @@ then [Define for the VCD plugin using libcdio/libvcdinfo]) VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS]) VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS]) - VLC_ADD_PLUGINS([vcdx]) + VLC_ADD_PLUGIN([vcdx]) else AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found]) HAVE_VCDX=no @@ -2497,7 +2615,8 @@ then AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h) AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[ AC_MSG_RESULT(yes) - VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGIN([vcd]) + VLC_ADD_PLUGIN([cdda]) ],[ AC_MSG_RESULT(no) ]) @@ -2505,7 +2624,8 @@ then AC_MSG_CHECKING(for scsireq in sys/scsiio.h) AC_EGREP_HEADER(scsireq,sys/scsiio.h,[ AC_MSG_RESULT(yes) - VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGIN([vcd]) + VLC_ADD_PLUGIN([cdda]) AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support) ],[ AC_MSG_RESULT(no) @@ -2514,7 +2634,8 @@ then AC_MSG_CHECKING(for ioc_toc_header in sys/cdio.h) AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[ AC_MSG_RESULT(yes) - VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGIN([vcd]) + VLC_ADD_PLUGIN([cdda]) AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support) ],[ AC_MSG_RESULT(no) @@ -2522,12 +2643,14 @@ then if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32" then - VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGIN([vcd]) + VLC_ADD_PLUGIN([cdda]) fi if test "${SYS}" = "darwin" then - VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGIN([vcd]) + VLC_ADD_PLUGIN([cdda]) VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LIBS([vcdx cddax cdda],[-liconv]) fi @@ -2562,7 +2685,7 @@ then AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [ if test -z "${with_dvbpsi_tree}" then - VLC_ADD_PLUGINS([dvb]) + VLC_ADD_PLUGIN([dvb]) else VLC_ADD_BUILTINS([dvb]) fi @@ -2577,23 +2700,25 @@ AC_ARG_ENABLE(screen, [ --enable-screen Screen capture support (default enabled)]) if test "${enable_screen}" != "no"; then if test "${SYS}" = "darwin"; then - AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ - VLC_ADD_PLUGINS([screen]) - VLC_ADD_LDFLAGS([screen],[-Wl,-framework,ApplicationServices]) + AC_CHECK_HEADERS(OpenGL/gl.h, [ + AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ + VLC_ADD_PLUGIN([screen]) + VLC_ADD_LDFLAGS([screen],[-Wl,-framework,OpenGL,-framework,ApplicationServices]) + ]) ]) elif test "${SYS}" = "mingw32"; then - VLC_ADD_PLUGINS([screen]) + VLC_ADD_PLUGIN([screen]) VLC_ADD_LIBS([screen],[-lgdi32]) elif test "${SYS}" = "mingwce"; then CPPFLAGS="${CPPFLAGS_save}" elif test "${SYS}" = "beos"; then - VLC_ADD_PLUGINS([screen]) + VLC_ADD_PLUGIN([screen]) VLC_ADD_CXXFLAGS([screen],[]) VLC_ADD_LIBS([screen],[-lbe]) else CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" AC_CHECK_HEADERS(X11/Xlib.h, [ - VLC_ADD_PLUGINS([screen]) + VLC_ADD_PLUGIN([screen]) VLC_ADD_LIBS([screen],[${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_CPPFLAGS([screen],[${X_CFLAGS}]) ]) @@ -2640,9 +2765,9 @@ then then dnl Use a custom ogg AC_MSG_RESULT(${real_ogg_tree}/src/.libs/libogg.a) - VLC_ADD_PLUGINS([ogg]) + VLC_ADD_PLUGIN([ogg]) if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGINS([mux_ogg]) + VLC_ADD_PLUGIN([mux_ogg]) fi VLC_ADD_LIBS([ogg mux_ogg speex vorbis],[${real_ogg_tree}/src/.libs/libogg.a]) VLC_ADD_CFLAGS([ogg mux_ogg speex vorbis],[-I${real_ogg_tree}/include]) @@ -2654,9 +2779,9 @@ then else AC_CHECK_HEADERS(ogg/ogg.h, [ AC_CHECK_LIB( ogg, oggpack_read, [ - VLC_ADD_PLUGINS([ogg]) + VLC_ADD_PLUGIN([ogg]) if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGINS([mux_ogg]) + VLC_ADD_PLUGIN([mux_ogg]) fi VLC_ADD_LIBS([ogg mux_ogg],[-logg])]) ],[]) @@ -2696,11 +2821,11 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then VLC_ADD_CXXFLAGS([mkv],[-O1]) fi AC_CHECK_LIB(ebml_pic, main, [ - VLC_ADD_PLUGINS([mkv]) + VLC_ADD_PLUGIN([mkv]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic]) ], AC_CHECK_LIB(ebml, main, [ - VLC_ADD_PLUGINS([mkv]) + VLC_ADD_PLUGIN([mkv]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml]) ]) ) @@ -2740,7 +2865,7 @@ then then dnl Use a custom mod AC_MSG_RESULT(${real_mod_tree}/src/.libs/libmodplug.a) - VLC_ADD_PLUGINS([mod]) + VLC_ADD_PLUGIN([mod]) VLC_ADD_LIBS([mod],[${real_mod_tree}/src/.libs/libmodplug.a -lstdc++]) VLC_ADD_CXXFLAGS([mod],[-I${real_mod_tree}/include]) else @@ -2750,7 +2875,7 @@ then fi else AC_CHECK_HEADERS(libmodplug/modplug.h, [ - VLC_ADD_PLUGINS([mod]) + VLC_ADD_PLUGIN([mod]) VLC_ADD_CXXFLAGS([mod],[]) VLC_ADD_LIBS([mod],[-lmodplug -lstdc++])]) fi @@ -2764,7 +2889,7 @@ AC_ARG_ENABLE(mpc, if test "${enable_mpc}" != "no" then AC_CHECK_HEADERS(mpcdec/mpcdec.h, [ - VLC_ADD_PLUGINS([mpc]) + VLC_ADD_PLUGIN([mpc]) VLC_ADD_LIBS([mpc],[-lmpcdec])]) fi @@ -2792,7 +2917,7 @@ then then dnl Use a custom gme AC_MSG_RESULT(${real_gme_tree}/gme/libgme.a) - VLC_ADD_PLUGINS([gme]) + VLC_ADD_PLUGIN([gme]) VLC_ADD_LIBS([gme],[${real_gme_tree}/gme/libgme.a]) VLC_ADD_CXXFLAGS([gme],[-I${real_gme_tree}/gme]) else @@ -2862,7 +2987,7 @@ then AC_CHECK_HEADERS(mad.h, , [ AC_MSG_ERROR([Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin.]) ]) AC_CHECK_LIB(mad, mad_bit_init, [ - VLC_ADD_PLUGINS([mpgatofixed32]) + VLC_ADD_PLUGIN([mpgatofixed32]) VLC_ADD_LIBS([mpgatofixed32],[-lmad])], [ AC_MSG_ERROR([Cannot find libmad library...]) ]) CPPFLAGS="${CPPFLAGS_save}" @@ -2879,7 +3004,7 @@ AS_IF([test "${enable_id3tag}" != "no"], [ AC_CHECK_HEADERS(id3tag.h, [ AC_CHECK_HEADERS(zlib.h, [ VLC_ADD_LIBS([id3tag],[-lid3tag -lz]) - VLC_ADD_PLUGINS([id3tag]) + VLC_ADD_PLUGIN([id3tag]) ]) ]) ]) @@ -3004,9 +3129,9 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a]) VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}]) else - dnl The given libavcodec wasn't built with --enable-pp + dnl The given libavcodec wasn't built with --enable-postproc AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find libpostproc.a in ${real_ffmpeg_tree}/[libavcodec/]libpostproc/. Make sure you configured ffmpeg with --enable-pp]) + AC_MSG_ERROR([cannot find libpostproc.a in ${real_ffmpeg_tree}/[libavcodec/]libpostproc/. Make sure you configured ffmpeg with --enable-postproc]) fi fi dnl Use a custom libffmpeg @@ -3017,11 +3142,28 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo PKG_CONFIG_LIBDIR_save="$PKG_CONFIG_LIBDIR" export PKG_CONFIG_PATH="" export PKG_CONFIG_LIBDIR="${real_ffmpeg_tree}" + VLC_SAVE_FLAGS - PKG_CHECK_MODULES( [FFMPEG],[libavcodec libavformat libpostproc], [ + PKG_CHECK_MODULES( [FFMPEG],[libavformat libavcodec libpostproc], [ VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS}) VLC_ADD_LIBS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})] - ,[]) + AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.]) + ) + AS_IF([ test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"],[ + AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.]) + PKG_CHECK_MODULES( [SWSCALE],[libswscale], [ + VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}]) + VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[${SWSCALE_CFLAGS}])]) + ]) + CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS} ${SWSCALE_CFLAGS}" + CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS} ${SWSCALE_CFLAGS}" + + AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) + AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h) + AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h]) + + VLC_RESTORE_FLAGS AS_IF([test -n "${PKG_CONFIG_PATH_save}"],[ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH_save}" ],[ @@ -3038,17 +3180,7 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo VLC_ADD_BUILTINS([stream_out_switcher]) fi - if test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"; then - AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.]) - VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libswscale ${real_ffmpeg_tree}/libswscale/libswscale.a]) - VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libswscale]) - fi - if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then - AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.]) - VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat -lavformat -lz]) - VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavformat]) - fi else @@ -3069,17 +3201,9 @@ dnl Trying with pkg-config CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}" CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" AC_CHECK_HEADERS(postproc/postprocess.h) - if test "${SYS}" = "darwin"; then - VLC_ADD_BUILTINS([ffmpeg]) - else - VLC_ADD_PLUGINS([ffmpeg]) - fi + VLC_ADD_PLUGIN([ffmpeg]) if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then - if test "${SYS}" = "darwin"; then - VLC_ADD_BUILTINS([stream_out_switcher]) - else - VLC_ADD_PLUGINS([stream_out_switcher]) - fi + VLC_ADD_PLUGIN([stream_out_switcher]) fi VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}]) VLC_ADD_LIBS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}]) @@ -3118,7 +3242,7 @@ dnl Trying with pkg-config AC_CHECK_LIB(postproc, pp_postprocess, [ VLC_ADD_LIBS([ffmpeg],[-lpostproc])], - AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-pp.]), + AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-postproc.]), [$LDAVUTIL]) AC_CHECK_LIB(avformat, av_open_input_stream, [ @@ -3156,9 +3280,9 @@ then AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a, make sure you compiled libavcodecaltivec in ${with_ffmpeg_tree}]) fi if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a"; then - dnl The given libavcodecaltivec wasn't built with --enable-pp + dnl The given libavcodecaltivec wasn't built with --enable-postproc AC_MSG_RESULT(no) - AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp]) + AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-postproc]) fi dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a) @@ -3214,10 +3338,10 @@ then AC_CHECK_HEADERS(faad.h, , [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ]) AC_CHECK_LIB(faad, faacDecOpen, [ - VLC_ADD_PLUGINS([faad]) + VLC_ADD_PLUGIN([faad]) VLC_ADD_LIBS([faad],[-lfaad]) ], AC_CHECK_LIB(faad, NeAACDecOpen, [ - VLC_ADD_PLUGINS([faad]) + VLC_ADD_PLUGIN([faad]) VLC_ADD_LIBS([faad],[-lfaad]) ], [ AC_MSG_ERROR([Cannot find libfaad library...]) ])) LDFLAGS="${LDFLAGS_save}" @@ -3262,7 +3386,7 @@ then AC_CHECK_HEADERS(twolame.h, , [ AC_MSG_ERROR([Cannot find development header for libtwolame...]) ]) AC_CHECK_LIB(twolame, twolame_init, [ - VLC_ADD_PLUGINS([twolame]) + VLC_ADD_PLUGIN([twolame]) VLC_ADD_CPPFLAGS([twolame],[-DLIBTWOLAME_STATIC]) VLC_ADD_LIBS([twolame],[-ltwolame]) ], [ AC_MSG_ERROR([Cannot find libtwolame library...]) ]) @@ -3283,7 +3407,7 @@ then VLC_ADD_BUILTINS([quicktime]) else AC_CHECK_HEADERS(QuickTime/QuickTime.h, - [ VLC_ADD_BUILTINS([quicktime]) + [ VLC_ADD_PLUGIN([quicktime]) VLC_ADD_LDFLAGS([quicktime],[-Wl,-framework,QuickTime,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find QuickTime headers]) ]) fi @@ -3295,7 +3419,7 @@ dnl AC_ARG_ENABLE(real, [ --enable-real Real audio module (default disabled)]) if test "${enable_real}" = "yes"; then - VLC_ADD_PLUGINS([realaudio]) + VLC_ADD_PLUGIN([realaudio]) fi dnl @@ -3304,7 +3428,7 @@ dnl AC_ARG_ENABLE(realrtsp, [ --enable-realrtsp Real RTSP module (default disabled)]) if test "${enable_realrtsp}" = "yes"; then - VLC_ADD_PLUGINS([access_realrtsp]) + VLC_ADD_PLUGIN([access_realrtsp]) fi dnl @@ -3388,7 +3512,7 @@ then LDFLAGS="${LDFLAGS_save} ${LDFLAGS_test} ${LIBS_a52tofloat32}" AC_CHECK_HEADERS(a52dec/a52.h, [ AC_CHECK_LIB(a52, a52_free, [ - VLC_ADD_PLUGINS([a52tofloat32]) + VLC_ADD_PLUGIN([a52tofloat32]) VLC_ADD_LIBS([a52tofloat32],[${LDFLAGS_test} -la52]) VLC_ADD_CPPFLAGS([a52tofloat32],[${CPPFLAGS_test}]) ],[ @@ -3446,7 +3570,7 @@ AS_IF([test "${enable_dca}" != "no"], [ ]) ], [ PKG_CHECK_MODULES([DCA], [libdca >= 0.0.5], [ - VLC_ADD_PLUGINS([dtstofloat32]) + VLC_ADD_PLUGIN([dtstofloat32]) VLC_ADD_CPPFLAGS([dtstofloat32], [${DCA_CFLAGS}]) VLC_ADD_LIBS([dtstofloat32], [${DCA_LIBS}]) ], [ @@ -3538,7 +3662,7 @@ then #endif #endif], [AC_MSG_RESULT([yes]) - VLC_ADD_PLUGINS([libmpeg2]) + VLC_ADD_PLUGIN([libmpeg2]) VLC_ADD_LIBS([libmpeg2],[-lmpeg2])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])], @@ -3571,7 +3695,7 @@ then then dnl Use a custom vorbis AC_MSG_RESULT(${real_vorbis_tree}/lib/.libs/libvorbis.a) - VLC_ADD_PLUGINS([vorbis]) + VLC_ADD_PLUGIN([vorbis]) VLC_ADD_LIBS([vorbis],[${real_vorbis_tree}/lib/.libs/libvorbis.a ${real_vorbis_tree}/lib/.libs/libvorbisenc.a]) VLC_ADD_CFLAGS([vorbis],[-I${real_vorbis_tree}/include]) else @@ -3581,7 +3705,7 @@ then fi else AC_CHECK_HEADERS(vorbis/codec.h, [ - VLC_ADD_PLUGINS([vorbis]) + VLC_ADD_PLUGIN([vorbis]) VLC_ADD_LIBS([vorbis],[-lvorbis -logg -lm]) ],[]) AC_CHECK_HEADERS(vorbis/vorbisenc.h, [ @@ -3597,7 +3721,7 @@ AC_ARG_ENABLE(tremor, if test "${enable_tremor}" = "yes" then AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [ - VLC_ADD_PLUGINS([tremor]) + VLC_ADD_PLUGIN([tremor]) VLC_ADD_LIBS([tremor],[-lvorbisidec -logg]) ],[]) fi @@ -3625,7 +3749,7 @@ then then dnl Use a custom speex AC_MSG_RESULT(${real_speex_tree}/libspeex/.libs/libspeex.a) - VLC_ADD_PLUGINS([speex]) + VLC_ADD_PLUGIN([speex]) VLC_ADD_LIBS([speex],[${real_speex_tree}/libspeex/.libs/libspeex.a]) VLC_ADD_CFLAGS([speex],[-I${real_speex_tree}/include]) else @@ -3637,7 +3761,7 @@ then AC_CHECK_HEADERS(speex/speex.h, [ LDFLAGS="${LDFLAGS_save} ${LIBS_speex}" AC_CHECK_LIB(speex, speex_decode_int, [ - VLC_ADD_PLUGINS([speex]) + VLC_ADD_PLUGIN([speex]) VLC_ADD_LIBS([speex],[-lspeex]) ], [ AC_MSG_RESULT([no]) AC_MSG_WARN([Your libspeex is too old, please get the development @@ -3684,7 +3808,7 @@ if test "${enable_theora}" = "yes" then AC_CHECK_HEADERS(theora/theora.h, [ AC_CHECK_LIB(theora, theora_granule_time, [ - VLC_ADD_PLUGINS([theora]) + VLC_ADD_PLUGIN([theora]) theora_libs="-ltheora -logg" VLC_ADD_LIBS([theora],[${theora_libs}]) ],[ AC_MSG_ERROR([libtheora doesn't appear to be installed on your system. @@ -3700,7 +3824,7 @@ AC_ARG_ENABLE(dirac, [ --enable-dirac experimental dirac codec (default disabled)]) if test "${enable_dirac}" = "yes"; then PKG_CHECK_MODULES(DIRAC,[dirac >= 0.9.0], [ - VLC_ADD_PLUGINS([dirac]) + VLC_ADD_PLUGIN([dirac]) VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS]) VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[ AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.]) @@ -3717,13 +3841,15 @@ AC_CHECK_HEADERS(png.h, [ LDFLAGS="${LDFLAGS_save} -lz" AC_CHECK_LIB(png, png_set_rows, [ VLC_ADD_LIBS([png],[-lpng -lz]) - VLC_ADD_PLUGINS([png]) - VLC_ADD_PLUGINS([osdmenu osd_parser]) + VLC_ADD_PLUGIN([png]) + VLC_ADD_PLUGIN([osdmenu]) + VLC_ADD_PLUGIN([osd_parser]) AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])], [],[-lz]) - LDFLAGS="${LDFLAGS_save}" + LDFLAGS="${LDFLAGS_save}" ]) fi +AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_png}" != "no"]) dnl dnl H264 encoder plugin (using libx264) @@ -3750,7 +3876,7 @@ if test "${enable_x264}" != "no"; then VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}]) VLC_ADD_LIBS([x264],[-L${real_x264_tree}]) PKG_CHECK_MODULES(X264,x264, [ - VLC_ADD_PLUGINS([x264]) + VLC_ADD_PLUGIN([x264]) VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) ],[ @@ -3763,7 +3889,7 @@ if test "${enable_x264}" != "no"; then fi else PKG_CHECK_MODULES(X264,x264, [ - VLC_ADD_PLUGINS([x264]) + VLC_ADD_PLUGIN([x264]) VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) ],[ @@ -3782,7 +3908,7 @@ AC_ARG_ENABLE(fluidsynth, [ --enable-fluidsynth MIDI synthesisr with libfluidsynth (default enabled)]) AS_IF([test "x${enable_fluidsynth}" != "xno"], [ PKG_CHECK_MODULES(FLUIDSYNTH, fluidsynth, [ - VLC_ADD_PLUGINS(fluidsynth) + VLC_ADD_PLUGIN(fluidsynth) VLC_ADD_CFLAGS(fluidsynth, [${FLUIDSYNTH_CFLAGS}]) VLC_ADD_LIBS(fluidsynth, [${FLUIDSYNTH_LIBS}]) ], [ @@ -3801,7 +3927,7 @@ dnl AC_ARG_ENABLE(zvbi, [ --enable-zvbi VBI (inc. Teletext) decoding support with libzvbi (default enabled)]) AC_ARG_ENABLE(telx, - [ --enable-telx, Teletext decoding module (conflicting with zvbi) (default disabled)]) + [ --enable-telx Teletext decoding module (conflicting with zvbi) (default disabled)]) AS_IF( [test "${enable_zvbi}" != "no"],[ AS_IF( [test "${enable_telx}" = "yes"],[ @@ -3812,7 +3938,7 @@ AS_IF( [test "${enable_zvbi}" != "no"],[ [ VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS]) VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS]) - VLC_ADD_PLUGINS([zvbi]) + VLC_ADD_PLUGIN([zvbi]) AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) ],[ AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead) @@ -3821,7 +3947,7 @@ AS_IF( [test "${enable_zvbi}" != "no"],[ ]) ]) AS_IF( [test "${enable_telx}" = "yes"],[ - VLC_ADD_PLUGINS([telx]) + VLC_ADD_PLUGIN([telx]) ]) dnl @@ -3835,7 +3961,7 @@ AS_IF( [test "${enable_csri}" = "yes"], [ [ VLC_ADD_LDFLAGS([csri],[$CSRI_LIBS]) VLC_ADD_CFLAGS([csri],[$CSRI_CFLAGS]) - VLC_ADD_PLUGINS([csri]) + VLC_ADD_PLUGIN([csri]) ],[ AC_MSG_WARN([CSRI helper library not found]) ]) @@ -3852,7 +3978,7 @@ AS_IF( [test "${enable_asademux}" = "yes"], [ [ VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS]) VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS]) - VLC_ADD_PLUGINS([asademux]) + VLC_ADD_PLUGIN([asademux]) ],[ AC_MSG_WARN([PCRE library not found (required for asademux)]) ]) @@ -3865,8 +3991,37 @@ AC_ARG_ENABLE(cmml, [ --enable-cmml CMML support (default enabled)]) if test "${enable_cmml}" != "no" then - VLC_ADD_PLUGINS([cmml]) -fi + VLC_ADD_PLUGIN([cmml]) +fi + +dnl +dnl kate decoder plugin +dnl +AC_ARG_ENABLE(kate, +[ --enable-kate kate codec (default enabled)]) +AS_IF([test "${enable_kate}" != "no"], [ + PKG_CHECK_MODULES(KATE,[kate >= 0.1.1], [ + VLC_ADD_PLUGIN([kate]) + VLC_ADD_CFLAGS([kate],[$KATE_CFLAGS]) + VLC_ADD_LIBS([kate],[$KATE_LIBS]) ],[ + AC_CHECK_HEADERS(kate/kate.h, [ + AC_CHECK_LIB(kate, kate_decode_init, [ + VLC_ADD_PLUGIN([kate]) + kate_libs="-lkate -logg" + VLC_ADD_LDFLAGS([kate],[${kate_libs}]) ],[ + AS_IF([test "x${enable_kate}" != "x"], [ + AC_MSG_ERROR([libkate doesn't appear to be installed on your system. + You also need to check that you have a libogg posterior to the 1.0 release.]) + ]) + ], [-lkate -logg]) + ],[ + AS_IF([test "x${enable_kate}" != "x"], [ + AC_MSG_ERROR([libkate headers do not appear to be installed on your system. + You also need to check that you have a libogg posterior to the 1.0 release.]) + ]) + ]) + ]) +]) dnl @@ -3904,11 +4059,11 @@ if test "${enable_x11}" != "no" && test "${enable_x11}" = "yes"); then CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}" AC_CHECK_HEADERS(X11/Xlib.h, [ - VLC_ADD_PLUGINS([panoramix]) + VLC_ADD_PLUGIN([panoramix]) VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}]) AC_CHECK_LIB(Xext, XShmAttach, [ - VLC_ADD_PLUGINS([x11]) + VLC_ADD_PLUGIN([x11]) VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}]) ]) @@ -3932,12 +4087,12 @@ if test "${enable_xvideo}" != "no" && # If libXv.so is available, xvideo can be a plugin. Otherwise, we # test for libXv_pic. if test -f /usr/X11R6/lib/libXv.so -o -f /usr/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then - VLC_ADD_PLUGINS([xvideo]) + VLC_ADD_PLUGIN([xvideo]) VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) else AC_CHECK_LIB(Xv_pic,XvPutImage,[ - VLC_ADD_PLUGINS([xvideo]) + VLC_ADD_PLUGIN([xvideo]) VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv_pic]) ],[ @@ -3968,7 +4123,7 @@ if test "${enable_glx}" != "no" && choke me #endif]]), [ - VLC_ADD_PLUGINS([glx]) + VLC_ADD_PLUGIN([glx]) VLC_ADD_LIBS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU]) VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}]) ],[AC_MSG_ERROR([Please install GL development package. Alternatively you can also configure with --disable-glx.])]) @@ -3986,7 +4141,7 @@ if test "${enable_xvmc}" = "yes" && test "${enable_xvmc}" = "yes"); then CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}" AC_CHECK_HEADERS(X11/extensions/vldXvMC.h, [ - VLC_ADD_PLUGINS([xvmc]) + VLC_ADD_PLUGIN([xvmc]) VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXvMCW -lXv -lXinerama]) VLC_ADD_CPPFLAGS([xvmc],[${X_CFLAGS}]) ]) @@ -4036,12 +4191,14 @@ dnl VLC_ADD_LIBS([xvideo],[-lXxf86vm_pic]) VLC_ADD_LIBS([x11],[-lXxf86vm_pic]) VLC_ADD_LIBS([glx],[-lXxf86vm_pic]) + VLC_ADD_LIBS([xvmc],[-lXxf86vm_pic]) ac_cv_have_xf86vidmode="yes" ],[ AC_CHECK_LIB(Xxf86vm, XF86VidModeGetViewPort,[ VLC_ADD_LIBS([xvideo],[-lXxf86vm]) VLC_ADD_LIBS([x11],[-lXxf86vm]) VLC_ADD_LIBS([glx],[-lXxf86vm]) + VLC_ADD_LIBS([xvmc],[-lXxf86vm]) ac_cv_have_xf86vidmode="yes" ]) ]) @@ -4068,7 +4225,7 @@ if test "${enable_opengl}" != "no" && test "${SYS}" != "beos" -a "${SYS}" != "mingwce"; then if test "${SYS}" != "darwin"; then AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [ - VLC_ADD_PLUGINS([opengl]) + VLC_ADD_PLUGIN([opengl]) if test "${SYS}" != "mingw32"; then VLC_ADD_LIBS([opengl],[${X_LIBS} -lGL -lGLU]) else @@ -4077,7 +4234,7 @@ if test "${enable_opengl}" != "no" && ]) else dnl OS X special case (no GL/gl.h but OpenGL/gl.h) - VLC_ADD_PLUGINS([opengl]) + VLC_ADD_PLUGIN([opengl]) VLC_ADD_LIBS([opengl],[-Wl,-framework,OpenGL]) fi fi @@ -4129,7 +4286,8 @@ then then # SDL on Darwin is heavily patched and can only run SDL_image if test "${SYS}" != "darwin" -a "${SYS}" != "mingw32"; then - VLC_ADD_PLUGINS([vout_sdl aout_sdl]) + VLC_ADD_PLUGIN([vout_sdl]) + VLC_ADD_PLUGIN([aout_sdl]) fi VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`]) VLC_ADD_LIBS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`]) @@ -4145,7 +4303,7 @@ Please install it and try again. Alternatively you can also configure with AS_IF([ test "${enable_sdl_image}" != "no"],[ AC_CHECK_HEADERS(${SDL_IMAGE}, [AC_DEFINE_UNQUOTED(SDL_IMAGE_INCLUDE_FILE, <${SDL_IMAGE}>, Indicate the path of SDL_image.h) - VLC_ADD_PLUGINS([sdl_image]) + VLC_ADD_PLUGIN([sdl_image]) AC_CHECK_LIB(png, png_set_rows, [VLC_ADD_LIBS([sdl_image],[-lpng -lz])],[],[-lz]) AC_CHECK_LIB(jpeg, jpeg_start_decompress, @@ -4184,9 +4342,9 @@ AC_ARG_ENABLE(fribidi, [ --enable-fribidi fribidi support (default enabled)]) if test "${enable_freetype}" != "no" then - PKG_CHECK_MODULES(FREETYPE, freetype2,[ - VLC_ADD_PLUGINS([freetype]) - have_freetype=yes + PKG_CHECK_MODULES(FREETYPE, freetype2,[ + VLC_ADD_PLUGIN([freetype]) + have_freetype=yes VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}]) VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}]) if test "${SYS}" = "mingw32"; then @@ -4238,7 +4396,7 @@ then LDFLAGS="${LDFLAGS_save} ${LIBS_xml}" AC_CHECK_LIB(xml2,xmlTextReaderConstName,[ AC_EGREP_HEADER(xmlTextReaderConstName,libxml/xmlreader.h,[ - VLC_ADD_PLUGINS([xml]) ],[ + VLC_ADD_PLUGIN([xml]) ],[ AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version]) if test "${enable_xml2}" = "yes"; then AC_MSG_ERROR([libxml2 missing the xmlTextReader extension]) @@ -4269,7 +4427,7 @@ then [ VLC_ADD_LIBS([svg],[$SVG_LIBS]) VLC_ADD_CFLAGS([svg],[$SVG_CFLAGS]) - VLC_ADD_PLUGINS([svg]) ], + VLC_ADD_PLUGIN([svg]) ], [AC_MSG_WARN(SVG library not found)]) fi @@ -4280,7 +4438,7 @@ AC_ARG_ENABLE(snapshot, [ --enable-snapshot snapshot module (default disabled)]) if test "${enable_snapshot}" = "yes" then - VLC_ADD_PLUGINS([snapshot]) + VLC_ADD_PLUGIN([snapshot]) fi dnl @@ -4301,7 +4459,7 @@ then VLC_ADD_LIBS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) VLC_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) fi - VLC_ADD_PLUGINS([qte]) + VLC_ADD_PLUGIN([qte]) NEED_QTE_MAIN=yes CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}" AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ @@ -4318,7 +4476,7 @@ dnl AC_ARG_ENABLE(qt_video, dnl [ --enable-qt_video QT Video Output support (default disabled)]) dnl if test "${enable_qt_video}" = "yes" dnl then -dnl VLC_ADD_PLUGINS([qt_video]) +dnl VLC_ADD_PLUGIN([qt_video]) dnl VLC_ADD_LIBS([qt_video],[-L${QTDIR}/lib]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt_video}" dnl AC_CHECK_LIB(qt-mt,main,[ @@ -4352,7 +4510,7 @@ if test "${enable_hd1000v}" != "no" -a "${CXX}" != "" && ]) if test "$can_build_roku" = "yes" then - VLC_ADD_PLUGINS([hd1000v]) + VLC_ADD_PLUGIN([hd1000v]) VLC_ADD_LIBS([hd1000v],[-lCascade -ldvbpsi -lmad]) fi AC_LANG_POP([C++]) @@ -4364,7 +4522,7 @@ dnl if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "cygwin" then - VLC_ADD_PLUGINS([panoramix]) + VLC_ADD_PLUGIN([panoramix]) fi AC_ARG_ENABLE(directx, @@ -4378,22 +4536,24 @@ then if test -z "${with_directx}" then AC_CHECK_HEADERS(ddraw.h, - [ VLC_ADD_PLUGINS([vout_directx aout_directx]) + [ VLC_ADD_PLUGIN([vout_directx]) + VLC_ADD_PLUGIN([aout_directx]) VLC_ADD_LIBS([vout_directx],[-lgdi32]) ]) AC_CHECK_HEADERS(GL/gl.h, - [ VLC_ADD_PLUGINS([glwin32]) + [ VLC_ADD_PLUGIN([glwin32]) VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32]) ]) AC_CHECK_HEADERS(d3d9.h, - [ VLC_ADD_PLUGINS([direct3d]) + [ VLC_ADD_PLUGIN([direct3d]) VLC_ADD_LIBS([direct3d],[-lgdi32]) ]) else AC_MSG_CHECKING(for directX headers in ${with_directx}) if test -f ${with_directx}/ddraw.h then - VLC_ADD_PLUGINS([vout_directx aout_directx]) + VLC_ADD_PLUGIN([vout_directx]) + VLC_ADD_PLUGIN([aout_directx]) VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}]) VLC_ADD_LIBS([vout_directx],[-lgdi32]) AC_MSG_RESULT(yes) @@ -4413,7 +4573,7 @@ AC_ARG_ENABLE(fb, if test "${enable_fb}" != "no" then AC_CHECK_HEADERS(linux/fb.h, [ - VLC_ADD_PLUGINS([fb]) + VLC_ADD_PLUGIN([fb]) ]) fi @@ -4424,7 +4584,7 @@ AC_ARG_ENABLE(mga, [ --enable-mga Linux kernel Matrox support (default disabled)], [ if test "${enable_mga}" = "yes" then - VLC_ADD_PLUGINS([mga]) + VLC_ADD_PLUGIN([mga]) fi ]) dnl @@ -4434,7 +4594,7 @@ AC_ARG_ENABLE(svgalib, [ --enable-svgalib SVGAlib support (default disabled)]) if test "${enable_svgalib}" = "yes" then - VLC_ADD_PLUGINS([svgalib]) + VLC_ADD_PLUGIN([svgalib]) VLC_ADD_LIBS([svgalib],[-lvgagl -lvga]) fi @@ -4498,7 +4658,7 @@ if test "${enable_directfb}" = "yes"; then fi fi if test "${have_directfb}" = "true"; then - VLC_ADD_PLUGINS([directfb]) + VLC_ADD_PLUGIN([directfb]) VLC_ADD_CPPFLAGS([directfb],[${CPPFLAGS_mydirectfb}]) VLC_ADD_LIBS([directfb],[${LIBS_mydirectfb}]) else @@ -4515,7 +4675,7 @@ AC_ARG_ENABLE(ggi, [ --enable-ggi GGI support (default disabled)]) if test "${enable_ggi}" = "yes" then - VLC_ADD_PLUGINS([ggi]) + VLC_ADD_PLUGIN([ggi]) VLC_ADD_LIBS([ggi],[-lggi]) AC_ARG_WITH(ggi, [ --with-ggi=PATH path to libggi], @@ -4544,7 +4704,7 @@ then fi ]) CFLAGS="$CFLAGS -I/usr/include/glide" AC_CHECK_HEADER(glide.h,[ - VLC_ADD_PLUGINS([glide]) + VLC_ADD_PLUGIN([glide]) VLC_ADD_LIBS([glide],[-lglide2x -lm]) VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide]) ],[ @@ -4563,7 +4723,7 @@ then AC_CHECK_HEADER(aalib.h,have_aa="true",have_aa="false") if test "${have_aa}" = "true" then - VLC_ADD_PLUGINS([aa]) + VLC_ADD_PLUGIN([aa]) VLC_ADD_LIBS([aa],[-laa]) fi fi @@ -4585,7 +4745,7 @@ then AC_PATH_PROG(CACA_CONFIG, caca-config, no, ${CACA_PATH}) if test "${CACA_CONFIG}" != "no" then - VLC_ADD_PLUGINS([caca]) + VLC_ADD_PLUGIN([caca]) VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`]) VLC_ADD_LIBS([caca],[`${CACA_CONFIG} --plugin-libs`]) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include @@ -4605,11 +4765,12 @@ AC_ARG_ENABLE(wingdi, [ --enable-wingdi Win32 GDI module (default enabled on Win32)]) if test "${enable_wingdi}" != "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then - VLC_ADD_PLUGINS([wingdi]) + VLC_ADD_PLUGIN([wingdi]) VLC_ADD_LIBS([wingdi],[-lgdi32]) fi if test "${SYS}" = "mingwce"; then - VLC_ADD_PLUGINS([wingdi wingapi]) + VLC_ADD_PLUGIN([wingdi]) + VLC_ADD_PLUGIN([wingapi]) fi fi @@ -4630,7 +4791,7 @@ if test "${enable_oss}" != "no" && test "${enable_oss}" = "yes") then AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ - VLC_ADD_PLUGINS([oss]) + VLC_ADD_PLUGIN([oss]) AC_CHECK_LIB(ossaudio,main,VLC_ADD_LIBS([oss],[-lossaudio])) ]) fi @@ -4645,7 +4806,7 @@ AC_ARG_ENABLE(esd, AC_PATH_PROG(ESD_CONFIG, esd-config, no) if test "${ESD_CONFIG}" != "no" then - VLC_ADD_PLUGINS([esd]) + VLC_ADD_PLUGIN([esd]) VLC_ADD_CFLAGS([esd],[`${ESD_CONFIG} --cflags`]) VLC_ADD_LIBS([esd],[`${ESD_CONFIG} --libs`]) fi @@ -4659,7 +4820,7 @@ AC_ARG_ENABLE(pulse, if test "${enable_pulse}" != "no" then PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.8, - [ VLC_ADD_PLUGINS([pulse]) + [ VLC_ADD_PLUGIN([pulse]) VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}]) VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS}])], [AC_MSG_WARN(pulsaudio library not found)]) @@ -4672,7 +4833,7 @@ AC_ARG_ENABLE(portaudio, [ --enable-portaudio Portaudio library support (default disabled)], [if test "${enable_portaudio}" = "yes" then - VLC_ADD_PLUGINS([portaudio]) + VLC_ADD_PLUGIN([portaudio]) VLC_ADD_CXXFLAGS([portaudio],[]) if test "${SYS}" = "mingw32"; then VLC_ADD_LIBS([portaudio],[-lportaudio -lwinmm -lole32]) @@ -4691,7 +4852,7 @@ AC_ARG_ENABLE(arts, AC_PATH_PROG(ARTS_CONFIG, artsc-config, no) if test "${ARTS_CONFIG}" != "no" then - VLC_ADD_PLUGINS([arts]) + VLC_ADD_PLUGIN([arts]) VLC_ADD_CFLAGS([arts],[`${ARTS_CONFIG} --cflags`]) VLC_ADD_LIBS([arts],[`${ARTS_CONFIG} --libs `]) fi @@ -4713,7 +4874,7 @@ then #include ], [snd_pcm_hw_params_get_period_time(0,0,0);], AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4)) - VLC_ADD_PLUGINS([alsa]) + VLC_ADD_PLUGIN([alsa]) VLC_ADD_LIBS([alsa],[-lasound -lm -ldl]) else if test "${enable_alsa}" = "yes"; then @@ -4729,11 +4890,11 @@ AC_ARG_ENABLE(waveout, [ --enable-waveout Win32 waveOut module (default enabled on Win32)]) if test "${enable_waveout}" != "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then - VLC_ADD_PLUGINS([waveout]) + VLC_ADD_PLUGIN([waveout]) VLC_ADD_LIBS([waveout],[-lwinmm]) fi if test "${SYS}" = "mingwce"; then - VLC_ADD_PLUGINS([waveout]) + VLC_ADD_PLUGIN([waveout]) fi fi @@ -4746,7 +4907,7 @@ if test "${enable_macosx-audio}" != "no" && (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes") then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, - [ VLC_ADD_BUILTINS([auhal]) + [ VLC_ADD_PLUGIN([auhal]) VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -4762,7 +4923,7 @@ if test "${enable_hd1000a}" != "no" -a "${CXX}" != "" && then AC_LANG_PUSH([C++]) AC_CHECK_HEADERS(deschutes/libraries/hdmachinex225/PCMAudioPlayer.h, [ - VLC_ADD_PLUGINS([hd1000a]) + VLC_ADD_PLUGIN([hd1000a]) AC_CHECK_LIB(HDMachineX225,main,VLC_ADD_LIBS([hd1000a],[-lHDMachineX225])) ]) AC_LANG_POP([C++]) fi @@ -4776,7 +4937,8 @@ AC_ARG_ENABLE(jack, AS_IF([test "${enable_jack}" != "no"], [ AC_CHECK_HEADERS(jack/jack.h, [ - VLC_ADD_PLUGINS([access_jack jack]) + VLC_ADD_PLUGIN([access_jack]) + VLC_ADD_PLUGIN([jack]) VLC_ADD_LIBS([access_jack jack],[-ljack]) ],[AC_MSG_ERROR([cannot find JACK headers])]) ]) @@ -4806,7 +4968,7 @@ AC_ARG_ENABLE(cyberlink, CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_cyberlink}" AC_CHECK_HEADERS([cybergarage/upnp/MediaServer.h], [ VLC_ADD_CXXFLAGS([upnp_cc], [${CPPFLAGS_cyberlink}]) - VLC_ADD_PLUGINS([upnp_cc]) + VLC_ADD_PLUGIN([upnp_cc]) ],[ AC_MSG_ERROR([cannot find CyberLink for C++ headers]) ]) @@ -4873,7 +5035,7 @@ AS_IF([test "x${enable_upnp}" != "xno"], [ ]) AS_IF([test "${has_upnp}" = "yes"], [ - VLC_ADD_PLUGINS([upnp_intel]) + VLC_ADD_PLUGIN([upnp_intel]) ]) @@ -4910,28 +5072,28 @@ if test "${enable_skins2}" = "yes" || fi if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"); then - VLC_ADD_PLUGINS([skins2]) + VLC_ADD_PLUGIN([skins2]) ALIASES="${ALIASES} svlc" VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32]) else if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "darwin"); then - VLC_ADD_PLUGINS([skins2]) + VLC_ADD_PLUGIN([skins2]) ALIASES="${ALIASES} svlc" VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LDFLAGS([skins2],[-Wl,-framework,Carbon]) else if test "${skins2_missing_lib}" = "no"; then - VLC_ADD_PLUGINS([skins2]) + VLC_ADD_PLUGIN([skins2]) ALIASES="${ALIASES} svlc" VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11]) fi fi fi fi - +AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) dnl dnl dnl dnl Gtk+ module @@ -4976,7 +5138,7 @@ dnl echo "Cannot find gtk development headers." dnl ]) dnl if test "${ac_cv_gtk_headers}" = "yes" dnl then -dnl VLC_ADD_PLUGINS([gtk]) +dnl VLC_ADD_PLUGIN([gtk]) dnl if test "${SYS}" != "mingw32"; then dnl NEED_GTK_MAIN=yes dnl fi @@ -4996,7 +5158,7 @@ dnl then dnl PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0]) dnl VLC_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}]) dnl VLC_ADD_LIBS([gtk2],[${GTK2_LIBS}]) -dnl VLC_ADD_PLUGINS([gtk2]) +dnl VLC_ADD_PLUGIN([gtk2]) dnl if test "${SYS}" != "mingw32"; then dnl NEED_GTK2_MAIN=yes dnl fi @@ -5015,11 +5177,12 @@ then VLC_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}]) VLC_ADD_LIBS([pda],[${LDFLAGS_pda}]) VLC_ADD_LIBS([pda],[${GTK2_LIBS}]) - VLC_ADD_PLUGINS([pda]) + VLC_ADD_PLUGIN([pda]) if test "${SYS}" != "mingw32"; then NEED_GTK2_MAIN=yes fi fi +AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"]) dnl dnl dnl dnl Gnome module @@ -5037,7 +5200,7 @@ dnl fi dnl # now look for the gnome.h header dnl CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gnome}" dnl AC_CHECK_HEADERS(gnome.h, [ -dnl VLC_ADD_PLUGINS([gnome]) +dnl VLC_ADD_PLUGIN([gnome]) dnl NEED_GTK_MAIN=yes dnl NEED_GNOME_MAIN=yes dnl ALIASES="${ALIASES} gnome-vlc" @@ -5065,7 +5228,7 @@ dnl then dnl PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0]) dnl VLC_ADD_CFLAGS([gnome2],[${GNOME2_CFLAGS}]) dnl VLC_ADD_LIBS([gnome2],[${GNOME2_LIBS}]) -dnl VLC_ADD_PLUGINS([gnome2]) +dnl VLC_ADD_PLUGIN([gnome2]) dnl if test "${SYS}" != "mingw32"; then dnl NEED_GNOME2_MAIN=yes dnl fi @@ -5161,7 +5324,7 @@ then ]) if test "${ac_cv_wx_headers}" = "yes" then - VLC_ADD_PLUGINS([wxwidgets]) + VLC_ADD_PLUGIN([wxwidgets]) AC_DEFINE([HAVE_WX], 1, [Define to 1 if you have WxWidgets library.]) ALIASES="${ALIASES} wxvlc" fi @@ -5181,7 +5344,7 @@ AC_ARG_ENABLE(qt4, AS_IF([test "${enable_qt4}" != "no" && (test "${SYS}" != "darwin" || test "${enable_qt4}" = "yes")], [ PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.2.0], - [ VLC_ADD_PLUGINS([qt4]) + [ VLC_ADD_PLUGIN([qt4]) AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.]) ALIASES="${ALIASES} qvlc" enableqt4=true @@ -5196,9 +5359,9 @@ AS_IF([test "${enable_qt4}" != "no" && AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) ], AS_IF([test "${enable_qt4}" = "yes"],[ - AC_MSG_ERROR(QT4 library not found) + AC_MSG_ERROR(QT4 library not found) ],[ - AC_MSG_WARN(QT4 library not found) + AC_MSG_WARN(QT4 library not found) ]) ) ]) @@ -5207,17 +5370,21 @@ AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true") dnl dnl WinCE GUI module dnl -if test "${SYS}" = "mingwce"; then - VLC_ADD_BUILTINS([wince]) - VLC_ADD_CXXFLAGS([wince],[]) - VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell]) - dnl Gross hack - VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) -elif test "${SYS}" = "mingw32"; then - VLC_ADD_CXXFLAGS([wince],[]) - VLC_ADD_LIBS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) - dnl Gross hack - VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) +AC_ARG_ENABLE(wince, + [ --enable-wince Windows CE interface (default enabled with MinGW)]) +if test "${enable_wince}" != "no"; then + if test "${SYS}" = "mingwce"; then + VLC_ADD_BUILTINS([wince]) + VLC_ADD_CXXFLAGS([wince],[]) + VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell]) + dnl Gross hack + VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) + elif test "${SYS}" = "mingw32"; then + VLC_ADD_CXXFLAGS([wince],[]) + VLC_ADD_LIBS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) + dnl Gross hack + VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) + fi fi dnl @@ -5237,7 +5404,7 @@ dnl dnl dnl AC_ARG_ENABLE(qt, dnl [ --enable-qt Qt interface support (default disabled)], dnl [if test "${enable_qt}" = "yes"; then -dnl VLC_ADD_PLUGINS([qt]) +dnl VLC_ADD_PLUGIN([qt]) dnl ALIASES="${ALIASES} qvlc" dnl VLC_ADD_LIBS([qt],[-L${QTDIR}/lib]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}" @@ -5264,7 +5431,7 @@ dnl dnl dnl AC_ARG_ENABLE(kde, dnl [ --enable-kde KDE interface support (default disabled)], dnl [if test "${enable_kde}" = "yes"; then -dnl VLC_ADD_PLUGINS([kde]) +dnl VLC_ADD_PLUGIN([kde]) dnl ALIASES="${ALIASES} kvlc" dnl VLC_ADD_LIBS([kde],[-L${KDEDIR}/lib]) dnl dnl Check for -lkfile (only in KDE 2) or -lkdeui -lkio (KDE 3) @@ -5313,7 +5480,7 @@ AC_ARG_ENABLE(opie, ] ) CPPFLAGS="${CPPFLAGS_save}" - VLC_ADD_PLUGINS([opie]) + VLC_ADD_PLUGIN([opie]) NEED_QTE_MAIN=yes VLC_ADD_LIBS([opie],[-lqpe ${LDFLAGS_qte}]) VLC_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}]) @@ -5344,12 +5511,15 @@ then VLC_ADD_LDFLAGS([opengllayer], [-Wl,-framework,QuartzCore]) VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] ) -# VLC_ADD_PLUGINS([access_eyetv]) - VLC_ADD_BUILTINS([macosx minimal_macosx]) +# VLC_ADD_PLUGIN([access_eyetv]) + VLC_ADD_PLUGIN([macosx]) + VLC_ADD_PLUGIN([minimal_macosx]) ORIGCFLAGS=$CFLAGS CFLAGS="$CFLAGS -x objective-c" - AC_CHECK_HEADER(QuartzCore/CALayer.h, [VLC_ADD_BUILTINS([opengllayer])]) + AC_CHECK_HEADER(QuartzCore/CALayer.h, + [VLC_ADD_PLUGIN([opengllayer]) + VLC_ADD_OBJCFLAGS([opengllayer], [-isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5])]) CFLAGS=$ORIGCFLAGS fi @@ -5361,7 +5531,7 @@ AC_ARG_ENABLE(qnx, if test "${enable_qnx}" != "no" then AC_CHECK_HEADERS(Ph.h, [ - VLC_ADD_PLUGINS([qnx]) + VLC_ADD_PLUGIN([qnx]) VLC_ADD_LIBS([qnx],[-lasound -lph]) ]) fi @@ -5374,15 +5544,30 @@ AC_ARG_ENABLE(ncurses, [if test "${enable_ncurses}" != "no"; then AC_CHECK_HEADER(ncurses.h, [AC_CHECK_LIB(ncursesw, mvprintw, - [VLC_ADD_PLUGINS([ncurses]) + [VLC_ADD_PLUGIN([ncurses]) VLC_ADD_LIBS([ncurses],[-lncursesw]) ALIASES="${ALIASES} nvlc" AC_DEFINE([HAVE_NCURSESW], 1, [Define to 1 if you have libncursesw.]) + AC_CHECK_LIB(ncursesw, tgetent, [], + AC_CHECK_LIB(tinfow, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfow])], + [AC_CHECK_LIB(tinfo, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfo])], + [AS_IF([test "x${enable_ncurses}" != "x"], + [AC_MSG_ERROR([tgetent not found in ncursesw tinfow tinfo] + )])]) + ] + ) + ) ], [AC_CHECK_LIB( ncurses, mvprintw, - [VLC_ADD_PLUGINS([ncurses]) + [VLC_ADD_PLUGIN([ncurses]) ALIASES="${ALIASES} nvlc" - VLC_ADD_LIBS([ncurses],[-lncurses])], + VLC_ADD_LIBS([ncurses],[-lncurses]) + AC_CHECK_LIB(ncurses, tgetent, [], + [AC_CHECK_LIB(tinfo, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfo])], + [AS_IF([test "x${enable_ncurses}" != "x"], + [AC_MSG_ERROR([tgetent not found in ncurses tinfo])])] + )] + )], [AS_IF([test "x${enable_ncurses}" != "x"], [ AC_MSG_ERROR([libncurses not found])])] )] @@ -5408,7 +5593,7 @@ then AC_DEFINE(HAVE_XOSD_VERSION_0, 1, Define if is pre-1.0.0)))) if test "${have_xosd}" = "true" then - VLC_ADD_PLUGINS([xosd]) + VLC_ADD_PLUGIN([xosd]) VLC_ADD_LIBS([xosd],[-lxosd]) fi fi @@ -5421,7 +5606,7 @@ AC_ARG_ENABLE(fbosd, if test "${enable_fbosd}" = "yes" then AC_CHECK_HEADERS(linux/fb.h, [ - VLC_ADD_PLUGINS([fbosd]) + VLC_ADD_PLUGIN([fbosd]) ]) fi @@ -5432,7 +5617,7 @@ AC_ARG_ENABLE(visual, [ --enable-visual visualisation plugin (default enabled)]) if test "${enable_visual}" != "no" then - VLC_ADD_PLUGINS([visual]) + VLC_ADD_PLUGIN([visual]) fi dnl @@ -5443,7 +5628,7 @@ AC_ARG_ENABLE(galaktos, if test "${enable_galaktos}" = "yes" then AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [ - VLC_ADD_PLUGINS([galaktos]) + VLC_ADD_PLUGIN([galaktos]) if test "${SYS}" != "mingw32"; then VLC_ADD_LIBS([galaktos],[${X_LIBS} -lGL -lGLU]) else @@ -5475,7 +5660,7 @@ then fi if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a) - VLC_ADD_BUILTINS([goom]) + VLC_ADD_PLUGIN([goom]) VLC_ADD_LIBS([goom],[-L${real_goom_tree}/src/.libs -lgoom2]) VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE]) else @@ -5484,7 +5669,7 @@ then AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) if test -f "${real_goom_tree}/libgoom.a"; then AC_MSG_RESULT(${real_goom_tree}/libgoom.a) - VLC_ADD_BUILTINS([goom]) + VLC_ADD_PLUGIN([goom]) VLC_ADD_LIBS([goom],[-L${real_goom_tree} -lgoom]) VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM]) else @@ -5497,7 +5682,7 @@ then AC_CHECK_HEADERS(goom/goom.h, [ LDFLAGS="${LDFLAGS_save} ${LIBS_goom}" AC_CHECK_LIB(goom2, goom_init, [ - VLC_ADD_PLUGINS([goom]) + VLC_ADD_PLUGIN([goom]) VLC_ADD_LIBS([goom],[-lgoom2]) ],[ AC_MSG_ERROR([Could not find goom on your system: you may get it from http://www.ios-software.com/.]) @@ -5515,7 +5700,7 @@ if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then [ --disable-atmo AtmoLight (homebrew philips ambilight) (default enabled)]) if test "${enable_atmo}" != "no"; then AC_LANG_PUSH(C++) - VLC_ADD_PLUGINS([atmo]) + VLC_ADD_PLUGIN([atmo]) AC_LANG_POP(C++) fi fi @@ -5533,7 +5718,7 @@ then AC_DEFINE(HAVE_AVAHI_CLIENT, 1, [Define if you have the avahi-client library]) VLC_ADD_LIBS([bonjour access_output_http],[$BONJOUR_LIBS]) VLC_ADD_CFLAGS([bonjour access_output_http],[$BONJOUR_CFLAGS]) - VLC_ADD_PLUGINS([bonjour]) ], + VLC_ADD_PLUGIN([bonjour]) ], [AC_MSG_WARN(avahi-client library not found)]) fi @@ -5547,7 +5732,7 @@ then AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false") if test "${have_lirc}" = "true" then - VLC_ADD_PLUGINS([lirc]) + VLC_ADD_PLUGIN([lirc]) VLC_ADD_LIBS([lirc],[-llirc_client]) fi fi @@ -5596,7 +5781,7 @@ AC_ARG_ENABLE(gnutls, AS_IF([test "${enable_gnutls}" != "no"], [ PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.3.3], [ - VLC_ADD_PLUGINS([gnutls]) + VLC_ADD_PLUGIN([gnutls]) VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS]) AS_IF([test "${SYS}" = "mingw32"], [ dnl pkg-config --libs gnutls omits these @@ -5698,7 +5883,7 @@ AC_ARG_ENABLE(loader, [ --enable-loader build DLL loader for ELF i386 platforms (default disabled)]) AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) AS_IF([test "${enable_loader}" = "yes"], - [ VLC_ADD_PLUGINS([dmo]) + [ VLC_ADD_PLUGIN([dmo]) VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/libs/loader]) VLC_ADD_LIBS([dmo],[../../../libs/loader/libloader.la -lpthread]) VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/libs/loader]) @@ -5707,6 +5892,15 @@ AS_IF([test "${enable_loader}" = "yes"], VLC_ADD_LIBS([realaudio],[../../libs/loader/libloader.la]) ]) +AC_ARG_WITH(,[Components:]) + +dnl +dnl the VLC binary +dnl +AC_ARG_ENABLE(vlc, + [ --enable-vlc build the VLC media player (default enabled)]) +AM_CONDITIONAL(BUILD_VLC, [test "${enable_vlc}" != "no"]) + dnl dnl Microsoft ActiveX support dnl @@ -5820,7 +6014,7 @@ then VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}]) VLC_ADD_LDFLAGS([mozilla],[${MOZILLA_LDFLAGS}]) VLC_ADD_LIBS([mozilla],[${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS}]) - VLC_ADD_PLUGINS([mozilla]) + VLC_ADD_PLUGIN([mozilla]) MOZILLA_CONFIG= CPPFLAGS="${CPPFLAGS_save}" ], @@ -5959,11 +6153,17 @@ dnl Mediacontrol Python bindings dnl AC_ARG_ENABLE(python-bindings, [ --enable-python-bindings Enable Python bindings (default disabled)]) -dnl TODO: look for python dev headers -AS_IF([test "${enable_python_bindings}" = "yes"], - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} python" - ) +if test "${enable_python_bindings}" = "yes"; then + AC_PATH_PROG(PYTHON_CONFIG, python-config, no) + CFLAGS="${CFLAGS_save} `${PYTHON_CONFIG} --cflags`" + AC_CHECK_HEADER([Python.h], + PLUGINS_BINDINGS="${PLUGINS_BINDINGS} python", + AC_MSG_ERROR([You have to install python-dev to build the bindings]), + [] + ) + CFLAGS="${CFLAGS_save}" +fi AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"]) dnl @@ -5973,17 +6173,16 @@ AC_ARG_ENABLE(java-bindings, [ --enable-java-bindings Enable Java bindings (default disabled)]) if test "${enable_java_bindings}" = "yes" then - AS_IF([test "x${JAVA_HOME}" == "x"], - [AC_MSG_ERROR([Please set the JAVA_HOME variable to your JDK environment])]) - AC_PROG_JAVAC - AC_PROG_JAVA - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} java" - if test "${JAVAC}" == "javac${EXEEXT}" - then - JAVAC="javac${EXEEXT} -cp ./ " - fi + echo "" + echo "****** WARNING **** WARNING ***** WARNING *************" + echo "*** To compile the java bindings go to the " + echo "*** bindings/java folder and run mvn install. " + echo "*** You need maven2 installed. " + echo "*** This configuration will continue, so you will be " + echo "*** able to compile VideoLAN as usual. " + echo "*******************************************************" + echo "" fi -AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"]) dnl dnl test plugins @@ -6000,7 +6199,10 @@ then dnl this one is needed until automake knows what to do VLC_ADD_LIBS([test3],[-lobjc]) - VLC_ADD_PLUGINS([${TESTS}]) + VLC_ADD_PLUGIN([test1]) + VLC_ADD_PLUGIN([test2]) + VLC_ADD_PLUGIN([test3]) + VLC_ADD_PLUGIN([test4]) fi dnl @@ -6018,21 +6220,21 @@ dnl gtk_main plugin dnl if test "${NEED_GTK_MAIN}" != "no" then - VLC_ADD_PLUGINS([gtk_main]) + VLC_ADD_PLUGIN([gtk_main]) VLC_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk}]) VLC_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk}]) fi if test "${NEED_GNOME_MAIN}" != "no" then - VLC_ADD_PLUGINS([gnome_main]) + VLC_ADD_PLUGIN([gnome_main]) VLC_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_gnome}]) VLC_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_gnome}]) fi if test "${NEED_GTK2_MAIN}" != "no" then - VLC_ADD_PLUGINS([gtk2_main]) + VLC_ADD_PLUGIN([gtk2_main]) VLC_ADD_CFLAGS([gtk2],[-DNEED_GTK2_MAIN]) VLC_ADD_CFLAGS([pda],[-DNEED_GTK2_MAIN]) VLC_ADD_CFLAGS([gtk2_main],[${CFLAGS_gtk2} ${CFLAGS_pda}]) @@ -6041,7 +6243,7 @@ fi if test "${NEED_GNOME2_MAIN}" != "no" then - VLC_ADD_PLUGINS([gnome2_main]) + VLC_ADD_PLUGIN([gnome2_main]) VLC_ADD_CFLAGS([gnome2_main],[${CFLAGS_gtk2} ${CFLAGS_gnome2}]) VLC_ADD_LDFLAGS([gnome2_main],[${LDFLAGS_gtk2} ${LDFLAGS_gnome2}]) fi @@ -6051,7 +6253,7 @@ dnl qte_main plugin dnl if test "${NEED_QTE_MAIN}" != "no" then - VLC_ADD_PLUGINS([qte_main]) + VLC_ADD_PLUGIN([qte_main]) VLC_ADD_CXXFLAGS([opie qte qt_video],[-DNEED_QTE_MAIN]) VLC_ADD_CXXFLAGS([qte_main],[${CXXFLAGS_qte} ${CXXFLAGS_qt_video}]) VLC_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte} ${LDFLAGS_qt_video}]) @@ -6078,12 +6280,11 @@ AS_IF([test "${enable_shared}" = "no"], [ AS_IF([test "${plugin_support}" != "no"], [ AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins) ]) - AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"]) dnl Temporary(?) hack for plugins/builtins transition -VLC_ADD_PLUGINS([${BUILTINS}]) -BUILTINS="" +dnl VLC_ADD_PLUGIN([${BUILTINS}]) +dnl BUILTINS="" dnl dnl Pic and shared libvlc stuff @@ -6161,9 +6362,6 @@ AC_CONFIG_FILES([ Makefile projects/activex/Makefile projects/activex/axvlc.inf - bindings/Makefile - bindings/java/Makefile - bindings/java/src/Makefile bindings/python/Makefile doc/Makefile extras/package/ipkg/Makefile @@ -6175,6 +6373,7 @@ AC_CONFIG_FILES([ po/Makefile.in share/Makefile src/Makefile + test/Makefile ]) AC_CONFIG_FILES([ @@ -6245,6 +6444,7 @@ AC_CONFIG_FILES([ modules/video_chroma/Makefile modules/video_filter/Makefile modules/video_filter/atmo/Makefile + modules/video_filter/dynamicoverlay/Makefile modules/video_output/Makefile modules/video_output/msw/Makefile modules/video_output/qte/Makefile @@ -6271,15 +6471,20 @@ dnl for a in `./vlc-config --target plugin` ; do echo $a; done | sed -e 's,modul dnl Shortcut to nice compile message rm -f compile echo '#! /bin/sh' >compile - -echo "PATH=$PATH LANG=C make \$@ 2>&1| \\" >> compile -echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >> compile +echo rm -f .error\$\$ >>compile +echo ERROR=0 >>compile +echo export PATH=$PATH LANG=C >>compile +echo "(make \$@ 2>&1 || touch .error\$\$)| \\" >>compile +echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >>compile +echo test -f .error\$\$ \&\& ERROR=1 >>compile +echo rm -f .error\$\$ >>compile +echo exit \$ERROR >>compile chmod a+x compile printf " -vlc configuration +libvlc configuration -------------------- -vlc version : ${VERSION} +version : ${VERSION} system : ${SYS} architecture : ${ARCH} build flavour : " @@ -6288,9 +6493,13 @@ test "${enable_cprof}" = "yes" && printf "cprof " test "${enable_gprof}" = "yes" && printf "gprof " test "${enable_optimizations}" = "yes" && printf "optim " test "${enable_release}" = "yes" && printf "release " || printf "devel " -echo " -vlc aliases :${ALIASES} -plugins/bindings :${PLUGINS_BINDINGS} +echo "" +if test "${enable_vlc}" != "no"; then +echo "vlc aliases :${ALIASES}" +else +echo "build vlc executable : no" +fi +echo "plugins/bindings :${PLUGINS_BINDINGS} You can check which modules have been enabled with \`./vlc-config --list plugin'.