dnl Autoconf settings for vlc
-AC_COPYRIGHT([Copyright 2002-2009 the VideoLAN team])
+AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
AC_INIT(vlc, 1.1.0-git)
VERSION_MAJOR="1"
AC_SUBST(PKGDIR)
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="Yellow Bastard"
-COPYRIGHT_YEARS="1996-2009"
+CODENAME="The Luggage"
+COPYRIGHT_YEARS="1996-2010"
AC_PREREQ(2.59c)
AC_CONFIG_SRCDIR(src/libvlc.c)
if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
topdir="`pwd`/$topdir"
fi
- CONTRIB_DIR=${topdir}/extras/contrib
+ CONTRIB_DIR=${topdir}/extras/contrib/hosts/${host}
+ if ! test -d "$CONTRIB_DIR"
+ then
+ gccmachine=`$CC -dumpmachine`
+ CONTRIB_DIR=${topdir}/extras/contrib/hosts/${gccmachine}
+ fi
fi
AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
AS_IF([test -d ${CONTRIB_DIR}/lib],[
- AS_IF([test "`grep HOST ${CONTRIB_DIR}/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"],[
- if test "${with_contrib}" = "yes"; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host])
- else
- AC_MSG_RESULT([no])
- AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host])
- fi
- ],[
AC_MSG_RESULT([yes])
+ AC_SUBST(CONTRIB_DIR)
export PATH=${CONTRIB_DIR}/bin:$PATH
CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include"
export LIBRARY_PATH=${CONTRIB_DIR}/lib:$LIBRARY_PATH
export BELIBRARIES=${CONTRIB_DIR}/lib:$BELIBRARIES
fi
+ ],[
+ AC_MSG_RESULT([no])
])
- ],[
- AC_MSG_RESULT([no])
- ])
])
dnl
dnl Set default values
bsdi*)
SYS=bsdi
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
- VLC_ADD_LIBS([dvd dvdcss vcd cdda vcdx cddax],[-ldvd])
+ VLC_ADD_LIBS([dvd dvdcss vcd cdda vcdx],[-ldvd])
;;
*bsd*)
SYS="${host_os}"
LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib"
LDFLAGS="${LDFLAGS_save}"
;;
+ openbsd*)
+ CPPFLAGS_save="${CPPFLAGS_save} -I/usr/local/include -I/usr/X11R6/include"
+ CPPFLAGS="${CPPFLAGS_save}"
+ LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib -L/usr/X11R6/lib/"
+ LDFLAGS="${LDFLAGS_save}"
+ ;;
esac
;;
darwin*)
VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup])
VLC_ADD_LDFLAGS([libvlc],[-Wl,-undefined,dynamic_lookup])
- VLC_ADD_LDFLAGS([avcodec avformat swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
+ VLC_ADD_LDFLAGS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
VLC_ADD_LDFLAGS([libvlccore],[-Wl,-framework,CoreFoundation])
VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation])
echo " Assuming --enable-theora"
enable_shout="yes"
echo " Assuming --enable-shout"
- enable_cddax="yes"
- echo " Assuming --enable-cddax"
enable_vcdx="yes"
echo " Assuming --enable-vcdx"
enable_caca="yes"
enable_skins2="no"
echo " Assuming --disable-skins2"
- enable_x11="no"
- echo " Assuming --disable-x11"
enable_xcb="no"
echo " Assuming --disable-xcb"
- enable_glx="no"
- echo " Assuming --disable-glx"
- enable_xvideo="no"
- echo " Assuming --disable-xvideo"
fi
dnl
dnl Check for Mac OS X SDK settings
LD="${LD} -syslibroot ${with_macosx_sdk}"
fi
AC_ARG_WITH(macosx-version-min,
- [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above])
+ [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above])
if test "${with_macosx_version_min}" != "" ; then
CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"
CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
VLC_ADD_LIBS([libvlccore],[-lws2_32 -lnetapi32 -lwinmm])
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([activex mozilla],[-lgdi32])
- VLC_ADD_LIBS([cdda vcdx cddax sdl_image aout_sdl vout_sdl],[-lwinmm])
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi],[-lws2_32])
+ VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-lwinmm])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[-lws2_32])
VLC_ADD_LIBS([access_file], [-lshlwapi])
dnl
dnl DEP and ASLR options
dnl
AC_ARG_ENABLE(peflags,
- [ --enable-peflags peflags use (default enabled)])
+ [ --enable-peflags peflags use (default enabled on Windows)])
if test "${enable_peflags}" != "no"
then
AC_CHECK_TOOL(PEFLAGS, peflags, :)
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
- VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts telnet],[-lws2])
+ VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts oldtelnet audiobargraph_a],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
fi
;;
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 libvlccore growl_udp],[-lbind -lsocket])
+ VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lbind -lsocket])
else
- VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlccore growl_udp],[-lnet])
+ VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnet])
fi
dnl Ugly check for Zeta
need_libc=false
dnl Check for usual libc functions
-AC_CHECK_FUNCS([gettimeofday isatty sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv ctime_r daemon fork lstat posix_fadvise posix_madvise uselocale])
+AC_CHECK_FUNCS([gettimeofday isatty getpwuid_r memalign posix_memalign getenv putenv setenv ctime_r daemon fork lstat posix_fadvise posix_madvise uselocale tdestroy])
AC_CHECK_FUNCS(fcntl)
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll vasprintf swab])
AC_CHECK_FUNCS([stricmp strnicmp])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
dnl Check for non-standard system calls
-AC_CHECK_FUNCS([vmsplice eventfd fstatfs])
+AC_CHECK_FUNCS([vmsplice eventfd fstatfs accept4])
AH_BOTTOM([#include <vlc_fixups.h>])
SOCKET_LIBS=""
AC_CHECK_FUNCS(connect,,[
AC_CHECK_LIB(socket,connect,[
- VLC_ADD_LIBS([libvlccore cdda cddax],-lsocket)
+ VLC_ADD_LIBS([libvlccore cdda],-lsocket)
SOCKET_LIBS="-lsocket"
])
])
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LIBS([avcodec avformat swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm])
+ VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
- VLC_ADD_LIBS([headphone_channel_mixer normvol speex mono colorthres extract],[-lm])
+ VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm])
])
AC_CHECK_LIB(m,ceil,[
- VLC_ADD_LIBS([hotkeys mosaic swscale_omap],[-lm])
+ VLC_ADD_LIBS([access_imem hotkeys mosaic swscale_omap],[-lm])
])
AC_CHECK_LIB(m,exp,[
VLC_ADD_LIBS([gaussianblur],[-lm])
PKG_PROG_PKG_CONFIG()
dnl On some OS we need static linking
-AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" ],[
- PKG_CONFIG="${PKG_CONFIG} --static"
- ])
+ AS_IF([test -n "${PKG_CONFIG}" ],[
+ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" ],[
+ PKG_CONFIG="${PKG_CONFIG} --static"
+ ])
+ ])
dnl
;;
esac
-dnl build the qte plugin ?
-NEED_QTE_MAIN=no
-
dnl Check for ntohl, etc.
AC_CACHE_CHECK([for ntohl in sys/param.h],
[ac_cv_c_ntohl_sys_param_h],
RDC_PROG_CC_FLAGS([-pipe])
AC_ARG_ENABLE(warnings-as-error,
- AS_HELP_STRING([--enable-warnings-as-error],[Treat acceptable warnings as error (default in debug)]),, [enable_warnings_as_error="$enable_debug"])
+ AS_HELP_STRING([--enable-warnings-as-error],[Treat acceptable warnings as error (default disabled)]),, [enable_warnings_as_error="no"])
AS_IF([test "${enable_warnings_as_error}" = "yes"], [
RDC_PROG_CC_WERRORFLAGS([unused-function unused-label unused-value unused-parameter unused-variable unused \
missing-braces nonnull parentheses uninitialized address enum-compare undef comment switch \
VLC_ADD_PLUGIN([ripple])
VLC_ADD_PLUGIN([psychedelic])
VLC_ADD_PLUGIN([gradient])
+VLC_ADD_PLUGIN([ball])
VLC_ADD_PLUGIN([motionblur])
VLC_ADD_PLUGIN([rv32])
VLC_ADD_PLUGIN([rotate])
VLC_ADD_PLUGIN([scale])
VLC_ADD_PLUGIN([vmem])
VLC_ADD_PLUGIN([logo])
+VLC_ADD_PLUGIN([audiobargraph_v])
VLC_ADD_PLUGIN([magnify])
VLC_ADD_PLUGIN([puzzle])
VLC_ADD_PLUGIN([colorthres])
if test "${SYS}" != "mingwce"; then
VLC_ADD_PLUGIN([gestures])
- VLC_ADD_PLUGIN([rc])
+ VLC_ADD_PLUGIN([oldrc])
VLC_ADD_PLUGIN([hotkeys])
VLC_ADD_PLUGIN([showintf])
VLC_ADD_PLUGIN([marq])
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([dolby_surround_decoder])
VLC_ADD_PLUGIN([headphone_channel_mixer])
VLC_ADD_PLUGIN([normvol])
+ VLC_ADD_PLUGIN([audiobargraph_a])
VLC_ADD_PLUGIN([equalizer])
VLC_ADD_PLUGIN([param_eq])
VLC_ADD_PLUGIN([scaletempo])
VLC_ADD_PLUGIN([simple_channel_mixer])
VLC_ADD_PLUGIN([headphone_channel_mixer])
VLC_ADD_PLUGIN([normvol])
+ VLC_ADD_PLUGIN([audiobargraph_a])
VLC_ADD_PLUGIN([a52tospdif])
VLC_ADD_PLUGIN([dtstospdif])
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])
dnl Some plugins aren't useful on some platforms
dnl
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([screensaver])
VLC_ADD_PLUGIN([motion])
VLC_ADD_PLUGIN([dynamicoverlay])
VLC_ADD_PLUGIN([signals])
;;
esac
])
+have_mmx="no"
+have_mmxext="no"
AS_IF([test "${enable_mmx}" != "no"], [
ARCH="${ARCH} mmx"
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])
+ VLC_ADD_CFLAGS([memcpymmx i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx],[-mmmx])
])
AC_CACHE_CHECK([if $CC groks MMX inline assembly],
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])
+ have_mmx="yes"
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],
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])
+ have_mmxext="yes"
])
])
+AM_CONDITIONAL([HAVE_MMX], [test "${have_mmx}" = "yes"])
+AM_CONDITIONAL([HAVE_MMXEXT], [test "${have_mmxext}" = "yes"])
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_ARG_ENABLE(sse,
-[ --disable-sse disable SSE (1, 2, 3 and 4) optimizations (default auto)]
-,, [
+[ --disable-sse disable SSE (1, 2, 3 and 4) optimizations (default auto)],
+, [
case "${host_cpu}" in
i686|x86_64)
enable_sse=yes
# SSE3
AC_CACHE_CHECK([if $CC groks SSE3 inline assembly],
[ac_cv_sse3_inline],
- [CFLAGS="${CFLAGS_save} -O -msse3"
+ [CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("movsldup %%xmm1,%%xmm0"::"r"(p));],
- ac_cv_sse3_inline=yes, ac_cv_sse3_inline=no)
- ARCH="${ARCH} sse3"
- ])
+ ac_cv_sse3_inline=yes, ac_cv_sse3_inline=no)])
AS_IF([test "${ac_cv_sse3_inline}" != "no"], [
AC_DEFINE(CAN_COMPILE_SSE3, 1,
[Define to 1 if SSE3 inline assembly is available.]) ])
# SSSE3
AC_CACHE_CHECK([if $CC groks SSSE3 inline assembly],
[ac_cv_ssse3_inline],
- [CFLAGS="${CFLAGS_save} -O -mssse3"
+ [CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("pabsw %%xmm0,%%xmm0"::"r"(p));],
- ac_cv_ssse3_inline=yes, ac_cv_ssse3_inline=no)
- ARCH="${ARCH} ssse3"
- ])
-
+ ac_cv_ssse3_inline=yes, ac_cv_ssse3_inline=no)])
AS_IF([test "${ac_cv_ssse3_inline}" != "no"], [
AC_DEFINE(CAN_COMPILE_SSSE3, 1,
[Define to 1 if SSSE3 inline assembly is available.]) ])
- # SSE4
- AC_CACHE_CHECK([if $CC groks SSE4 inline assembly],
- [ac_cv_sse4_inline],
- [CFLAGS="${CFLAGS_save} -O -msse4"
+ # SSE4.1
+ AC_CACHE_CHECK([if $CC groks SSE4.1 inline assembly],
+ [ac_cv_sse4_1_inline],
+ [CFLAGS="${CFLAGS_save}"
AC_TRY_COMPILE(,[void *p;asm volatile("pmaxsb %%xmm1,%%xmm0"::"r"(p));],
- ac_cv_sse4_inline=yes, ac_cv_sse4_inline=no)
- ARCH="${ARCH} sse4"
- ])
- AS_IF([test "${ac_cv_sse4_inline}" != "no"], [
- AC_DEFINE(CAN_COMPILE_SSE4, 1,
- [Define to 1 if SSE4 inline assembly is available.]) ])
+ ac_cv_sse4_1_inline=yes, ac_cv_sse4_1_inline=no)])
+ AS_IF([test "${ac_cv_sse4_1_inline}" != "no"], [
+ AC_DEFINE(CAN_COMPILE_SSE4_1, 1,
+ [Define to 1 if SSE4_1 inline assembly is available.]) ])
+
+ # SSE4.2
+ AC_CACHE_CHECK([if $CC groks SSE4.2 inline assembly],
+ [ac_cv_sse4_2_inline],
+ [CFLAGS="${CFLAGS_save}"
+ AC_TRY_COMPILE(,[void *p;asm volatile("pcmpgtq %%xmm1,%%xmm0"::"r"(p));],
+ ac_cv_sse4_2_inline=yes, ac_cv_sse4_2_inline=no)])
+ AS_IF([test "${ac_cv_sse4_2_inline}" != "no"], [
+ AC_DEFINE(CAN_COMPILE_SSE4_2, 1,
+ [Define to 1 if SSE4_2 inline assembly is available.]) ])
+
+ # SSE4A
+ AC_CACHE_CHECK([if $CC groks SSE4A inline assembly],
+ [ac_cv_sse4a_inline],
+ [CFLAGS="${CFLAGS_save}"
+ AC_TRY_COMPILE(,[void *p;asm volatile("insertq %%xmm1,%%xmm0"::"r"(p));],
+ ac_cv_sse4a_inline=yes, ac_cv_sse4a_inline=no)])
+ AS_IF([test "${ac_cv_sse4a_inline}" != "no"], [
+ AC_DEFINE(CAN_COMPILE_SSE4A, 1,
+ [Define to 1 if SSE4A inline assembly is available.]) ])
])
+have_3dnow="no"
AC_CACHE_CHECK([if $CC groks 3D Now! inline assembly],
[ac_cv_3dnow_inline],
[CFLAGS="${CFLAGS_save}"
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])
+ have_3dnow="yes"
])
+AM_CONDITIONAL([HAVE_3DNOW], [test "$have_3dnow" = "yes"])
AC_ARG_ENABLE(neon,
-[ --disable-neon disable NEON optimizations (default auto)],, [
+[ --disable-neon disable NEON optimizations (default auto)],, [
AS_IF([test "${host_cpu}" = "arm"], [enable_neon="yes"] ,[enable_neon="no"])
])
AS_IF([test "${enable_neon}" != "no"], [
AS_IF([test "${host_cpu}" = "powerpc"],
[enable_altivec=yes], [enable_altivec=no])
])
+have_altivec="no"
AS_IF([test "${enable_altivec}" = "yes"], [
ARCH="${ARCH} altivec";
AC_CACHE_CHECK([if $CC groks AltiVec inline assembly],
VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}])
VLC_ADD_CFLAGS([libvlccore],[${ac_cv_altivec_inline}])
])
- VLC_ADD_PLUGIN([memcpyaltivec])
+ have_altivec="yes"
VLC_ADD_PLUGIN([i420_yuy2_altivec])
])
VLC_ADD_CFLAGS([libvlccore],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
- VLC_ADD_PLUGIN([memcpyaltivec])
+ have_altivec="yes"
VLC_ADD_PLUGIN([i420_yuy2_altivec])
])
VLC_ADD_LDFLAGS([libvlccore idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib])
])
])
+AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"])
dnl
dnl Special arch tuning
if test "x${have_lua}" = "xyes" ; then
VLC_ADD_LIBS([lua],[$LUA_LIBS])
VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS])
+ else
+ AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
fi
fi
AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
[ --enable-httpd HTTP daemon (default enabled)])
if test "${enable_httpd}" != "no"
then
- VLC_ADD_PLUGIN([http])
+ VLC_ADD_PLUGIN([oldhttp])
AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support)
fi
AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
AC_MSG_ERROR([VLM requires the stream output. Do not use --disable-sout.])
])
AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support])
- VLC_ADD_PLUGIN([telnet])
+ VLC_ADD_PLUGIN([oldtelnet])
])
AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"])
AC_CHECK_HEADERS(Growl/GrowlDefines.h, [
VLC_ADD_PLUGIN([growl])
VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit])
+ VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] )
])
]
)
[ --enable-live555 live555 RTSP input plugin (default enabled)])
if test "${enable_live555}" != "no"; then
AC_ARG_WITH(live555-tree,
- [ --with-live555-tree=PATH live.com tree for static linking])
+ [ --with-live555-tree=PATH live.com tree for static linking])
dnl
dnl test for --with-live555-tree
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
other_libs="$other_libs -lws2_32"
+ elif test "${SYS}" = "mingwce"; then
+ # add ws2 for closesocket, select, recv
+ other_libs="$other_libs -lws2"
fi
dnl We need to check for pic because live555 don't provide shared libs
dnl and we want to build a plugins so we need -fPIC on some arch.
VLC_ADD_LIBS([live555],[-lws2_32])
fi
- VLC_ADD_LIBS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
+ VLC_ADD_LIBS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment])
VLC_ADD_LIBS([live555],[-L${real_live555_tree}/BasicUsageEnvironment -lBasicUsageEnvironment])
VLC_ADD_LIBS([live555],[-L${real_live555_tree}/groupsock -lgroupsock])
- VLC_ADD_LIBS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment])
+ VLC_ADD_LIBS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia])
VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/BasicUsageEnvironment/include])
VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/groupsock/include])
dnl - special access module for dc1394 input
dnl - dv module: digital video module check for libraw1394
dnl
-PKG_ENABLE_MODULES_VLC([dc1394], [], [libraw1394 >= 2.0.1 libdc1394 >= 1.0.0], [dc1394 access module], [auto])
-PKG_ENABLE_MODULES_VLC([dv], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto])
+PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], [dc1394 access module], [auto])
+PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto])
dnl
dnl dvdread module: check for libdvdread
if test "${enable_dvdread}" != "no"
then
AC_ARG_WITH(dvdread,
- [ --with-dvdread=PATH libdvdread headers and libraries])
+ [ --with-dvdread=PATH libdvdread headers and libraries])
AC_ARG_WITH(dvdread-tree,
- [ --with-dvdread-tree=PATH libdvdread tree for static linking])
+ [ --with-dvdread-tree=PATH libdvdread tree for static linking])
dnl Temporary hack (yeah, sure ;)
if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then
DVDNAV_PATH="${PATH}"
AC_ARG_WITH(dvdnav-config-path,
- [ --with-dvdnav-config-path=PATH dvdnav-config path (default search in \$PATH)],
+ [ --with-dvdnav-config-path=PATH dvdnav-config path (default search in \$PATH)],
[ if test "${with_dvdnav_config_path}" != "no"
then
DVDNAV_PATH="${with_dvdnav_config_path}:${PATH}"
if test "${enable_opencv}" = "yes" -a "${CXX}" != "";
then
AC_ARG_WITH(opencv-tree,
- [ --with-opencv-tree=PATH opencv tree for linking])
+ [ --with-opencv-tree=PATH opencv tree for linking])
if test "${SYS}" = "mingw32"
then
test -z "${with_opencv_tree}" && AC_MSG_ERROR([You have to specify --with-opencv-tree])
if test "${enable_dvbpsi}" != "no"
then
AC_ARG_WITH(dvbpsi,
- [ --with-dvbpsi=PATH libdvbpsi headers and libraries])
+ [ --with-dvbpsi=PATH libdvbpsi headers and libraries])
AC_ARG_WITH(dvbpsi,
- [ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking])
+ [ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking])
case "${with_dvbpsi}" in
""|yes)
if test -z "${with_dvbpsi_tree}"
AC_CHECK_HEADERS([dvbpsi/dr.h],[
VLC_ADD_PLUGIN([ts])
if test "${enable_sout}" != "no"; then
- VLC_ADD_PLUGIN([mux_ts])
+ AC_CHECK_LIB(dvbpsi, dvbpsi_SDTServiceAddDescriptor,
+ [VLC_ADD_PLUGIN([mux_ts])], [], [${LDFLAGS_test} -ldvbpsi])
fi
VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}])
VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi])
],[
if test -n "${enable_dvbpsi}"
then
- AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1])
+ AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.6])
fi
],
[#if defined( HAVE_STDINT_H )
if test "${enable_v4l}" = "yes"
then
AC_ARG_WITH(v4l,
- [ --with-v4l=PATH path to a v4l-enabled kernel tree],[],[])
+ [ --with-v4l=PATH path to a v4l-enabled kernel tree],[],[])
if test "${with_v4l}" != "no" -a -n "${with_v4l}"
then
VLC_ADD_CPPFLAGS([v4l],[-I${with_v4l}/include])
CPPFLAGS="${CPPFLAGS_save}"
fi
+dnl
+dnl libv4l1 support for video4linux.
+dnl
+AC_ARG_ENABLE( libv4l,
+ [ --enable-libv4l Libv4l Video4Linux support (default enabled)])
+if test "${enable_libv4l}" != "no" -a "${enable_v4l}" != "no"
+then
+ PKG_CHECK_MODULES( LIBV4L, libv4l1, [
+ VLC_ADD_LDFLAGS([v4l],[${LIBV4L_LIBS}])
+ VLC_ADD_CFLAGS([v4l],[${LIBV4L_CFLAGS}])
+ AC_DEFINE(HAVE_LIBV4L1, 1, Define if libv4l is available)],
+ AC_MSG_WARN([LibV4L support disabled because libv4l development headers were not found])
+ )
+fi
+
dnl
dnl Video4Linux2 plugin
dnl
if test "${enable_v4l2}" != "no"
then
AC_ARG_WITH(v4l2,
- [ --with-v4l2=PATH path to a v4l2-enabled kernel tree],[],[])
+ [ --with-v4l2=PATH path to a v4l2-enabled kernel tree],[],[])
if test "${with_v4l2}" != "no" -a -n "${with_v4l2}"
then
VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include])
PKG_CHECK_MODULES( LIBV4L2, libv4l2, [
VLC_ADD_LDFLAGS([v4l2],[${LIBV4L2_LIBS}])
VLC_ADD_CFLAGS([v4l2],[${LIBV4L2_CFLAGS}])
- AC_DEFINE(HAVE_LIBV4L2, 1, Define if libv4l is available)],
+ AC_DEFINE(HAVE_LIBV4L2, 1, Define if libv4l2 is available)],
AC_MSG_WARN([LibV4L2 support disabled because libv4l2 development headers were not found])
)
fi
AC_ARG_ENABLE(libcdio,
[ --enable-libcdio CD input and control library support (default enabled)])
-AC_ARG_ENABLE(vcdinfo,
+AC_ARG_ENABLE(libvcdinfo,
[ --enable-libvcdinfo VCD information library support (default enabled)])
have_libcdio=no
if test "${enable_vcdinfo}" != "no"
then
- PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.22,
+ PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
[have_libvcdinfo=yes],
[AC_MSG_WARN(VCD information library not found)])
fi
fi
dnl
-dnl VCDX and CDDAX modules
+dnl VCDX modules
dnl
-AC_ARG_ENABLE(cddax,
- AS_HELP_STRING([--enable-cddax],[audio CD plugin with CD Text and CD paranoia
- via libcdio (default disabled)]))
-
-AC_ARG_ENABLE(libcddb,
- [ --enable-libcddb CDDB support for libcdio audio CD (default enabled)])
-
-if test "${enable_cddax}" = "yes"
-then
- if test "$have_libcdio" = "yes"
- 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_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]))
- else
- AC_MSG_WARN([cddax plugin disabled because ok libcdio library not found or disabled])
- HAVE_CDDAX=no
- fi
-
- if test "$enable_libcddb" != "no"; then
- PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [
- HAVE_LIBCDDB=yes
- AC_DEFINE(HAVE_LIBCDDB, 1, [Define this if you have libcddb installed])
- VLC_ADD_LIBS([cddax],[$LIBCDDB_LIBS])
- VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
- ],
- [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled)
- HAVE_LIBCDDB=no])
- fi
-
-fi
-
AC_ARG_ENABLE(vcdx,
[ --enable-vcdx VCD with navigation via libvcdinfo (default disabled)])
AC_ARG_ENABLE(vcd,
[ --enable-vcd built-in VCD (default enabled)])
+AC_ARG_ENABLE(libcddb,
+ [ --enable-libcddb CDDB support for libcdio audio CD (default enabled)])
+
if test "${enable_vcd}" != "no"
then
AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h)
then
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])
+ VLC_ADD_LDFLAGS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation])
+ VLC_ADD_LIBS([vcdx cdda],[-liconv])
fi
if test "$enable_libcddb" != "no"; then
then
AS_IF([test "${have_dvbpsi}" = "yes" ],[
AC_ARG_WITH(dvb,
- [ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[])
+ [ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[])
if test "${with_dvb}" != "no" -a -n "${with_dvb}"
then
VLC_ADD_CFLAGS([dvb],[-I${with_dvb}/include])
fi
dnl
-dnl ipv6 plugin - not for QNX yet
+dnl ipv6 plugin
dnl
have_ipv6=no
AC_CHECK_FUNCS(inet_pton,[have_ipv6=yes],[
if test "${enable_sout}" != "no"; then
dnl Check for libshout
-PKG_ENABLE_MODULES_VLC([shout], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
+PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
fi
dnl
if test "${enable_mod}" != "no"
then
AC_ARG_WITH(mod-tree,
- [ --with-mod-tree=PATH mod tree for static linking])
+ [ --with-mod-tree=PATH mod tree for static linking])
if test -n "${with_mod_tree}"
then
AC_MSG_CHECKING(for libmodplug.a in ${with_mod_tree})
AC_MSG_ERROR([cannot find ${real_mod_tree}/src/.libs/libmodplug.a, make sure you compiled mod in ${with_mod_tree}])
fi
else
- AC_CHECK_HEADERS(libmodplug/modplug.h, [
- VLC_ADD_PLUGIN([mod])
- VLC_ADD_CXXFLAGS([mod],[])
- VLC_ADD_LIBS([mod],[-lmodplug -lstdc++])])
+ PKG_CHECK_MODULES(LIBMODPLUG, libmodplug >= 0.8,
+ [ VLC_ADD_PLUGIN([mod])
+ VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
+ VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS])
+ ],[AC_MSG_WARN([libmodplug not found!])])
fi
fi
then
AC_LANG_PUSH(C++)
AC_ARG_WITH(gme-tree,
- [ --with-gme-tree=PATH gme tree for static linking])
+ [ --with-gme-tree=PATH gme tree for static linking])
if test -n "${with_gme_tree}"
then
AC_MSG_CHECKING(for libgme.a in ${with_mod_tree})
if test "${enable_mad}" != "no"
then
AC_ARG_WITH(mad,
- [ --with-mad=PATH path to libmad],[],[])
+ [ --with-mad=PATH path to libmad],[],[])
if test "${with_mad}" != "no" -a -n "${with_mad}"
then
VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include])
fi
AC_ARG_WITH(mad-tree,
- [ --with-mad-tree=PATH mad tree for static linking],[],[])
+ [ --with-mad-tree=PATH mad tree for static linking],[],[])
if test "${with_mad_tree}" != "no" -a -n "${with_mad_tree}"
then
real_mad_tree="`cd ${with_mad_tree} 2>/dev/null && pwd`"
])
AC_ARG_ENABLE(merge-ffmpeg,
-[ --enable-merged-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
+[ --enable-merge-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
enable_merge_ffmpeg="no"
])
AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
dnl libva needs avcodec
dnl
AC_ARG_ENABLE(libva,
- [ --enable-libva libva VAAPI support (default disabled)])
-AS_IF([test "${enable_libva}" = "yes"], [
+ [ --enable-libva libva VAAPI support (default auto)])
+
+AS_IF([test "${enable_libva}" != "no"], [
AS_IF([test "x${have_avcodec}" = "xyes"], [
PKG_CHECK_MODULES(LIBVA, [libva libva-x11],
[
- VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
- VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
- AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+ AC_CHECK_HEADERS(libavcodec/vaapi.h, [
+ VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
+ VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
+ AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+ echo "VAAPI acceleration activated"
+ ],[
+ AS_IF([test "${enable_libva}" == "yes"],
+ [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
+ [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
+ ])
],[
- AC_MSG_ERROR([Could not find libva.])
+ AS_IF([test "${enable_libva}" == "yes"],
+ [AC_MSG_ERROR([Could not find required libva.])],
+ [AC_MSG_WARN([libva not found ])])
+ ])
+ ],[
+ AS_IF([test "x${enable_libva}" != "x"], [
+ AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive.])
])
+ ])
+])
+
+dnl
+dnl dxva2 needs avcodec
+dnl
+AC_ARG_ENABLE(dxva2,
+ [ --enable-dxva2 DxVA2 support (default auto)])
+
+AS_IF([test "${enable_dxva2}" != "no"], [
+ if test "${SYS}" = "mingw32"; then
+ AS_IF([test "x${have_avcodec}" = "xyes"], [
+ AC_CHECK_HEADERS(dxva2api.h,
+ [
+ AC_CHECK_HEADERS(libavcodec/dxva2.h, [
+ VLC_ADD_LIBS([avcodec],[-lole32 -lshlwapi -luuid])
+ AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.])
+ echo "DxVA2 acceleration activated"
+ ],[
+ AS_IF([test "${enable_dxva2}" == "yes"],
+ [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
+ [AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])])
+ ])
+ ],[
+ AS_IF([test "${enable_dxva2}" == "yes"],
+ [AC_MSG_ERROR([Could not find required dxva2api.h])],
+ [AC_MSG_WARN([dxva2api.h not found])])
+ ])
],[
- AC_MSG_ERROR([libva VAAPI support depends on libavcodec.])
+ AS_IF([test "x${enable_dxva2}" != "x"], [
+ AC_MSG_ERROR([--enable-dxva2 and --disable-avcodec options are mutually exclusive.])
+ ])
])
+ fi
])
+
dnl
dnl stream_out switcher needs libavcodec
dnl
VLC_ADD_PLUGIN([avformat])
VLC_ADD_LIBS([avformat],[$AVFORMAT_LIBS $AVUTIL_LIBS])
VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
+
+ VLC_ADD_PLUGIN([access_avio])
+ VLC_ADD_LIBS([access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
+ VLC_ADD_CFLAGS([access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
], [
VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS])
VLC_ADD_CFLAGS([avcodec],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
if test "${enable_faad}" = "yes"
then
AC_ARG_WITH(faad-tree,
- [ --with-faad-tree=PATH faad tree for static linking])
+ [ --with-faad-tree=PATH faad tree for static linking])
if test -n "${with_faad_tree}"
then
AC_MSG_CHECKING(for libfaad.a in ${with_faad_tree})
dnl
dnl twolame encoder plugin
dnl
-PKG_ENABLE_MODULES_VLC([twolame], [], [twolame], [MPEG Audio Layer 2 encoder], [auto], [], [], [ -DLIBTWOLAME_STATIC])
+PKG_ENABLE_MODULES_VLC([TWOLAME], [], [twolame], [MPEG Audio Layer 2 encoder], [auto], [], [], [ -DLIBTWOLAME_STATIC])
dnl
dnl QuickTime plugin
if test "${enable_a52}" != "no"
then
AC_ARG_WITH(a52,
- [ --with-a52=PATH a52 headers and libraries])
+ [ --with-a52=PATH a52 headers and libraries])
AC_ARG_WITH(a52-tree,
- [ --with-a52-tree=PATH a52dec tree for static linking ],[],[])
+ [ --with-a52-tree=PATH a52dec tree for static linking ],[],[])
if test "${with_a52_tree}" != "no" -a -n "${with_a52_tree}"
then
real_a52_tree="`cd ${with_a52_tree} 2>/dev/null && pwd`"
fi
AC_ARG_WITH(a52-fixed,
- [ --with-a52-fixed specify if liba52 has been compiled with fixed point support],
+ [ --with-a52-fixed specify if liba52 has been compiled with fixed point support],
[
VLC_ADD_CPPFLAGS([a52tofloat32],[-DLIBA52_FIXED]) ])
dnl
PKG_ENABLE_MODULES_VLC([SPEEX], [], [ogg speex >= 1.0.5], [Speex decoder support], [auto])
-dnl
-dnl tarkin decoder plugin
-dnl
-AC_ARG_ENABLE(tarkin,
-[ --enable-tarkin experimental tarkin codec (default disabled)])
-if test "${enable_tarkin}" = "yes"
-then
- AC_ARG_WITH(tarkin-tree,
- [ --with-tarkin-tree=PATH tarkin tree for static linking])
- if test -n "${with_tarkin_tree}"
- then
- AC_MSG_CHECKING(for tarkin.o in ${with_tarkin_tree})
- real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`"
- if test -f "${real_tarkin_tree}/tarkin.o"
- then
- VLC_ADD_PLUGIN([tarkin])
- VLC_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}])
- VLC_ADD_LIBS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg])
- AC_MSG_RESULT(yes)
- else
- dnl The given tarkin tree wasn't built
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_tarkin_tree}/tarkin.o,
- make sure you compiled tarkin in ${with_tarkin_tree}])
- fi
- fi
-fi
-
dnl
dnl theora decoder plugin
dnl
[ --enable-x264 H264 encoding support with libx264 (default enabled)])
if test "${enable_x264}" != "no"; then
AC_ARG_WITH(x264-tree,
- [ --with-x264-tree=PATH x264 tree for static linking ],[],[])
+ [ --with-x264-tree=PATH x264 tree for static linking ],[],[])
if test "${with_x264_tree}" != "no" -a -n "${with_x264_tree}"
then
real_x264_tree="`cd ${with_x264_tree} 2>/dev/null && pwd`"
AS_IF( [test "${enable_zvbi}" != "no"],[
PKG_CHECK_MODULES(ZVBI,
- zvbi-0.2 >= 0.2.25,
+ zvbi-0.2 >= 0.2.28,
[
VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
if test "${SYS}" = "mingw32"; then
dnl libass subtitle rendering module
dnl
AC_ARG_ENABLE(libass,
- [ --enable-libass Subtitle support using libass (default disabled)])
-AS_IF( [test "${enable_libass}" = "yes"], [
+ [ --enable-libass Subtitle support using libass (default enabled)])
+AS_IF( [test "${enable_libass}" != "no"], [
PKG_CHECK_MODULES(LIBASS, libass >= 0.9.6,
[
VLC_ADD_LIBS([libass],[$LIBASS_LIBS])
])
])
-dnl
-dnl CMML plugin
-dnl
-AC_ARG_ENABLE(cmml,
- [ --enable-cmml CMML support (default enabled)])
-if test "${enable_cmml}" != "no"
-then
- VLC_ADD_PLUGIN([cmml])
-fi
-
dnl
dnl kate decoder plugin
dnl
dnl
-dnl tiger decoder plugin
+dnl tiger rendering for kate decoder plugin
dnl
-PKG_ENABLE_MODULES_VLC([TIGER], [], [tiger >= 0.3.1], [Tiger rendering library for Kate streams],[auto])
+AC_ARG_ENABLE(tiger,
+[ --enable-tiger Tiger rendering library for Kate streams (default enabled)])
+AS_IF([test "${enable_tiger}" != "no"], [
+ PKG_CHECK_MODULES(TIGER,[tiger >= 0.3.1], [
+ AC_DEFINE(HAVE_TIGER, 1, [Define if libtiger is available.])
+ VLC_ADD_CFLAGS([kate],[$TIGER_CFLAGS])
+ VLC_ADD_LIBS([kate],[$TIGER_LIBS]) ],[
+ AS_IF([test "x${enable_tiger}" != "x"], [
+ AC_MSG_ERROR([libtiger does not appear to be installed on your system.])
+ ])
+ ])
+])
+
dnl
dnl
AC_PATH_XTRA()
-AC_ARG_ENABLE(x11,
- [ --enable-x11 X11 support with Xlib (default enabled)],, [
- AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
- enable_x11="yes"
- ], [
- enable_x11="no"
- ])
-])
-
-CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}"
-
-AS_IF([test "${enable_x11}" != "no"], [
- AC_CHECK_HEADERS(X11/Xlib.h)
-
-dnl Check for DPMS
- AC_CHECK_HEADERS(X11/extensions/dpms.h, [
- AC_MSG_CHECKING(for DPMSInfo in X11/extensions/dpms.h)
- AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[
- AC_MSG_RESULT(yes)
- AC_DEFINE(DPMSINFO_IN_DPMS_H, 1,
- Define if <X11/extensions/dpms.h> defines DPMSInfo.)
- ],[
- AC_MSG_RESULT(no)
- ])
- ],,[
- #include <X11/Xlib.h>
- ])
-])
-
-dnl
-dnl GLX module
-dnl (enabled by default except on win32)
-dnl
-AC_ARG_ENABLE(glx,
- [ --enable-glx X11 OpenGL (GLX) support (default enabled)],, [
- enable_glx="$enable_x11"
-])
-AS_IF([test "${enable_glx}" != "no"], [
- AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h)
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
- [[#if !defined(HAVE_X11_XLIB_H) || !defined(HAVE_GL_GLU_H) || !defined(HAVE_GL_GLX_H)
- choke me
- #endif]]),
- [
- 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.])])
-])
-
-dnl
-dnl XVMC module
-dnl (disabled by default except on win32)
-dnl
-AC_ARG_ENABLE(xvmc,
- [ --enable-xvmc XvMC support (default disabled)],, [
- enable_xvmc="no"
-])
-AS_IF([test "${enable_xvmc}" != "no"], [
- AC_CHECK_HEADERS(X11/extensions/vldXvMC.h, [
- AS_IF([test "${enable_libmpeg2}" = "yes"], [
- VLC_ADD_PLUGIN([xvmc])
- VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXvMCW -lXv ${LIBMPEG2_LIBS}])
- VLC_ADD_CPPFLAGS([xvmc],[${X_CFLAGS} ${LIBMPEG2_CFLAGS}])
- ], [
- AC_MSG_ERROR([XVideo-MotionCompensation needs libmpeg2 which isn't available])
- ])
- ], [
- AC_MSG_ERROR([XVideo-MotionCompensation extension not found!])
- ])
-])
-
-dnl End of Xlib tests
-CPPFLAGS="${CPPFLAGS_save}"
-
dnl
dnl X C Bindings modules
dnl
AC_ARG_ENABLE(xcb,
[ --enable-xcb X11 support with XCB (default enabled)],, [
- AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
+ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [
enable_xcb="yes"
], [
enable_xcb="no"
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb])
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
+ VLC_ADD_PLUGIN([screensaver])
VLC_ADD_PLUGIN([xcb_x11])
VLC_ADD_PLUGIN([xcb_screen])
VLC_ADD_PLUGIN([xcb_apps])
VLC_ADD_PLUGIN([xdg_screensaver])
])
+AC_ARG_ENABLE(glx,
+ [ --enable-glx X11 OpenGL (GLX) support (default enabled)],, [
+ enable_glx="$enable_xcb"
+])
+AS_IF([test "${enable_glx}" != "no"], [
+ PKG_CHECK_MODULES(XLIB_XCB, [x11-xcb])
+ PKG_CHECK_MODULES(GL, [gl],, [
+ AC_CHECK_HEADER([GL/gl.h], [
+ GL_CFLAGS=""
+ GL_LIBS="-lGL"
+ ], [
+ AC_MSG_ERROR([GLX (libGL) cannot be found. If you do not need OpenGL with X11, use --disable-glx.])
+ ])
+ ])
+ VLC_ADD_PLUGIN([xcb_glx])
+])
+AC_SUBST([GL_CFLAGS])
+AC_SUBST([GL_LIBS])
+
dnl
dnl OpenGL module
AC_ARG_ENABLE(opengl,
[ --enable-opengl OpenGL support (default enabled)])
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_PLUGIN([opengl])
- if test "${SYS}" != "mingw32"; then
- VLC_ADD_LIBS([opengl],[${X_LIBS} -lGL -lGLU])
- else
- VLC_ADD_LIBS([opengl],[-lopengl32 -lglu32])
- fi
- ])
- else
+ test "${SYS}" = "darwin"; then
dnl OS X special case (no GL/gl.h but OpenGL/gl.h)
VLC_ADD_PLUGIN([opengl])
VLC_ADD_LIBS([opengl],[-Wl,-framework,OpenGL])
- fi
fi
dnl
then
SDL_PATH="${PATH}"
AC_ARG_WITH(sdl-config-path,
- [ --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)],
+ [ --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)],
[ if test "${with_sdl_config_path}" != "no"
then
SDL_PATH="${with_sdl_config_path}:${PATH}"
AC_ARG_ENABLE(fribidi,
[ --enable-fribidi fribidi support (default enabled)])
AC_ARG_ENABLE(fontconfig,
- [ --enable-fontconfig, fontconfig support (default enabled)])
+ [ --enable-fontconfig fontconfig support (default enabled)])
if test "${enable_freetype}" != "no"
then
PKG_CHECK_MODULES(FREETYPE, freetype2,[
dnl
dnl libxml2 module
dnl
-PKG_ENABLE_MODULES_VLC([libxml2], [xml], [libxml-2.0 >= 2.5], [libxml2 support],[auto])
+PKG_ENABLE_MODULES_VLC([LIBXML2], [xml], [libxml-2.0 >= 2.5], [libxml2 support],[auto])
dnl
dnl SVG module
VLC_ADD_PLUGIN([snapshot])
fi
-dnl
-dnl Qt Embedded module
-dnl (disabled by default)
-dnl
-AC_ARG_ENABLE(qte,
- [ --enable-qte QT Embedded support (default disabled)])
-if test "${enable_qte}" = "yes"
-then
- AC_ARG_WITH(qte,
- [ --with-qte=PATH Qt Embedded headers and libraries])
- if test "${with_qte}" != "no" -a -n "${with_qte}"
- then
- VLC_ADD_LIBS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte])
- VLC_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti])
- else
- 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_PLUGIN([qte])
- NEED_QTE_MAIN=yes
- CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}"
- AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
- AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
- ] )
- CPPFLAGS="${CPPFLAGS_save}"
-fi
-
dnl
dnl Roku HD1000 Video output module
dnl
])
fi
-dnl
-dnl Linux MGA module
-dnl
-AC_ARG_ENABLE(mga,
- [ --enable-mga Linux kernel Matrox support (default disabled)],
- [ if test "${enable_mga}" = "yes"
- then
- VLC_ADD_PLUGIN([mga])
- fi ])
-
dnl
dnl OMAP Framebuffer module
dnl
AC_ARG_ENABLE(directfb,
[ --enable-directfb DirectFB support (default disabled)])
AC_ARG_WITH(directfb,
- [ --with-directfb=PATH path to DirectFB headers and libraries])
+ [ --with-directfb=PATH path to DirectFB headers and libraries])
if test "${enable_directfb}" = "yes"; then
have_directfb="false"
VLC_ADD_PLUGIN([ggi])
VLC_ADD_LIBS([ggi],[-lggi])
AC_ARG_WITH(ggi,
- [ --with-ggi=PATH path to libggi],
+ [ --with-ggi=PATH path to libggi],
[ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
then
VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
dnl
dnl libcaca plugin
dnl
-PKG_ENABLE_MODULES_VLC([caca], [], [caca >= 0.99.beta1], [libcaca output],[auto])
+PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta14], [libcaca output],[auto])
dnl
dnl Audio plugins
AC_CHECK_HEADERS([soundcard.h sys/soundcard.h], [
VLC_ADD_PLUGIN([oss])
VLC_ADD_PLUGIN([access_oss])
- AC_CHECK_LIB(ossaudio,main,[VLC_ADD_LIBS([oss],[-lossaudio])])
+ AC_CHECK_LIB(ossaudio,main,[VLC_ADD_LIBS([oss],[-lossaudio])
+ VLC_ADD_LIBS([access_oss],[-lossaudio])])
])
fi
dnl
AC_ARG_ENABLE(macosx-audio,
[ --enable-macosx-audio Mac OS X audio module (default enabled on MacOS X)])
-if test "${enable_macosx-audio}" != "no" &&
- (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes")
+if test "x${enable_macosx_audio}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_audio}" = "yes")
then
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
[ VLC_ADD_PLUGIN([auhal])
[ --enable-cyberlink CyberLink for C++ UPnP stack (default disabled)])
AS_IF([test "${enable_cyberlink}" = "yes" ], [
AC_ARG_WITH(cyberlink-tree,
- [ --with-cyberlink-tree=PATH CyberLink for C++ tree for static linking])
+ [ --with-cyberlink-tree=PATH CyberLink for C++ tree for static linking])
dnl
dnl test for --with-cyberlink-tree
dnl QT 4
dnl
AC_ARG_ENABLE(qt4,
- [ --enable-qt4 QT 4 support (default enabled) ],, [
+ [ --enable-qt4 Qt 4 support (default enabled) ],, [
AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no])
])
AS_IF([test "${enable_qt4}" != "no"], [
])
AM_CONDITIONAL(ENABLE_QT4, [test "x$enable_qt4" != "xno"])
-dnl
-dnl WinCE GUI module
-dnl
-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_PLUGIN([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
dnl Simple test for skins2 dependency
dnl
AC_MSG_ERROR([The skins2 module depends on a the Qt4 development package. Without it you won't be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the Qt4 development package or alternatively you can also configure with: --disable-qt4 --disable-skins2.])
])
-dnl
-dnl Opie QT embedded module
-dnl
-AC_ARG_ENABLE(opie,
- [ --enable-opie Qt embedded interface support (default disabled)],
- [if test "${enable_opie}" = "yes"; then
- AC_ARG_WITH(qte,
- [ --with-qte=PATH Qt Embedded headers and libraries])
- if test "${with_qte}" != "no" -a -n "${with_qte}"
- then
- VLC_ADD_LIBS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte])
- VLC_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti])
- else
- VLC_ADD_LIBS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`])
- VLC_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`])
- fi
- CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}"
- AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
- AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
- ] )
- CPPFLAGS="${CPPFLAGS_save}"
-
- VLC_ADD_PLUGIN([opie])
- NEED_QTE_MAIN=yes
- VLC_ADD_LIBS([opie],[-lqpe ${LDFLAGS_qte}])
- VLC_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}])
- if test "${with_qte}" != "no" -a -n "${with_qte}"
- then
- MOC=${with_qte}/bin/moc
- else
- MOC=${QTDIR}/bin/moc
- fi
- fi])
-
dnl
dnl MacOS X video output/gui modules
dnl
AC_ARG_ENABLE(macosx,
- [ --enable-macosx MacOS X support (default enabled on MacOS X)])
+ [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)])
if test "x${enable_macosx}" = "xyes"
then
- VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation])
- VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer qtcapture],[-Wl,-framework,Cocoa])
- VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,OpenGL])
+ VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,Cocoa])
+ VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,OpenGL])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit])
- VLC_ADD_LDFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle -Wl,-framework,Sparkle])
- VLC_ADD_OBJCFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle])
+ VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle])
+ VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle])
dnl For bug report
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook])
- VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit])
- VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
- VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore])
- VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
- VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl opengllayer], [-fobjc-exceptions] )
+ VLC_ADD_OBJCFLAGS([macosx minimal_macosx], [-fobjc-exceptions] )
- VLC_ADD_PLUGIN([access_eyetv])
- VLC_ADD_PLUGIN([qtcapture])
VLC_ADD_PLUGIN([macosx])
VLC_ADD_PLUGIN([minimal_macosx])
- VLC_ADD_PLUGIN([opengllayer])
fi
dnl
-dnl QNX RTOS module
+dnl MacOS X related modules
dnl
-AC_ARG_ENABLE(qnx,
- [ --enable-qnx QNX RTOS support (default enabled on QNX RTOS)])
- if test "${enable_qnx}" != "no"
- then
- AC_CHECK_HEADERS(Ph.h, [
- VLC_ADD_PLUGIN([qnx])
- VLC_ADD_LIBS([qnx],[-lasound -lph])
- ])
- fi
+
+AC_ARG_ENABLE(macosx-vout,
+ [ --enable-macosx-vout Mac OS X video output module (default enabled on Mac OS X)])
+if test "x${enable_macosx_vout}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes")
+then
+ VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,Cocoa])
+ VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,OpenGL])
+ VLC_ADD_PLUGIN([vout_macosx])
+fi
+
+AC_ARG_ENABLE(macosx-dialog-provider,
+ [ --enable-macosx-dialog-provider Mac OS X dialog module (default enabled on Mac OS X)])
+if test "x${enable_macosx_dialog_provider}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_dialog_provider}" = "yes")
+then
+ VLC_ADD_LDFLAGS([macosx_dialog_provider],[-Wl,-framework,Cocoa])
+ VLC_ADD_PLUGIN([macosx_dialog_provider])
+fi
+
+AC_ARG_ENABLE(macosx-qtcapture,
+ [ --enable-macosx-qtcapture Mac OS X qtcapture (iSight) module (default enabled on Mac OS X)])
+if test "x${enable_macosx_qtcapture}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes")
+then
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,Cocoa])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QuartzCore])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
+ VLC_ADD_PLUGIN([qtcapture])
+fi
+
+AC_ARG_ENABLE(macosx-eyetv,
+ [ --enable-macosx-eyetv Mac OS X EyeTV (TNT Tuner) module (default enabled on Mac OS X)])
+if test "x${enable_macosx_eyetv}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_eyetv}" = "yes")
+then
+ VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation])
+ VLC_ADD_PLUGIN([access_eyetv])
+fi
+
+AC_ARG_ENABLE(macosx-vlc-app,
+ [ --enable-macosx-vlc-app build the VLC media player (default enabled on Mac OS X)])
+AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ])
+
dnl
dnl ncurses module
dnl
dnl goom visualization plugin
dnl
-PKG_ENABLE_MODULES_VLC([goom], [], [libgoom2], [goom visualization plugin], [auto])
+PKG_ENABLE_MODULES_VLC([GOOM], [], [libgoom2], [goom visualization plugin], [auto])
dnl
dnl libprojectM visualization plugin
dnl
-PKG_ENABLE_MODULES_VLC([projectm], [], [libprojectM], [projectM visualization plugin], [auto])
+PKG_ENABLE_MODULES_VLC([PROJECTM], [], [libprojectM], [projectM visualization plugin], [auto])
dnl
dnl AtmoLight (homebrew AmbiLight)
dnl libgcrypt
dnl
AC_ARG_ENABLE(libgcrypt,
- [ --disable-libgcrypt gcrypt support (default enabled)])
+ [ --disable-libgcrypt gcrypt support (default enabled)])
AS_IF([test "${enable_libgcrypt}" != "no"], [
AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
libgcrypt-config --version >/dev/null || \
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls gnutls TLS/SSL support (default enabled)])
+AS_IF([test "${have_libgcrypt}" != "yes"], [
+ AS_IF([test "${enable_gnutls}" = "yes"], [
+ AC_MSG_ERROR([--enable-gnutls and --disable-libgcrypt are mutually exclusive.])
+ ])
+ enable_gnutls="no"
+])
AS_IF([test "${enable_gnutls}" != "no"], [
PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.7.4], [
VLC_ADD_PLUGIN([gnutls])
AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism])
fi
+dnl
+dnl SQLite
+dnl
+AC_ARG_WITH(sqlite,
+ [ --with-sqlite=PATH sqlite path linking])
+if test "${SYS}" != "darwin"; then
+ PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3 >= 3.6.0], [sqlite3], [auto])
+else
+ if test "${enable_sqlite}" != "no"
+ then
+ AC_CHECK_HEADERS(sqlite3.h, [
+ VLC_ADD_PLUGIN([sqlite])
+ if test "${with_sqlite}" != "no" -a -n "${with_sqlite}"; then
+ AC_MSG_CHECKING(existence of sqlite directory in ${with_sqlite})
+ real_sqlite="`cd ${with_sqlite} 2>/dev/null && pwd`"
+ if test -z "${real_sqlite}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_sqlite}])
+ fi
+ VLC_ADD_CFLAGS([sqlite],[-I${with_sqlite}/include])
+ VLC_ADD_LIBS([sqlite], [-L${with_sqlite}/lib -lsqlite3])
+ AC_MSG_RESULT(yes)
+ else
+ VLC_ADD_LIBS([sqlite], [-lsqlite3])
+ fi
+ AC_DEFINE([SQLITE_MODULE], 1, [Define if you want to use SQLite module]) ],
+ AC_MSG_ERROR([sqlite3 is required for sqlite module]) )
+ fi
+fi
+AM_CONDITIONAL([HAVE_SQLITE], [test "${enable_sqlite}" != "no"])
+
dnl
dnl Endianness check
AS_HELP_STRING([--enable-activex],[build a vlc-based ActiveX control
(default enabled on Win32)]))
AC_ARG_WITH(wine-sdk-path,
- [ --with-wine-sdk-path=PATH path to wine sdk])
+ [ --with-wine-sdk-path=PATH path to wine sdk])
if test "${enable_activex}" != "no"
then
if test "${SYS}" = "mingw32"
AS_HELP_STRING([--enable-mozilla],[build a vlc-based Firefox/Mozilla plugin
(default disabled)]))
AC_ARG_WITH(mozilla-sdk-path,
- [ --with-mozilla-sdk-path=PATH path to mozilla sdk])
+ [ --with-mozilla-sdk-path=PATH path to mozilla sdk])
AC_ARG_WITH(mozilla-pkg,
- [ --with-mozilla-pkg=PKG look for PKG.pc to build the mozilla plugin.])
+ [ --with-mozilla-pkg=PKG look for PKG.pc to build the mozilla plugin.])
AC_LANG_PUSH(C++)
if test "${enable_mozilla}" = "yes"
then
AC_LANG_POP(C++)
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
-dnl Tests for Xsp
-AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
- VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_XSP])
- VLC_ADD_LIBS([xvmc glx],[-lXsp])
-])
-
dnl
dnl test plugins
dnl
VLC_ADD_PLUGIN([test4])
fi
-dnl
-dnl qte_main plugin
-dnl
-if test "${NEED_QTE_MAIN}" != "no"
-then
- 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}])
-fi
-
dnl
dnl Plugin and builtin checks
dnl
VLC_OUTPUT_VLC_CONFIG_IN
AC_CONFIG_FILES([
+ extras/package/win32/spad.nsi
extras/package/win32/vlc.win32.nsi
extras/package/macosx/Info.plist
extras/package/macosx/Resources/English.lproj/InfoPlist.strings
modules/access/dshow/Makefile
modules/access/dvb/Makefile
modules/access/mms/Makefile
- modules/access/cdda/Makefile
modules/access/rtp/Makefile
modules/access/rtsp/Makefile
modules/access/vcd/Makefile
modules/audio_output/Makefile
modules/codec/Makefile
modules/codec/avcodec/Makefile
- modules/codec/cmml/Makefile
modules/codec/dmo/Makefile
modules/codec/shine/Makefile
modules/codec/subtitles/Makefile
modules/codec/spudec/Makefile
modules/codec/wmafixed/Makefile
- modules/codec/xvmc/Makefile
modules/control/Makefile
modules/control/http/Makefile
modules/control/globalhotkeys/Makefile
modules/gui/macosx/Makefile
modules/gui/hildon/Makefile
modules/gui/minimal_macosx/Makefile
- modules/gui/qnx/Makefile
+ modules/gui/macosx_dialog_provider/Makefile
modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
- modules/gui/wince/Makefile
modules/meta_engine/Makefile
modules/misc/Makefile
modules/misc/dummy/Makefile
modules/misc/lua/Makefile
- modules/misc/memcpy/Makefile
modules/misc/notify/Makefile
modules/misc/testsuite/Makefile
modules/misc/playlist/Makefile
modules/services_discovery/Makefile
modules/stream_filter/Makefile
modules/stream_out/Makefile
+ modules/stream_out/transcode/Makefile
modules/video_chroma/Makefile
modules/video_filter/Makefile
modules/video_filter/dynamicoverlay/Makefile
modules/video_output/Makefile
modules/video_output/msw/Makefile
- modules/video_output/qte/Makefile
- modules/video_output/x11/Makefile
modules/visualization/Makefile
modules/visualization/visual/Makefile
+ modules/mmx/Makefile
+ modules/mmxext/Makefile
+ modules/3dnow/Makefile
+ modules/altivec/Makefile
])
dnl Generate makefiles
/bin/echo -n "Enabled modules: "
./vlc-config --list plugin
+dnl Do we have to use make or gmake ?
+USE_MAKE_OR_GMAKE=`case "${SYS}" in openbsd*) echo "gmake";; *) echo "make";; esac`
dnl Shortcut to nice compile message
rm -f compile
echo '#! /bin/sh' >compile
echo rm -f .error\$\$ >>compile
echo ERROR=0 >>compile
echo export PATH=$PATH LANG=C >>compile
-echo "(make V=1 \$@ 2>&1 || touch .error\$\$)| \\" >>compile
+echo "($USE_MAKE_OR_GMAKE V=1 \$@ 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 "plugins/bindings :${PLUGINS_BINDINGS}
You can tune the compiler flags in vlc-config.
-To build vlc and its plugins, type \`./compile' or \`make'.
+To build vlc and its plugins, type \`./compile' or \`$USE_MAKE_OR_GMAKE'.
"
if test "x$ac_ld_does_not_support_text_reloc" = "xyes"; then
echo ""
projects / vlc / blobdiff