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
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(tar-ustar)
AM_CONFIG_HEADER(config.h)
dnl Too many people are not aware of maintainer mode:
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])
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
AC_CHECK_TOOL(WINDRES, windres, :)
case "${host_os}" in
+ *wince* | *mingwce* | *mingw32ce* | *pe*)
+ SYS=mingwce
+ ;;
*mingw32*)
SYS=mingw32
;;
#endif],
SYS=mingw32, SYS=cygwin)
;;
- *wince* | *mingwce* | *pe*)
- SYS=mingwce
- ;;
esac
if test "${SYS}" = "mingw32"; then
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 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*)
LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}"
dnl Check for BONE
if test -f /boot/beos/system/lib/libbind.so; then
- VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl],[-lbind -lsocket])
+ VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl_udp],[-lbind -lsocket])
else
- VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl],[-lnet])
+ VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl_udp],[-lnet])
fi
dnl Ugly check for Zeta
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}])
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}"
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])
+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(strcasecmp,,[AC_CHECK_FUNCS(stricmp)])
AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)])
AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)])
+AC_FUNC_ALLOCA
AH_BOTTOM([#include <vlc_fixups.h>])
+AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGINS([access_mmap])])
+
AS_IF([test "${SYS}" = "linux"], [
AC_CHECK_FUNCS(tee)
])
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],[-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])
])
])
AC_DEFINE(ssize_t, int)
])
-AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])])
+dnl don't attemp to use poll on darwin, it can't poll a tty. select will do a better job.
+if test "${SYS}" != "darwin"; then
+ AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])])
+fi
dnl Check for dirent
need_dirent=false
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_PLUGINS([hal])
+ VLC_ADD_PLUGINS([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
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],
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"
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"])
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])
+VLC_ADD_PLUGINS([dummy])
+VLC_ADD_PLUGINS([logger])
+VLC_ADD_PLUGINS([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])
+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])
+dnl Video codecs:
+VLC_ADD_PLUGINS([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])
+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])
+dnl Meta demuxers:
+VLC_ADD_PLUGINS([playlist])
+VLC_ADD_PLUGINS([export])
+VLC_ADD_PLUGINS([nsc])
+VLC_ADD_PLUGINS([xtag])
+dnl Channel mixing audio filters:
+VLC_ADD_PLUGINS([converter_fixed])
+VLC_ADD_PLUGINS([mono])
+VLC_ADD_PLUGINS([trivial_channel_mixer])
+dnl Resampling audio filters:
+VLC_ADD_PLUGINS([trivial_resampler])
+VLC_ADD_PLUGINS([ugly_resampler])
+dnl Audio mixers:
+VLC_ADD_PLUGINS([trivial_mixer])
+dnl Video chromas:
+VLC_ADD_PLUGINS([i420_rgb])
+VLC_ADD_PLUGINS([grey_yuv])
+dnl Video codecs:
+VLC_ADD_PLUGINS([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_PLUGINS([packetizer_mpegvideo packetizer_h264])
-VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
+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])
ALIASES="${ALIASES} cvlc"
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_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])
ALIASES="${ALIASES} rvlc"
fi
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_PLUGINS([screensaver])
+ VLC_ADD_PLUGINS([motion])
+ VLC_ADD_PLUGINS([dynamicoverlay])
elif test "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGINS([ntservice access_smb dmo msn])
+ VLC_ADD_PLUGINS([ntservice])
+ VLC_ADD_PLUGINS([access_smb])
+ VLC_ADD_PLUGINS([dmo])
+ VLC_ADD_PLUGINS([msn])
VLC_ADD_LIBS([dmo],[-lole32 -luuid])
else
VLC_ADD_PLUGINS([win32text])
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 <mmintrin.h>, 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 <mmintrin.h>
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_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])
+ ])
+
+ 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_PLUGINS([memcpymmxext])
+ ])
+])
dnl Check for fully workin SSE2 intrinsics
dnl We need support for -mmmx, we need <emmintrin.h>, 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 <emmintrin.h>
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_PLUGINS([i420_rgb_sse2])
+ VLC_ADD_PLUGINS([i420_yuy2_sse2])
+ VLC_ADD_PLUGINS([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_PLUGINS([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_PLUGINS([memcpyaltivec])
+ VLC_ADD_PLUGINS([i420_yuy2_altivec])
+ ])
dnl The AltiVec C extensions
dnl
dnl - Linux PPC, gcc 3.3: need <altivec.h> and -maltivec -mabi=altivec
dnl - Linux PPC, gcc 3.x: need <altivec.h> 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"
])
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_PLUGINS([memcpyaltivec])
+ VLC_ADD_PLUGINS([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
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
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
[ --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])
+ 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])
+ 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])
+ dnl Packetizers (FIXME: why are the others outside --enable-sout??):
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])
+ 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_PLUGINS([rtcp])
+ dnl Misc:
+ VLC_ADD_PLUGINS([vod_rtsp])
VLC_ADD_PLUGINS([profile_parser])
AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support)
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
VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS])
fi
fi
+AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
dnl
dnl HTTP daemon
VLC_ADD_PLUGINS([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
AC_ARG_ENABLE(growl,
[ --enable-growl growl notification plugin (default enabled)])
AS_IF([test "${enable_growl}" != "no"], [
- VLC_ADD_PLUGINS([growl])
+ VLC_ADD_PLUGINS([growl_udp])
+ AC_CHECK_HEADERS(Growl/GrowlDefines.h, [
+ VLC_ADD_PLUGINS([growl])
+ VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit])
+ ])
]
)
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_PLUGINS([vcd])
+ VLC_ADD_PLUGINS([cdda])
],[
AC_MSG_RESULT(no)
])
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_PLUGINS([vcd])
+ VLC_ADD_PLUGINS([cdda])
AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support)
],[
AC_MSG_RESULT(no)
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_PLUGINS([vcd])
+ VLC_ADD_PLUGINS([cdda])
AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support)
],[
AC_MSG_RESULT(no)
if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32"
then
- VLC_ADD_PLUGINS([vcd cdda])
+ VLC_ADD_PLUGINS([vcd])
+ VLC_ADD_PLUGINS([cdda])
fi
if test "${SYS}" = "darwin"
then
- VLC_ADD_PLUGINS([vcd cdda])
+ VLC_ADD_PLUGINS([vcd])
+ VLC_ADD_PLUGINS([cdda])
VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_LIBS([vcdx cddax cdda],[-liconv])
fi
[ --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_PLUGINS([screen])
+ VLC_ADD_LDFLAGS([screen],[-Wl,-framework,OpenGL,-framework,ApplicationServices])
+ ])
])
elif test "${SYS}" = "mingw32"; then
VLC_ADD_PLUGINS([screen])
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
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}"
],[
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
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}"
CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}"
- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
- AC_CHECK_HEADERS(ffmpeg/avformat.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avformat.h.])] )
- AC_CHECK_HEADERS(ffmpeg/avutil.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avutil.h.])] )
+ 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)
dnl newer ffmpeg have a separate libpostproc
PKG_CHECK_MODULES(POSTPROC, libpostproc,[
VLC_ADD_CFLAGS([ffmpeg],[${POSTPROC_CFLAGS}])
],[ true ])
CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
- AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
+ AC_CHECK_HEADERS(postproc/postprocess.h)
if test "${SYS}" = "darwin"; then
VLC_ADD_BUILTINS([ffmpeg])
else
PKG_CHECK_MODULES(SWSCALE,[libswscale],[
VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}])
VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}])
-dnl AC_CHECK_HEADERS(ffmpeg/swscale.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/swscale.h.])])
AC_CHECK_LIB(swscale, sws_getContext,
- [AC_CHECK_HEADERS([ffmpeg/avutil.h, ffmpeg/swscale.h])],[],[-lavutil -lm])
+ [AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h])],[],[-lavutil -lm])
],[ true ])
VLC_RESTORE_FLAGS
],[
dnl
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}"
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg} ${LIBS_ffmpeg}"
- AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
- AC_CHECK_HEADERS(ffmpeg/avformat.h)
- AC_CHECK_HEADERS(ffmpeg/avutil.h)
- AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
+ 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(postproc/postprocess.h)
AC_CHECK_LIB(avutil, av_crc_init, [
VLC_ADD_LIBS([ffmpeg],[-lavutil])
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, [
CPPFLAGS="${CPPFLAGS_save}"
AC_CHECK_LIB(swscale, sws_getContext, [
- AC_CHECK_HEADERS(ffmpeg/swscale.h)
+ AC_CHECK_HEADERS(ffmpeg/swscale.h libswscale/swscale.h)
VLC_ADD_LIBS([ffmpeg],[-lswscale]) ], [], [-lavcodec $LDAVUTIL])
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
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)
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_PLUGINS([osdmenu])
+ VLC_ADD_PLUGINS([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)
AC_MSG_RESULT(yes)
VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}])
VLC_ADD_LIBS([x264],[-L${real_x264_tree}])
- LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}"
- AC_CHECK_LIB(x264, x264_encoder_open, [
- VLC_ADD_BUILTINS([x264])
- VLC_ADD_LIBS([x264],[-lx264])
+ PKG_CHECK_MODULES(X264,x264, [
+ VLC_ADD_PLUGINS([x264])
+ VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
+ VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
],[
AC_MSG_ERROR([the specified tree hasn't been compiled])
])
AC_MSG_ERROR([the specified tree doesn't have x264.h])
fi
else
- LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}"
- AC_CHECK_HEADERS(x264.h, [
- AC_CHECK_LIB(x264, x264_encoder_open, [
+ PKG_CHECK_MODULES(X264,x264, [
VLC_ADD_PLUGINS([x264])
- VLC_ADD_LIBS([x264],[-lx264])
+ VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
+ VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
],[
if test "${enable_x264}" = "yes"; then
AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html])
fi
])
- ])
LDFLAGS="${LDFLAGS_save}"
fi
fi
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"],[
VLC_ADD_PLUGINS([telx])
])
+dnl
+dnl asa/csri subtitle rendering module
+dnl
+AC_ARG_ENABLE(csri,
+ [ --enable-csri Subtitle support using CSRI / asa (default disabled)])
+AS_IF( [test "${enable_csri}" = "yes"], [
+ PKG_CHECK_MODULES(CSRI,
+ csri >= 0.1.0,
+ [
+ VLC_ADD_LDFLAGS([csri],[$CSRI_LIBS])
+ VLC_ADD_CFLAGS([csri],[$CSRI_CFLAGS])
+ VLC_ADD_PLUGINS([csri])
+ ],[
+ AC_MSG_WARN([CSRI helper library not found])
+ ])
+ ])
+
+dnl
+dnl asa demuxer
+dnl
+AC_ARG_ENABLE(asademux,
+ [ --enable-asademux asa subtitle demuxing (default disabled)])
+AS_IF( [test "${enable_asademux}" = "yes"], [
+ PKG_CHECK_MODULES(PCRE,
+ libpcre >= 6.5,
+ [
+ VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS])
+ VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS])
+ VLC_ADD_PLUGINS([asademux])
+ ],[
+ AC_MSG_WARN([PCRE library not found (required for asademux)])
+ ])
+ ])
+
dnl
dnl CMML plugin
dnl
dnl
dnl XVMC module
-dnl (enabled by default except on win32)
+dnl (disabled by default except on win32)
dnl
AC_ARG_ENABLE(xvmc,
[ --enable-xvmc XVMC support (default disabled)])
CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}"
AC_CHECK_HEADERS(X11/extensions/vldXvMC.h, [
VLC_ADD_PLUGINS([xvmc])
- VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext])
+ VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXvMCW -lXv -lXinerama])
VLC_ADD_CPPFLAGS([xvmc],[${X_CFLAGS}])
])
CPPFLAGS="${CPPFLAGS_save}"
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"
])
])
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_PLUGINS([vout_sdl])
+ VLC_ADD_PLUGINS([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,,'`])
[ --enable-fribidi fribidi support (default enabled)])
if test "${enable_freetype}" != "no"
then
- PKG_CHECK_MODULES(FREETYPE, freetype2,[
+ PKG_CHECK_MODULES(FREETYPE, freetype2,[
VLC_ADD_PLUGINS([freetype])
- have_freetype=yes
+ have_freetype=yes
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${SYS}" = "mingw32"; then
if test -z "${with_directx}"
then
AC_CHECK_HEADERS(ddraw.h,
- [ VLC_ADD_PLUGINS([vout_directx aout_directx])
+ [ VLC_ADD_PLUGINS([vout_directx])
+ VLC_ADD_PLUGINS([aout_directx])
VLC_ADD_LIBS([vout_directx],[-lgdi32])
])
AC_CHECK_HEADERS(GL/gl.h,
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_PLUGINS([vout_directx])
+ VLC_ADD_PLUGINS([aout_directx])
VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}])
VLC_ADD_LIBS([vout_directx],[-lgdi32])
AC_MSG_RESULT(yes)
VLC_ADD_LIBS([wingdi],[-lgdi32])
fi
if test "${SYS}" = "mingwce"; then
- VLC_ADD_PLUGINS([wingdi wingapi])
+ VLC_ADD_PLUGINS([wingdi])
+ VLC_ADD_PLUGINS([wingapi])
fi
fi
fi
fi])
+dnl
+dnl Pulseaudio module
+dnl
+AC_ARG_ENABLE(pulse,
+ [ --enable-pulse Pulseaudio support (default enabled)])
+ if test "${enable_pulse}" != "no"
+ then
+ PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.8,
+ [ VLC_ADD_PLUGINS([pulse])
+ VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}])
+ VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS}])],
+ [AC_MSG_WARN(pulsaudio library not found)])
+ fi
+
dnl
dnl Portaudio module
dnl
AS_IF([test "${enable_jack}" != "no"], [
AC_CHECK_HEADERS(jack/jack.h, [
- VLC_ADD_PLUGINS([access_jack jack])
+ VLC_ADD_PLUGINS([access_jack])
+ VLC_ADD_PLUGINS([jack])
VLC_ADD_LIBS([access_jack jack],[-ljack])
],[AC_MSG_ERROR([cannot find JACK headers])])
])
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
NEED_GTK2_MAIN=yes
fi
fi
+AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"])
dnl dnl
dnl dnl Gnome module
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)
])
)
])
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
[ --enable-macosx MacOS X support (default enabled on MacOS X)])
if test "x${enable_macosx}" = "xyes"
then
- VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation])
+# VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation])
VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,Cocoa])
VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,OpenGL])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QTKit])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
VLC_ADD_LDFLAGS([opengllayer], [-Wl,-framework,QuartzCore])
- VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer], [-fobjc-exceptions] )
+ VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] )
- VLC_ADD_PLUGINS([access_eyetv])
+# VLC_ADD_PLUGINS([access_eyetv])
VLC_ADD_BUILTINS([macosx minimal_macosx])
ORIGCFLAGS=$CFLAGS
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])
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])])]
)]
fi
fi
+dnl
+dnl AtmoLight (homebrew AmbiLight)
+dnl
+if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then
+ AC_ARG_ENABLE(atmo,
+[ --disable-atmo AtmoLight (homebrew philips ambilight) (default enabled)])
+ if test "${enable_atmo}" != "no"; then
+ AC_LANG_PUSH(C++)
+ VLC_ADD_PLUGINS([atmo])
+ AC_LANG_POP(C++)
+ fi
+fi
+
dnl
dnl Bonjour services discovery
dnl
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
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
[ --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
dnl this one is needed until automake knows what to do
VLC_ADD_LIBS([test3],[-lobjc])
- VLC_ADD_PLUGINS([${TESTS}])
+ VLC_ADD_PLUGINS([test1])
+ VLC_ADD_PLUGINS([test2])
+ VLC_ADD_PLUGINS([test3])
+ VLC_ADD_PLUGINS([test4])
fi
dnl
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_PLUGINS([${BUILTINS}])
+dnl BUILTINS=""
dnl
dnl Pic and shared libvlc stuff
AC_SUBST(VERSION_MINOR)
AC_SUBST(VERSION_REVISION)
AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
-if test "${SYS}" = "cygwin"
+if test "${build_os}" = "cygwin"
then
AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure])
else
VLC_OUTPUT_VLC_CONFIG_IN
AC_CONFIG_FILES([
- vlc.win32.nsi
+ extras/package/win32/vlc.win32.nsi
Makefile
- activex/Makefile
- activex/axvlc.inf
+ projects/activex/Makefile
+ projects/activex/axvlc.inf
bindings/Makefile
- bindings/java/Makefile
- bindings/java/src/Makefile
bindings/python/Makefile
doc/Makefile
- ipkg/Makefile
+ extras/package/ipkg/Makefile
libs/loader/Makefile
libs/srtp/Makefile
modules/Makefile
- mozilla/Makefile
+ projects/mozilla/Makefile
m4/Makefile
po/Makefile.in
share/Makefile
src/Makefile
+ test/Makefile
])
AC_CONFIG_FILES([
modules/access/mms/Makefile
modules/access/cdda/Makefile
modules/access/rtsp/Makefile
+ modules/access/rtmp/Makefile
modules/access/v4l2/Makefile
modules/access/vcd/Makefile
modules/access/vcdx/Makefile
modules/stream_out/transrate/Makefile
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
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/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 : "
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'.
projects / vlc / blobdiff