X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=1befae90b9ba007caa11660ce3b46b70ab3095c6;hb=270e903b7165045d4c0e29c77591b7e905f9a978;hp=4a8c046ea2b9f90279f8fe02ff229839cf556f68;hpb=c89257fa93e05298f9b1e9a861f17a58d638ab60;p=vlc diff --git a/configure.ac b/configure.ac index 4a8c046ea2..1befae90b9 100644 --- a/configure.ac +++ b/configure.ac @@ -3,10 +3,12 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team]) AC_INIT(vlc, 1.2.0-git) -VERSION_MAJOR="1" -VERSION_MINOR="2" -VERSION_REVISION="0" -VERSION_EXTRA="-git" +VERSION_MAJOR=1 +VERSION_MINOR=2 +VERSION_REVISION=0 +VERSION_EXTRA=0 +VERSION_DEV=git + PKGDIR="vlc" AC_SUBST(PKGDIR) @@ -57,7 +59,11 @@ dnl Check for tools dnl AC_PROG_CC_C99 AC_USE_SYSTEM_EXTENSIONS -AC_DEFINE([_FORTIFY_SOURCE], 2, [Define to '2' to get glibc warnings.]) +AC_DEFINE([_FORTIFY_SOURCE], 2, [Define to 2 to get glibc warnings.]) +AC_DEFINE([_FILE_OFFSET_BITS], 64, [Define to 64 for large files support.]) +AC_DEFINE([_REENTRANT],, [Define to expose reentrant functions.]) +AC_DEFINE([_THREAD_SAFE],, [Same as _REENTANT for some other OSes.]) +AC_DEFINE([__LIBVLC__],, [Define within the LibVLC source code tree.]) AM_PROG_CC_C_O AC_PROG_CXX @@ -94,76 +100,80 @@ AS_IF([test -n "${with_binary_version}"],[ [Binary specific version]) ]) -dnl Check how we are asked to build -AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [ - AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.]) -]) - -AC_ARG_ENABLE(static-modules, - [AS_HELP_STRING([--enable-static-modules], - [link modules statically - VLC will not work])]) -AS_IF([test "${enable_static_modules}" = yes], [ - enable_shared="no" - enable_static="yes" - VLC_DEFAULT_PLUGIN_TYPE="builtin" - AS_IF([test "${enable_vlc}" != "no"], - [AC_MSG_WARN([Building modules as static. VLC will not work.])]) -], [ - VLC_DEFAULT_PLUGIN_TYPE="plugin" -]) - -AC_SUBST(VLC_DEFAULT_PLUGIN_TYPE) - dnl dnl Check for the contrib directory dnl AC_ARG_WITH(contrib, - [AS_HELP_STRING([--without-contrib], - [do not use the libraries in CONTRIB_DIR])]) -AC_ARG_VAR([CONTRIB_DIR], [directory containing pre-built contrib, overriding extras/contrib]) -AS_IF([test "${with_contrib}" != "no"],[ - AS_IF([test -z "$CONTRIB_DIR"], [ - topdir="`dirname $0`" - if test "`echo \"$topdir\" | cut -c 1`" != "/"; then - topdir="`pwd`/$topdir" - fi - CONTRIB_DIR="${topdir}/extras/contrib/hosts/${host}" - if ! test -d "$CONTRIB_DIR" - then - gccmachine=`$CC -dumpmachine` - CONTRIB_DIR="${topdir}/extras/contrib/hosts/${gccmachine}" - fi + [AS_HELP_STRING([--with-contrib[=DIR]], + [search for 3rd party libraries in DIR/include and DIR/lib]) +]) +AC_MSG_CHECKING([for 3rd party libraries path]) +AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [ + CONTRIB_DIR="${srcdir}/contrib/${host}" + AS_IF([test ! -d "${CONTRIB_DIR}"], [ + echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD + CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`" + AS_IF([test ! -d "${CONTRIB_DIR}"], [ + echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD + CONTRIB_DIR="${srcdir}/extras/contrib/hosts/${host}" + AS_IF([test ! -d "${CONTRIB_DIR}"], [ + echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD + CONTRIB_DIR="${srcdir}/extras/contrib/hosts/`$CC -dumpmachine`" + AS_IF([test ! -d "${CONTRIB_DIR}"], [ + echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD + CONTRIB_DIR="" + AC_MSG_RESULT([not found]) + ]) + ]) + ]) + ]) +], [ + AS_IF([test "${with_contrib}" != "no"], [ + CONTRIB_DIR="${with_contrib}" + ], [ + CONTRIB_DIR="" + AC_MSG_RESULT([disabled]) ]) - AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}]) +]) +AS_IF([test -n "${CONTRIB_DIR}"], [ AS_IF([test -d "${CONTRIB_DIR}/lib"],[ - 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" - CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include" - CFLAGS_save="${CFLAGS_save} -I${CONTRIB_DIR}/include" - CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include" - CXXFLAGS_save="${CXXFLAGS_save} -I${CONTRIB_DIR}/include" - OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include" - OBJCFLAGS_save="${OBJCFLAGS_save} -I${CONTRIB_DIR}/include" - if test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"; then - export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH" - else - export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig" - fi - LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib" - LDFLAGS_save="${LDFLAGS_save} -L${CONTRIB_DIR}/lib" - - if test "${SYS}" = "darwin"; then - export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH" - export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH" - fi - ],[ - AC_MSG_RESULT([no]) + CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd` + ], [ + echo "${CONTRIB_DIR}/lib not found" >&AS_MESSAGE_LOG_FD CONTRIB_DIR="" + AC_MSG_RESULT([not usable]) + ]) + +]) +AS_IF([test -n "${CONTRIB_DIR}"], [ + AC_MSG_RESULT([${CONTRIB_DIR}]) + export PATH=${CONTRIB_DIR}/bin:$PATH + CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include" + CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include" + CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include" + CFLAGS_save="${CFLAGS_save} -I${CONTRIB_DIR}/include" + CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include" + CXXFLAGS_save="${CXXFLAGS_save} -I${CONTRIB_DIR}/include" + OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include" + OBJCFLAGS_save="${OBJCFLAGS_save} -I${CONTRIB_DIR}/include" + AS_IF([test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"], [ + export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH" + ], [ + export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig" + ]) + LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib" + LDFLAGS_save="${LDFLAGS_save} -L${CONTRIB_DIR}/lib" + + AS_IF([test "${SYS}" = "darwin"], [ + export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH" + export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH" + ]) +], [ + AS_IF([test -n "${with_contrib}" && test "${with_contrib}" != "no"], [ + AC_MSG_ERROR([Third party libraries not found!]) ]) ]) +AC_SUBST(CONTRIB_DIR) dnl dnl Set default values @@ -310,21 +320,20 @@ case "${host_os}" in *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) + AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0501' for Windows XP APIs.]) + AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01 (and shell) APIs.]) case "${host_os}" in *wince* | *mingwce* | *mingw32ce*) SYS=mingwce dnl Sadly CeGCC still needs non-wince macros - AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows 2000 APIs.]) ;; *mingw32*) SYS=mingw32 - AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows XP APIs.]) ;; *cygwin*) dnl Check if we are using the mno-cygwin mode in which case we are dnl actually dealing with a mingw32 compiler. - AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0501' for Windows XP APIs.]) AC_EGREP_CPP(yes, [#ifdef WIN32 yes @@ -338,7 +347,7 @@ case "${host_os}" in VLC_ADD_LIBS([libvlccore],[-lws2_32 -lnetapi32 -lwinmm]) VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([win32text],[-lgdi32]) - VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-lwinmm]) + VLC_ADD_LIBS([cdda vcdx sdl_image 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 stream_out_standard stream_out_select stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32]) VLC_ADD_LIBS([filesystem], [-lshlwapi]) dnl @@ -419,6 +428,23 @@ case "${build_os}" in ;; esac +dnl Android is linux, but a bit different +AS_IF([test "$SYS" = linux],[ + AC_MSG_CHECKING([for an Android system]) + AC_PREPROC_IFELSE([AC_LANG_PROGRAM( + [[#ifndef __ANDROID__ + # error Not Android + #endif + ]],[[;]]) + ],[ + HAVE_ANDROID="1" + AC_MSG_RESULT([yes]) + ],[ + AC_MSG_RESULT([no]) + ]) +]) +AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1") + dnl dnl Libtool dnl It's very bad, but our former custom system was worst @@ -444,6 +470,10 @@ m4_defun([AC_DEPLIBS_CHECK_METHOD],[]) lt_cv_deplibs_check_method=pass_all +AS_IF([test "${enable_shared}" = "no"], [ + AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.]) +]) + dnl dnl Gettext stuff dnl @@ -562,8 +592,9 @@ dnl Check for system libs needed need_libc=false dnl Check for usual libc functions -AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale]) -AC_REPLACE_FUNCS([asprintf atof atoll dirfd getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) +AC_CHECK_DECLS([nanosleep],,,[#include ]) +AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale]) +AC_REPLACE_FUNCS([asprintf atof atoll dirfd flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) @@ -671,29 +702,13 @@ AC_CHECK_FUNC(getopt_long,, [ ]) AC_SUBST(GNUGETOPT_LIBS) -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_LIB(m,cos,[ - 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 access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo qt4],[-lm]) -]) -AC_CHECK_LIB(m,sqrt,[ - VLC_ADD_LIBS([compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm]) -]) -AC_CHECK_LIB(m,ceil,[ - VLC_ADD_LIBS([access_imem hotkeys mosaic],[-lm]) -]) -AC_CHECK_LIB(m,exp,[ - VLC_ADD_LIBS([gaussianblur],[-lm]) -]) -AC_CHECK_LIB(m,round,[ - VLC_ADD_LIBS([dbus],[-lm]) -]) -AC_CHECK_LIB(m,sqrtf,[ - VLC_ADD_LIBS([x264],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate libvlccore freetype mod mpc dmo quicktime realvideo qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264],[-lm]) + LIBM="-lm" +], [ + LIBM="" ]) -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" +AC_SUBST(LIBM) AC_CHECK_LIB(m,lrintf, [ AC_DEFINE(HAVE_LRINTF, 1, [Define to 1 if you have the lrintf function]) @@ -703,21 +718,6 @@ AC_CHECK_LIB(m,lrintf, [ dnl Check for dynamic plugins ac_cv_have_plugins=no -# HP-UX style -if test "${ac_cv_have_plugins}" = "no"; then - AC_CHECK_HEADERS(dl.h) - ac_cv_my_have_shl_load=no - AC_CHECK_FUNC(shl_load, - [ac_cv_my_have_shl_load=yes, - AC_CHECK_LIB(dld, shl_load, - [ac_cv_my_have_shl_load=yes - VLC_ADD_LIBS([libvlccore],[-ldld])])]) - if test "${ac_cv_my_have_shl_load}" = "yes"; then - AC_DEFINE(HAVE_DL_SHL_LOAD, 1, [Define if you have the shl_load API]) - ac_cv_have_plugins=yes - fi -fi - # Win32 style if test "${ac_cv_have_plugins}" = "no"; then if test "${SYS}" = "mingw32" ; then @@ -783,23 +783,19 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_LIB(rt, clock_nanosleep, [ VLC_ADD_LIBS([libvlccore],[-lrt]) - AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.]) ], [ + AC_CHECK_FUNC(nanosleep,,[ + AC_CHECK_LIB(rt,nanosleep, [ + VLC_ADD_LIBS([libvlccore],[-lrt]) + ], [ + AC_CHECK_LIB(posix4,nanosleep, [ + VLC_ADD_LIBS([libvlccore],[-lposix4]) + ]) + ]) + ]) dnl HP/UX port AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])]) ]) - - have_nanosleep=false - AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ - AC_CHECK_LIB(rt,nanosleep, - [VLC_ADD_LIBS([libvlccore],[-lrt]) have_nanosleep=:], - [AC_CHECK_LIB(posix4,nanosleep, - [VLC_ADD_LIBS([libvlccore],[-lposix4]) have_nanosleep=:])] - ) - ]) - if ${have_nanosleep}; then - AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if nanosleep is available.]) - fi fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" dnl Check for misc headers @@ -845,28 +841,6 @@ then fi ]) -dnl Mac OS X and other OSes don't have declaration for nanosleep -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - AC_MSG_CHECKING(for nanosleep in time.h) - AC_EGREP_HEADER(nanosleep,time.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DECL_NANOSLEEP, 1, - Define if defines nanosleep.) - ],[ - AC_MSG_RESULT(no) - ]) -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" - -dnl Make sure we have timespecs -AC_MSG_CHECKING(for timespec in sys/time.h) -AC_EGREP_HEADER(timespec,sys/time.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1, - Define if defines struct timespec.) -],[ - AC_MSG_RESULT(no) -]) - dnl Check for threads library if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(pthread.h) @@ -989,6 +963,9 @@ dnl RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration]) RDC_PROG_CC_FLAGS([-pipe]) +AC_LANG_PUSH([C++]) +RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var]) +AC_LANG_POP([C++]) dnl dnl Debugging mode @@ -1043,94 +1020,181 @@ AS_IF([test "${enable_coverage}" != "no"], [ CFLAGS="-fprofile-arcs -ftest-coverage ${CFLAGS}" CXXFLAGS="-fprofile-arcs -ftest-coverage ${CXXFLAGS}" LDFLAGS="-lgcov ${LDFLAGS}" - CFLAGS_save="${CFLAGS}" - CXXFLAGS_save="${CXXFLAGS}" - LDFLAGS_save="${LDFLAGS}" ]) VLC_SAVE_FLAGS +AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ + AC_CACHE_CHECK([if $CC accepts -fvisibility=hidden], + [ac_cv_c_visibility_hidden], [ + CFLAGS="${CFLAGS_save} -fvisibility=hidden" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + ac_cv_c_visibility_hidden=yes + ], [ + ac_cv_c_visibility_hidden=no + ]) + ]) + AS_IF([test "${ac_cv_c_visibility_hidden}" != "no"], [ + VLC_RESTORE_FLAGS + CFLAGS="${CFLAGS} -fvisibility=hidden" + CXXFLAGS="${CXXFLAGS} -fvisibility=hidden" + OBJCFLAGS="${OBJCFLAGS} -fvisibility=hidden" + VLC_SAVE_FLAGS + ]) +]) + + +dnl +dnl Enable/disable optimizations +dnl +AC_ARG_ENABLE(optimizations, + [AS_HELP_STRING([--disable-optimizations], + [disable compiler optimizations (default enabled)])],, + [enable_optimizations="yes"]) +AS_IF([test "${enable_optimizations}" != "no"], [ + enable_optimizations="speed" +]) + dnl Check for various optimization flags -AC_CACHE_CHECK([if \$CC accepts -O4], - [ac_cv_c_o4], - [CFLAGS="${CFLAGS_save} -O4" - AC_TRY_COMPILE([],,ac_cv_c_o4=yes, ac_cv_c_o4=no)]) -if test "${ac_cv_c_o4}" != "no" -a "x${enable_debug}" = "xno"; then - CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O4" -else - AC_CACHE_CHECK([if \$CC accepts -O3], - [ac_cv_c_o3], - [CFLAGS="${CFLAGS_save} -O3" - AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) - if test "${ac_cv_c_o3}" != "no" -a "x${enable_debug}" = "xno"; then - CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O3" - else - AC_CACHE_CHECK([if \$CC accepts -O2], - [ac_cv_c_o2], - [CFLAGS="${CFLAGS_save} -O2" - AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)]) - if test "${ac_cv_c_o2}" != "no"; then - CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O2" - else - AC_CACHE_CHECK([if \$CC accepts -O], - [ac_cv_c_o], - [CFLAGS="${CFLAGS_save} -O" - AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)]) - if test "${ac_cv_c_o}" != "no"; then - CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O" - fi - fi - fi -fi +AS_IF([test "${enable_optimizations}" != "no"], [ + + C_O="" + dnl -O4 and -O3 only in production builds + AS_IF([test "{enable_debug}" = "no"], [ + AC_CACHE_CHECK([if $CC accepts -O4], [ac_cv_c_o4], [ + CFLAGS="${CFLAGS_save} -O4" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + ac_cv_c_o4=yes + ], [ + ac_cv_c_o4=no + ]) + ]) + AS_IF([test "${ac_cv_c_o4}" != "no"], [ + C_O="-O4" + ], [ + AC_CACHE_CHECK([if $CC accepts -O3], [ac_cv_c_o3], [ + CFLAGS="${CFLAGS_save} -O3" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + ac_cv_c_o3=yes + ], [ + ac_cv_c_o3=no + ]) + ]) + AS_IF([test "${ac_cv_c_o3}" != "no"], [ + C_O="-O3" + ]) + ]) + ]) -AC_CACHE_CHECK([if \$CC accepts -O0], - [ac_cv_c_o0], - [CFLAGS="${CFLAGS_save} -O0" - AC_TRY_COMPILE([],,ac_cv_c_o0=yes, ac_cv_c_o0=no)]) -if test "${ac_cv_c_o0}" != "no"; then - CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O0" -fi + dnl -O2 and -O in both production and debug builds + AS_IF([test "x$C_O" = "x"], [ + AC_CACHE_CHECK([if \$CC accepts -O2], [ac_cv_c_o2], [ + CFLAGS="${CFLAGS_save} -O2" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + ac_cv_c_o2=yes + ], [ + ac_cv_c_o2=no + ]) + ]) + AS_IF([test "${ac_cv_c_o2}" != "no"], [ + C_O="-O2" + ], [ + AC_CACHE_CHECK([if \$CC accepts -O], [ac_cv_c_o], [ + CFLAGS="${CFLAGS_save} -O" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + ac_cv_c_o=yes + ], [ + ac_cv_c_o=no + ]) + ]) + AS_IF([test "${ac_cv_c_o}" != "no"], [ + C_O="-O" + ]) + ]) + ]) -dnl Check for -ffast-math -AC_CACHE_CHECK([if \$CC accepts -ffast-math], - [ac_cv_c_fast_math], - [CFLAGS="${CFLAGS_save} -ffast-math" - AC_TRY_COMPILE([],,ac_cv_c_fast_math=yes, ac_cv_c_fast_math=no)]) -if test "${ac_cv_c_fast_math}" != "no"; then - CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -ffast-math" -fi + VLC_RESTORE_FLAGS + CFLAGS="${CFLAGS} ${C_O}" + CXXFLAGS="${CXXFLAGS} ${C_O}" + OBJCFLAGS="${OBJCFLAGS} ${C_O}" + VLC_SAVE_FLAGS + + dnl Check for -ffast-math + AC_CACHE_CHECK([if $CC accepts -ffast-math], [ac_cv_c_fast_math], [ + CFLAGS="${CFLAGS_save} -ffast-math" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + ac_cv_c_fast_math=yes + ], [ + ac_cv_c_fast_math=no + ]) + ]) + AS_IF([test "${ac_cv_c_fast_math}" != "no"], [ + VLC_RESTORE_FLAGS + CFLAGS="${CFLAGS} -ffast-math" + CXXFLAGS="${CXXFLAGS} -ffast-math" + OBJCFLAGS="${OBJCFLAGS} -ffast-math" + VLC_SAVE_FLAGS + ]) -dnl Check for -funroll-loops -AC_CACHE_CHECK([if \$CC accepts -funroll-loops], - [ac_cv_c_unroll_loops], - [CFLAGS="${CFLAGS_save} -funroll-loops" - AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)]) -if test "${ac_cv_c_unroll_loops}" != "no"; then - CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -funroll-loops" -fi + dnl Check for -funroll-loops + AC_CACHE_CHECK([if $CC accepts -funroll-loops], [ac_cv_c_unroll_loops], [ + CFLAGS="${CFLAGS_save} -funroll-loops" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + ac_cv_c_unroll_loops=yes + ], [ + ac_cv_c_unroll_loops=no + ]) + ]) + AS_IF([test "${ac_cv_c_unroll_loops}" != "no"], [ + VLC_RESTORE_FLAGS + CFLAGS="${CFLAGS} -funroll-loops" + CXXFLAGS="${CXXFLAGS} -funroll-loops" + OBJCFLAGS="${OBJCFLAGS} -funroll-loops" + VLC_SAVE_FLAGS + ]) -dnl Check for -fomit-frame-pointer -AC_CACHE_CHECK([if \$CC accepts -fomit-frame-pointer], - [ac_cv_c_omit_frame_pointer], - [CFLAGS="${CFLAGS_save} -fomit-frame-pointer" - AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)]) -if test "${ac_cv_c_omit_frame_pointer}" != "no"; then - if test "${SYS}" != "darwin"; then - CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer" - else - dnl On darwin we explicitely disable it. - CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fno-omit-frame-pointer" - fi -fi + AS_IF([test "$enable_debug" = "no"], [ + dnl Check for -fomit-frame-pointer + AC_CACHE_CHECK([if $CC accepts -fomit-frame-pointer], + [ac_cv_c_omit_frame_pointer], [ + CFLAGS="${CFLAGS_save} -fomit-frame-pointer" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + ac_cv_c_omit_frame_pointer=yes + ], [ + ac_cv_c_omit_frame_pointer=no + ]) + ]) + AS_IF([test "${ac_cv_c_omit_frame_pointer}" != "no"], [ + VLC_RESTORE_FLAGS + AS_IF([test "${SYS}" != "darwin"], [ + CFLAGS="${CFLAGS} -fomit-frame-pointer" + CXXFLAGS="${CXXFLAGS} -fomit-frame-pointer" + ], [ + dnl On darwin we explicitely disable it. + CFLAGS="${CFLAGS} -fno-omit-frame-pointer" + CXXFLAGS="${CXXFLAGS} -fno-omit-frame-pointer" + OBJCFLAGS="${OBJCFLAGS} -fno-omit-frame-pointer" + ]) + VLC_SAVE_FLAGS + ]) + ]) +]) dnl Check for Darwin plugin linking flags -AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error], - [ac_cv_ld_darwin], - [CFLAGS="${CFLAGS_save} -bundle -undefined error" - AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)]) -if test "${ac_cv_ld_darwin}" != "no"; then +AS_IF([test "${SYS}" = "darwin"], [ + AC_CACHE_CHECK([if $CC accepts -bundle -undefined error], + [ac_cv_ld_darwin], [ + CFLAGS="${CFLAGS_save} -bundle -undefined error" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ + ac_cv_ld_darwin=yes + ], [ + ac_cv_ld_darwin=no + ]) + ]) + AS_IF([test "${ac_cv_ld_darwin}" != "no"], [ VLC_ADD_LDFLAGS([plugin],[-bundle -undefined error]) -fi + ]) +]) dnl Checks for __attribute__(aligned()) directive AC_CACHE_CHECK([__attribute__ ((aligned ())) support], @@ -1236,7 +1300,6 @@ AS_IF([test "${enable_mmx}" != "no"], [ AS_IF([test "${ac_cv_c_mmx_intrinsics}" != "no"], [ AC_DEFINE(HAVE_MMX_INTRINSICS, 1, [Define to 1 if MMX intrinsics are available.]) - MMX_CFLAGS="-mmmx" ]) AC_CACHE_CHECK([if $CC groks MMX inline assembly], @@ -1261,7 +1324,6 @@ AS_IF([test "${enable_mmx}" != "no"], [ have_mmxext="yes" ]) ]) -AC_SUBST(MMX_CFLAGS) AM_CONDITIONAL([HAVE_MMX], [test "${have_mmx}" = "yes"]) AM_CONDITIONAL([HAVE_MMXEXT], [test "${have_mmxext}" = "yes"]) @@ -1272,7 +1334,7 @@ AC_ARG_ENABLE(sse, [AS_HELP_STRING([--disable-sse], [disable SSE (1-4) optimizations (default auto)])],, [ case "${host_cpu}" in - i686|x86_64) + i?86|x86_64) enable_sse=yes ;; *) @@ -1304,7 +1366,6 @@ AS_IF([test "${enable_sse}" != "no"], [ AS_IF([test "${ac_cv_c_sse2_intrinsics}" != "no"], [ AC_DEFINE(HAVE_SSE2_INTRINSICS, 1, [Define to 1 if SSE2 intrinsics are available.]) - SSE2_CFLAGS="-msse2" ]) AC_CACHE_CHECK([if $CC groks SSE inline assembly], @@ -1377,7 +1438,6 @@ AS_IF([test "${enable_sse}" != "no"], [ AC_DEFINE(CAN_COMPILE_SSE4A, 1, [Define to 1 if SSE4A inline assembly is available.]) ]) ]) -AC_SUBST(SSE2_CFLAGS) AM_CONDITIONAL([HAVE_SSE2], [test "$have_sse2" = "yes"]) have_3dnow="no" @@ -1414,12 +1474,16 @@ asm volatile("ssat r0, #1, r0":::"r0"); /* assume ARMv6 */ ]) CFLAGS="${CFLAGS_save}" ]) - ARM_NEON_CFLAGS="$ac_cv_neon_inline" + AS_IF([test "$ac_cv_neon_inline" != "no"], [ + NEON_CFLAGS="$ac_cv_neon_inline" + AC_DEFINE([CAN_COMPILE_NEON], 1, + [Define to 1 if NEON (and ARMv6) assembly is available with NEON_CFLAGS.]) + ]) ], [ ac_cv_neon_inline="no" ]) -AC_SUBST(ARM_NEON_CFLAGS) -AM_CONDITIONAL(HAVE_ARM_NEON, [test "${ac_cv_neon_inline}" != "no"]) +AC_SUBST(NEON_CFLAGS) +AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_neon_inline}" != "no"]) AC_ARG_ENABLE(altivec, @@ -1445,8 +1509,6 @@ AS_IF([test "${enable_altivec}" = "yes"], [ 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([libvlccore],[${ac_cv_altivec_inline}]) @@ -1511,7 +1573,6 @@ dnl - Others: test should fail AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, [Define to 1 if C AltiVec extensions are available.]) 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}]) have_altivec="yes" ]) @@ -1523,7 +1584,7 @@ dnl - Others: test should fail LDFLAGS="${LDFLAGS_save}" ]) AS_IF([test "${ac_cv_ld_altivec}" != "no"], [ - VLC_ADD_LDFLAGS([libvlccore idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib]) + VLC_ADD_LDFLAGS([libvlccore memcpyaltivec],[-Wl,-framework,vecLib]) ]) ]) AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"]) @@ -1578,16 +1639,6 @@ if test "${enable_optimize_memory}" = "yes"; then AC_DEFINE(OPTIMIZE_MEMORY, 1, Define if you want to optimize memory usage over performance) fi -dnl -dnl Enable/disable optimizations -dnl -AC_ARG_ENABLE(optimizations, - [AS_HELP_STRING([--disable-optimizations], - [disable compiler optimizations (default enabled)])]) -if test "${enable_optimizations}" != "no"; then - enable_optimizations="speed" -fi - dnl dnl Allow running as root (useful for people running on embedded platforms) dnl @@ -1684,14 +1735,14 @@ dnl dnl Growl notification plugin dnl AC_ARG_ENABLE(growl, - [AS_HELP_STRING([--enable-growl], - [enable growl notifications (default disabled)])],, - [enable_growl="no"]) + [ --enable-growl growl notification plugin (default disabled)],, + [enable_growl=no]) AS_IF([test "${enable_growl}" != "no"], [ VLC_ADD_PLUGIN([growl_udp]) - AC_CHECK_HEADERS(Growl/GrowlDefines.h, [ + AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl/Growl.framework/Versions/A/Headers/GrowlDefines.h, [ VLC_ADD_PLUGIN([growl]) - VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit]) + VLC_ADD_LDFLAGS([growl], [-F${CONTRIB_DIR}/Growl -Wl,-framework,Growl,-framework,CoreFoundation]) + VLC_ADD_OBJCFLAGS([growl], [-F${CONTRIB_DIR}/Growl]) VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] ) ]) ] @@ -1713,9 +1764,6 @@ AS_IF([test "${enable_taglib}" != "no"], [ VLC_ADD_PLUGIN([taglib]) VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz]) VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) - AC_LANG_PUSH(C++) - AC_CHECK_HEADERS(taglib/mp4coverart.h) - AC_LANG_POP(C++) ], [ AC_MSG_WARN(TagLib library not found)]) ]) @@ -1783,7 +1831,7 @@ if test "${enable_live555}" != "no"; then AC_MSG_WARN([The installed liveMedia version is too old: Version 2010.05.29 or later is required to proceed. You can get an updated one from http://www.live555.com/liveMedia .]) - AS_IF([test "${enable_live555}" == "yes"], [ + AS_IF([test "${enable_live555}" = "yes"], [ AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable the plugin.]) ]) ],[ @@ -1945,7 +1993,7 @@ fi dnl dnl Blu-ray Disc Support with libbluray dnl -PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2 ], (libbluray for Blu-ray disc support ) ) +PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2 libxml-2.0 >= 2.6 ], (libbluray for Blu-ray disc support ) ) dnl dnl OpenCV wrapper and example filters @@ -2145,14 +2193,9 @@ fi dnl dnl libdvbpsi check for ts mux/demux dnl -PKG_WITH_MODULES([DVBPSI], [libdvbpsi], - VLC_ADD_PLUGIN([ts]) - VLC_ADD_LIBS([ts],[-ldvbpsi]) -if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGIN([mux_ts]) - VLC_ADD_LIBS([mux_ts],[-ldvbpsi]) -fi -) +have_dvbpsi="no" +PKG_WITH_MODULES([DVBPSI], [libdvbpsi], [have_dvbpsi="yes"]) +AM_CONDITIONAL(HAVE_DVBPSI, [test "${have_dvbpsi}" = "yes"]) dnl dnl Screen capture module @@ -2522,13 +2565,13 @@ AS_IF([test "${enable_libva}" != "no"], [ 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"], + 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 ])]) ]) VLC_RESTORE_FLAGS ],[ - AS_IF([test "${enable_libva}" == "yes"], + AS_IF([test "${enable_libva}" = "yes"], [AC_MSG_ERROR([Could not find required libva.])], [AC_MSG_WARN([libva not found ])]) ]) @@ -2555,12 +2598,12 @@ AS_IF([test "${enable_dxva2}" != "no"], [ 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"], + 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"], + AS_IF([test "${enable_dxva2}" = "yes"], [AC_MSG_ERROR([Could not find required dxva2api.h])], [AC_MSG_WARN([dxva2api.h not found])]) ]) @@ -2887,7 +2930,7 @@ PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto]) dnl dnl schroedinger decoder plugin (for dirac format video) dnl -PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.10], [dirac decoder and encoder using schroedinger], [auto]) +PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.6], [dirac decoder using schroedinger], [auto]) dnl dnl PNG decoder module @@ -2898,7 +2941,7 @@ if test "${enable_png}" != "no"; then AC_CHECK_HEADERS(png.h, [ LDFLAGS="${LDFLAGS_save} -lz" AC_CHECK_LIB(png, png_set_rows, [ - VLC_ADD_LIBS([png],[-lpng -lz]) + VLC_ADD_LIBS([png],[-lpng -lz -lm]) VLC_ADD_PLUGIN([png osdmenu osd_parser])], [],[-lz]) LDFLAGS="${LDFLAGS_save}" @@ -2972,6 +3015,11 @@ dnl libfluidsynth (MIDI synthetizer) plugin dnl PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto]) +dnl +dnl libsamplerate plugin +dnl +PKG_ENABLE_MODULES_VLC([SAMPLERATE], [], [samplerate], [Resampler with libsamplerate], [auto]) + dnl dnl Teletext Modules dnl vbi decoder plugin (using libzbvi) @@ -3109,9 +3157,10 @@ AC_ARG_ENABLE(xvideo, have_xcb="no" AS_IF([test "${enable_xcb}" != "no"], [ dnl libxcb - PKG_CHECK_MODULES(XCB, [xcb]) + PKG_CHECK_MODULES(XCB, [xcb >= 1.6]) have_xcb="yes" PKG_CHECK_MODULES(XCB_SHM, [xcb-shm]) + PKG_CHECK_MODULES(XCB_COMPOSITE, [xcb-composite]) AS_IF([test "${enable_xvideo}" != "no"], [ PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [ @@ -3177,13 +3226,13 @@ then PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [ # SDL on Darwin is heavily patched and can only run SDL_image if test "${SYS}" != "darwin"; then - VLC_ADD_PLUGIN([vout_sdl aout_sdl]) + VLC_ADD_PLUGIN([vout_sdl]) fi if test "${SYS}" != "mingw32"; then VLC_ADD_LIBS([vout_sdl],[${X_LIBS} ${X_PRE_LIBS} -lX11]) fi - VLC_ADD_CFLAGS([vout_sdl aout_sdl],[${SDL_CFLAGS}]) - VLC_ADD_LIBS([vout_sdl aout_sdl],[${SDL_LIBS}]) + VLC_ADD_CFLAGS([vout_sdl],[${SDL_CFLAGS}]) + VLC_ADD_LIBS([vout_sdl],[${SDL_LIBS}]) # SDL_image AS_IF([ test "${enable_sdl_image}" != "no"],[ @@ -3206,51 +3255,51 @@ dnl dnl freetype module dnl AC_ARG_ENABLE(freetype, - [ --enable-freetype freetype support (default enabled)]) + [ --enable-freetype freetype support (default auto)]) AC_ARG_ENABLE(fribidi, - [ --enable-fribidi fribidi support (default enabled)]) + [ --enable-fribidi fribidi support (default auto)]) AC_ARG_ENABLE(fontconfig, - [ --enable-fontconfig fontconfig support (default enabled)]) + [ --enable-fontconfig fontconfig support (default auto)]) + if test "${enable_freetype}" != "no"; then - PKG_CHECK_MODULES(FREETYPE, freetype2,[ - VLC_ADD_PLUGIN([freetype]) + PKG_CHECK_MODULES(FREETYPE, freetype2, [ have_freetype=yes + VLC_ADD_PLUGIN([freetype]) VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}]) if test "${SYS}" = "mingw32"; then VLC_ADD_LIBS([freetype],[-liconv -lz]) fi VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}]) + AC_CHECK_HEADERS(Carbon/Carbon.h, + [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) + + dnl fontconfig support if test "${SYS}" != "mingw32"; then if test "${enable_fontconfig}" != "no"; then - AC_CHECK_HEADERS(fontconfig/fontconfig.h, - [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG]) - VLC_ADD_LIBS([freetype],[-lfontconfig])]) - AC_CHECK_HEADERS(Carbon/Carbon.h, - [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) + AC_CHECK_HEADERS(fontconfig/fontconfig.h, [ + VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG]) + VLC_ADD_LIBS([freetype],[-lfontconfig]) + ],[AC_MSG_WARN([library fontconfig not found. Styles will be disabled in freetype])]) fi else VLC_ADD_LIBS([freetype],[-lgdi32]) fi dnl fribidi support - if test "${enable_fribidi}" != "no" - then + if test "${enable_fribidi}" != "no"; then PKG_CHECK_MODULES(FRIBIDI, fribidi, [ VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI]) VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}]) - ]) + ],[AC_MSG_WARN([library fribidi not found. Bidirectional support will be disabled in freetype])]) fi ],[ have_freetype=no - AS_IF([ test "${enable_freetype}" = "yes"],[ - AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2 -from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day. - ]) + AS_IF([ test "${enable_freetype}" = "yes"],[ + AC_MSG_ERROR([Freetype2 package cannot be detected. Install Freetype2 development or configure with --disable-freetype.]) ]) ]) - fi dnl @@ -3263,6 +3312,19 @@ dnl SVG module dnl PKG_ENABLE_MODULES_VLC([SVG], [], [librsvg-2.0 >= 2.9.0], [SVG rendering library],[auto]) +dnl +dnl android surface module +dnl +AC_ARG_ENABLE(android-surface, + [ --enable-android-surface Android Surface video output module (default disabled)]) +if test "${enable_android_surface}" = "yes"; then + if test "${HAVE_ANDROID}" = "1"; then + VLC_ADD_PLUGIN([android_surface]) + VLC_ADD_LDFLAGS([android_surface], [-ldl]) + fi +fi + + dnl dnl iOS vout module dnl @@ -3308,7 +3370,7 @@ then VLC_ADD_LIBS([directx],[-lgdi32]) ],[AC_MSG_ERROR([Cannot find DirectX headers!])] ) - AC_CHECK_HEADERS(GL/gl.h, + AC_CHECK_HEADERS(GL/glext.h, [ VLC_ADD_PLUGIN([glwin32]) VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32]) ]) @@ -3471,8 +3533,20 @@ AS_IF([test "${enable_pulse}" != "no"], [ PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.22], [ have_pulse="yes" ], [ - AS_IF([test "x${enable_pulse}" != "x"], [ - AC_MSG_ERROR([$PULSE_PKG_ERRORS. PulseAudio 0.9.22 or later required.]) + PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.16], [ + AS_IF([test "${no_x}" != "yes"], [ + have_pulse="yes" + PULSE_LIBS="$PULSE_LIBS ${X_LIBS} ${X_PRE_LIBS} -lX11" + ], [ + AS_IF([test "${enable_pulse}" = "yes"], [ + AC_MSG_ERROR([Xlib is required with PulseAudio pre-0.9.22 versions +(see http://www.pulseaudio.org/ticket/799 for further reference).]) + ]) + ]) + ], [ + AS_IF([test "x${enable_pulse}" != "x"], [ + AC_MSG_ERROR([$PULSE_PKG_ERRORS. PulseAudio 0.9.22 or later required.]) + ]) ]) ]) ]) @@ -3573,6 +3647,19 @@ dnl JACK modules dnl PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modules],[auto]) +dnl +dnl OpenSLES Android +dnl +AC_ARG_ENABLE(opensles, + [ --enable-opensles Android OpenSL ES audio module (default disabled)]) +if test "${HAVE_ANDROID}" = "1"; then + if test "${enable_opensles}" = "yes"; then + AC_CHECK_HEADERS(SLES/OpenSLES.h, + [ VLC_ADD_PLUGIN([opensles_android]) ], + [ AC_MSG_ERROR([cannot find OpenSLES headers])] ) + fi +fi + dnl dnl UPnP Plugin (Intel SDK) dnl @@ -3623,10 +3710,11 @@ AS_IF([test "${enable_skins2}" = "yes"], [ ], [ PKG_CHECK_MODULES([XPM], [xpm]) + PKG_CHECK_MODULES([XINERAMA], [xinerama]) PKG_CHECK_MODULES([XEXT], [xext]) VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} ${XEXT_CFLAGS} ${XPM_CFLAGS} -DX11_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) - VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} -lX11]) + VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} ${XINERAMA_LIBS} -lX11]) ]) VLC_ADD_PLUGIN([skins2]) @@ -3727,13 +3815,15 @@ dnl MacOS X video output/gui modules dnl AC_ARG_ENABLE(macosx, [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)]) -if test "x${enable_macosx}" = "xyes" +if test "x${enable_macosx}" != "xno" && +(test "${SYS}" = "darwin" || test "${enable_macosx}" = "yes") then 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,QTKit]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle]) @@ -3968,7 +4058,7 @@ dnl dnl TLS/SSL dnl AC_ARG_ENABLE(gnutls, - [ --enable-gnutls gnutls TLS/SSL support (default enabled)]) + [ --enable-gnutls GNU TLS TLS/SSL support (default enabled)]) AS_IF([test "${have_libgcrypt}" != "yes"], [ AS_IF([test "${enable_gnutls}" = "yes"], [ @@ -3977,19 +4067,19 @@ AS_IF([test "${have_libgcrypt}" != "yes"], [ enable_gnutls="no" ]) AS_IF([test "${enable_gnutls}" != "no"], [ - PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.7.4], [ + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.0.0], [ VLC_ADD_PLUGIN([gnutls]) VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS]) AS_IF([test "${SYS}" = "mingw32"], [ dnl pkg-config --libs gnutls omits these - VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL}]) + VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL} -lcrypt32]) ]) VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}]) VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}]) VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS]) ], [ AS_IF([test "${enable_gnutls}" = "yes"], [ - AC_MSG_ERROR([gnutls not present or too old (version 1.7.4 required)]) + AC_MSG_ERROR([GNU TLS not present or too old (version 2.0.0 required)]) ]) ]) ]) @@ -4088,7 +4178,7 @@ dnl dnl media library dnl AC_ARG_ENABLE(media-library, [--enable-media-library media library (default disabled)]) -if test "${enable_media_library}" == "yes"; then +if test "${enable_media_library}" = "yes"; then if test "${enable_sqlite}" != "yes"; then AC_MSG_ERROR([SQLite module is required for the media library]) else @@ -4199,10 +4289,11 @@ AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string]) AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years]) AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line]) -AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number]) -AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number]) -AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,"${VERSION_REVISION}", [version minor number]) -AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,"${VERSION_EXTRA}", [version minor number]) +AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,${VERSION_MAJOR}, [version major number]) +AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,${VERSION_MINOR}, [version minor number]) +AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,${VERSION_REVISION}, [version revision number]) +AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,${VERSION_EXTRA}, [version extra number]) +AC_DEFINE_UNQUOTED(PACKAGE_VERSION_DEV,"${VERSION_DEV}", [version development string]) AC_SUBST(COPYRIGHT_MESSAGE) AC_SUBST(VERSION_MESSAGE) AC_SUBST(VERSION_MAJOR) @@ -4213,13 +4304,6 @@ AC_SUBST(COPYRIGHT_YEARS) AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [host which ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) -dnl Win32 need s a numerical version_extra. -case $( echo ${VERSION_EXTRA}|wc -m ) in - "1") VERSION_EXTRA_RC="0";; - "2") VERSION_EXTRA_RC=$( echo ${VERSION_EXTRA}|tr "abcdefghi" "123456789") ;; - *) VERSION_EXTRA_RC="99" -esac -AC_SUBST(VERSION_EXTRA_RC) dnl dnl Handle substvars that use $(top_srcdir) dnl @@ -4320,19 +4404,19 @@ AC_CONFIG_FILES([ modules/lua/Makefile modules/meta_engine/Makefile modules/misc/Makefile - modules/misc/dummy/Makefile - modules/misc/notify/Makefile modules/misc/playlist/Makefile modules/misc/osd/Makefile modules/misc/stats/Makefile modules/media_library/Makefile modules/mux/Makefile modules/mux/mpeg/Makefile + modules/notify/Makefile modules/packetizer/Makefile modules/services_discovery/Makefile modules/stream_filter/Makefile modules/stream_out/Makefile modules/stream_out/transcode/Makefile + modules/text_renderer/Makefile modules/video_chroma/Makefile modules/video_filter/Makefile modules/video_filter/dynamicoverlay/Makefile @@ -4405,16 +4489,6 @@ echo "vlc aliases :${ALIASES}" else echo "build vlc executable : no" fi -echo "plugins/bindings :${PLUGINS_BINDINGS} - +echo " You can tune the compiler flags in vlc-config. -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 "" - echo "Warning: Due to a bug in ld, mmx/sse support has been" - echo " turned off." - echo " FFmpeg will be REALLY slow." - echo " VLC WILL NOT PERFORM AS EXPECTED." - echo "" -fi +To build vlc and its plugins, type \`./compile' or \`$USE_MAKE_OR_GMAKE'."