X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=8a29df283f5f54c1d7bd50635913f9ab1bb5dc87;hb=6d44c8cbde14df36ccd559895a553523f5cc380b;hp=64d24f4e2a261df6038ef13538ad2a6590f58461;hpb=203a2937682e6cc4e7db3d1e0327af879c2262a1;p=vlc diff --git a/configure.ac b/configure.ac index 64d24f4e2a..8a29df283f 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,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,30 +98,12 @@ 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, - [ --enable-static-modules Allow module to be linked statically. This produces a non working vlc.]) -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, - [ --without-contrib do not use the libraries in CONTRIB_DIR],[],[]) + [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"], [ @@ -238,10 +224,6 @@ case "${host_os}" in then echo "" echo "Building with Mac OS X defaults:" - with_macosx_version_min="10.5" - echo " Assuming --with-macosx-version-min=10.5" - with_macosx_sdk="/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk" - echo " Assuming --with-macosx-sdk=/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk" build_dir=`pwd` echo " Assuming --prefix=${build_dir}/vlc_install_dir" ac_default_prefix="${build_dir}/vlc_install_dir" @@ -275,16 +257,27 @@ case "${host_os}" in dnl Check for Mac OS X SDK settings dnl AC_ARG_WITH(macosx-sdk, - [ --with-macosx-sdk=DIR compile using the SDK in DIR]) + [AS_HELP_STRING([--with-macosx-sdk=DIR], + [compile using the SDK in DIR])]) if test "${with_macosx_sdk}" != "" ; then CPP="${CPP} -isysroot ${with_macosx_sdk}" CC="${CC} -isysroot ${with_macosx_sdk}" CXX="${CXX} -isysroot ${with_macosx_sdk}" OBJC="${OBJC} -isysroot ${with_macosx_sdk}" LD="${LD} -syslibroot ${with_macosx_sdk}" + else + echo " No desired SDK version given, falling back to 10.5" + CPP="${CPP} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + CC="${CC} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.5.sdk" + with_macosx_version_min="10.5" + echo " Assuming --with-macosx-version-min=10.5" fi AC_ARG_WITH(macosx-version-min, - [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above]) + [AS_HELP_STRING([--with-macosx-version-min=VERSION], + [compile for MacOS X 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}" @@ -301,21 +294,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 @@ -330,14 +322,15 @@ case "${host_os}" in 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([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap oldhttp stream_out_standard 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([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 dnl DEP and ASLR options dnl - AC_ARG_ENABLE(peflags, - [ --enable-peflags peflags use (default enabled on Windows)]) - if test "${enable_peflags}" != "no" ; then + AC_ARG_WITH(peflags, + [AS_HELP_STRING([--with-peflags], + [use peflags (default enabled on Windows)])]) + if test "${with_peflags}" != "no" ; then AC_PATH_TOOL(PEFLAGS, peflags, :) fi AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) @@ -361,7 +354,7 @@ case "${host_os}" in 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 oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2]) + VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap netsync audioscrobbler growl rtp stream_out_standard stream_out_select stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2]) VLC_ADD_LIBS([libvlccore],[-lmmtimer]) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) ac_default_prefix="`pwd`/_wince" @@ -380,17 +373,22 @@ case "${host_os}" in symbian*) SYS=symbian ;; + *os2*) + SYS=os2 + LDFLAGS_save="${LDFLAGS_save} -Zomf -Zbin-files -Zargs-wild"; LDFLAGS="${LDFLAGS_save}" + ;; *) SYS="${host_os}" ;; esac -AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") -AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"]) -AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") -AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") -AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") +AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") +AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux") +AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2") +AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") +AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") +AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian") -AM_CONDITIONAL(USE_PEFLAGS, [test "${enable_peflags}" = "yes"]) +AM_CONDITIONAL(USE_PEFLAGS, test "${with_peflags}" = "yes") dnl dnl Sadly autoconf doesn't think about testing foo.exe when ask to test @@ -404,6 +402,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 @@ -429,6 +444,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 @@ -446,14 +465,14 @@ VLC_ADD_LIBS([libvlccore],[${LTLIBICONV}]) dnl Check for broken versions of mingw-runtime compatability library AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ AC_MSG_CHECKING(for broken mingw-runtime) - AC_PREPROC_IFELSE([ + AC_PREPROC_IFELSE([AC_LANG_SOURCE([ #include <_mingw.h> #if (__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15) #ifndef __MINGW64_VERSION_MAJOR # error Attempting to use mingw-runtime with broken vsnprintf support #endif #endif - ], [ + ])], [ AC_MSG_RESULT([ok]) ], [ AC_MSG_RESULT([present]) @@ -517,13 +536,13 @@ dnl See sourceware.org bugs 5058 and 5443. dnl Ubuntu alone has 20 bug numbers for this... dnl AC_MSG_CHECKING(for buggy GNU/libc versions) -AC_PREPROC_IFELSE([ +AC_PREPROC_IFELSE([AC_LANG_SOURCE([ #include #if defined (__GLIBC__) && (__GLIBC__ == 2) \ && (__GLIBC_MINOR__ >= 5) && (__GLIBC_MINOR__ <= 7) # error GNU/libc with dcgettext killer bug! #endif -], [ +])], [ AC_MSG_RESULT([not present]) ], [ AC_MSG_RESULT([found]) @@ -547,8 +566,8 @@ 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 setenv setlocale stricmp strnicmp uselocale]) -AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) +AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday 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 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_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) @@ -557,7 +576,7 @@ AC_CHECK_FUNCS(fdatasync,, AC_FUNC_STRCOLL dnl Check for non-standard system calls -AC_CHECK_FUNCS([accept4 dup3 eventfd vmsplice sched_getaffinity]) +AC_CHECK_FUNCS([accept4 pipe2 eventfd vmsplice sched_getaffinity]) AH_BOTTOM([#include ]) @@ -661,13 +680,13 @@ 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]) + VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc 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 swscale_omap],[-lm]) + VLC_ADD_LIBS([access_imem hotkeys mosaic],[-lm]) ]) AC_CHECK_LIB(m,exp,[ VLC_ADD_LIBS([gaussianblur],[-lm]) @@ -688,21 +707,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 @@ -901,7 +905,8 @@ AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ]) dnl Manual switch for UTF-8 AC_ARG_ENABLE(non-utf8, - [ --enable-non-utf8 Legacy non-UTF-8 systems support (default disabled)],, [ + [AS_HELP_STRING([--enable-non-utf8], + [support legacy non-UTF-8 systems (default disabled)])],, [ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ enable_non_utf8="no" ]) @@ -914,7 +919,8 @@ AS_IF([test "${enable_non_utf8}" != "no"], [ dnl Check for dbus AC_ARG_ENABLE(dbus, - [ --enable-dbus Linux D-BUS message bus system (default enabled)]) + [AS_HELP_STRING([--enable-dbus], + [compile D-Bus message bus support (default enabled)])]) case "${SYS}" in linux*|*bsd*) if test "${enable_dbus}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" @@ -925,7 +931,9 @@ then VLC_ADD_LIBS([libvlccore],[$DBUS_LIBS]) VLC_ADD_CFLAGS([libvlccore],[$DBUS_CFLAGS]) dnl Check for dbus control interface - AC_ARG_ENABLE(dbus-control, [ --disable-dbus-control D-BUS control interface (default enabled)]) + AC_ARG_ENABLE(dbus-control, + [AS_HELP_STRING([--disable-dbus-control], + [D-Bus control interface (default enabled)])]) if test "${enable_dbus_control}" != "no" then VLC_ADD_PLUGIN([dbus]) @@ -961,110 +969,247 @@ AC_CACHE_CHECK([for ntohl in sys/param.h], if test "${ac_cv_c_ntohl_sys_param_h}" != "no"; then AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if defines ntohl.) fi -CFLAGS="${CFLAGS_save}" + +EXTEND_HELP_STRING([Optimization options:]) +VLC_RESTORE_FLAGS +dnl +dnl Compiler warnings +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 Check for various optimization flags -AC_CACHE_CHECK([if \$CC accepts -Os], - [ac_cv_c_os], - [CFLAGS="${CFLAGS_save} -Os" - AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)]) -if test "${ac_cv_c_os}" != "no"; then - CFLAGS_OPTIM_SIZE="${CFLAGS_OPTIM_SIZE} -Os" -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 - if test "${ac_cv_c_o3}" = "no"; then - CFLAGS_OPTIM_SIZE="${CFLAGS_OPTIM_SIZE} -O" - fi - fi -fi +dnl +dnl Debugging mode +dnl +AC_ARG_ENABLE(debug, + [AS_HELP_STRING([--enable-debug], + [build with run-time assertions and debug symbols (default disabled)])],, + [enable_debug="no"]) +AH_TEMPLATE(NDEBUG, + [Define to 1 if debug code should NOT be compiled]) +AS_IF([test "${enable_debug}" != "no"], [ + AC_CHECK_HEADERS([valgrind/valgrind.h]) + CFLAGS="${CFLAGS} -g" + CXXFLAGS="${CXXFLAGS} -g" + OBJCFLAGS="${OBJCFLAGS} -g" + LDFLAGS="${LDFLAGS} -g" +], [ + AC_DEFINE(NDEBUG) +]) -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 +dnl +dnl Profiling +dnl +AC_ARG_ENABLE(gprof, + [AS_HELP_STRING([--enable-gprof],[profile with gprof (default disabled)])],, + [enable_gprof="no"]) +AS_IF([test "${enable_gprof}" != "no"], [ + CFLAGS="${CFLAGS} -pg" + CXXFLAGS="${CXXFLAGS} -pg" + OBJCFLAGS="${OBJCFLAGS} -pg" + LDFLAGS="${LDFLAGS} -pg" +]) -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 +AC_ARG_ENABLE(cprof, + [AS_HELP_STRING([--enable-cprof],[profile with cprof (default disabled)])],, + [enable_cprof="no"]) +AS_IF([test "${enable_gprof}" != "no"], [ + CFLAGS="${CFLAGS} -finstrument-functions" + CXXFLAGS="${CXXFLAGS} -finstrument-functions" + OBJCFLAGS="${OBJCFLAGS} -finstrument-functions" + LDFLAGS="${LDFLAGS} -finstrument-functions" +]) -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 +dnl +dnl Test coverage +dnl +AC_ARG_ENABLE(coverage, + [AS_HELP_STRING([--enable-coverage], + [build for test coverage (default disabled)])],, + [enable_coverage="no"]) +AS_IF([test "${enable_coverage}" != "no"], [ + CFLAGS="-fprofile-arcs -ftest-coverage ${CFLAGS}" + CXXFLAGS="-fprofile-arcs -ftest-coverage ${CXXFLAGS}" + LDFLAGS="-lgcov ${LDFLAGS}" +]) -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 +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 "${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 +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" + ]) + ]) + ]) + + 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" + ]) + ]) + ]) + + 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_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 + ]) + + 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], @@ -1108,16 +1253,6 @@ dnl Check for backtrace() support AC_CHECK_HEADERS(execinfo.h) AC_CHECK_FUNCS(backtrace) -dnl -dnl Enable profiling -dnl -AC_ARG_ENABLE(gprof, -[ --enable-gprof gprof profiling (default disabled)]) -AC_ARG_ENABLE(cprof, -[ --enable-cprof cprof profiling (default disabled)]) -test "${enable_gprof}" != "yes" && enable_gprof="no" -test "${enable_cprof}" != "yes" && enable_cprof="no" - dnl dnl default modules dnl @@ -1127,7 +1262,7 @@ dnl dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - VLC_ADD_PLUGIN([dynamicoverlay]) + VLC_ADD_PLUGIN([dynamicoverlay access_shm]) elif test "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([access_smb dmo globalhotkeys]) VLC_ADD_LIBS([dmo],[-lole32 -luuid]) @@ -1139,13 +1274,13 @@ fi dnl dnl Accelerated modules dnl -EXTEND_HELP_STRING([Optimization options:]) dnl Check for fully working MMX intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) AC_ARG_ENABLE(mmx, -[ --disable-mmx disable MMX optimizations (default auto)],,[ + [AS_HELP_STRING([--disable-mmx], + [disable MMX optimizations (default auto)])],,[ case "${host_cpu}" in i?86|x86_64) enable_mmx="yes" @@ -1180,7 +1315,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], @@ -1205,7 +1339,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"]) @@ -1213,10 +1346,10 @@ dnl Check for fully workin SSE2 intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) AC_ARG_ENABLE(sse, -[ --disable-sse disable SSE (1, 2, 3 and 4) optimizations (default auto)], -, [ + [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 ;; *) @@ -1248,7 +1381,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], @@ -1321,7 +1453,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" @@ -1339,7 +1470,8 @@ AM_CONDITIONAL([HAVE_3DNOW], [test "$have_3dnow" = "yes"]) AC_ARG_ENABLE(neon, -[ --disable-neon disable NEON optimizations (default auto)],, [ + [AS_HELP_STRING([--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"], [ @@ -1366,7 +1498,8 @@ AM_CONDITIONAL(HAVE_ARM_NEON, [test "${ac_cv_neon_inline}" != "no"]) AC_ARG_ENABLE(altivec, -[ --disable-altivec disable AltiVec optimizations (default auto)],, [ + [AS_HELP_STRING([--disable-altivec], + [disable AltiVec optimizations (default auto)])],, [ AS_IF([test "${host_cpu}" = "powerpc"], [enable_altivec=yes], [enable_altivec=no]) ]) @@ -1387,8 +1520,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}]) @@ -1453,7 +1584,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" ]) @@ -1465,7 +1595,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"]) @@ -1474,15 +1604,17 @@ dnl dnl Special arch tuning dnl AC_ARG_WITH(tuning, -[ --with-tuning=ARCH enable special tuning for an architecture - (default Pentium 2 on IA-32 and G4 on PPC)]) + [AS_HELP_STRING([--with-tuning=ARCH], + [tune compilation for an architecture (default varies)])]) if test -n "${with_tuning}"; then if test "${with_tuning}" != "no"; then CFLAGS_TUNING="-mtune=${with_tuning}" fi else - if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then + if test "${SYS}" = "darwin" -a "${host_cpu}" = "i686"; then CFLAGS_TUNING="-march=prescott -mtune=generic" + elif test "${SYS}" = "darwin" -a "${host_cpu}" = "x86_64"; then + CFLAGS_TUNING="-march=core2 -mtune=core2" elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then CFLAGS_TUNING="-mtune=pentium2" elif test "${host_cpu}" = "x86_64"; then @@ -1498,7 +1630,7 @@ AS_IF([test "${CFLAGS_TUNING}"], CFLAGS="${CFLAGS} ${CFLAGS_TUNING}" AC_MSG_CHECKING([whether $CC accepts ${CFLAGS_TUNING}]) - AC_COMPILE_IFELSE([ ], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [tuning="yes"], [CFLAGS_TUNING=""; tuning="no" AS_IF([test "${with_tuning}"], @@ -1512,69 +1644,29 @@ dnl dnl Memory usage dnl AC_ARG_ENABLE(optimize-memory, -[ --enable-optimize-memory optimize memory usage over performance]) + [AS_HELP_STRING([--enable-optimize-memory], + [optimize memory usage over performance])]) 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, -[ --disable-optimizations disable compiler optimizations (default enabled)]) -if test "${enable_optimizations}" != "no"; then - if test "${enable_optimize_memory}" = "yes"; then - enable_optimizations="size" - else - enable_optimizations="speed" - fi -fi - -dnl -dnl Debugging mode -dnl -AC_ARG_ENABLE(debug, -[ --enable-debug debug mode (default disabled)]) -test "${enable_debug}" != "yes" && enable_debug="no" -AH_TEMPLATE(NDEBUG, - [Define to 1 if debug code should NOT be compiled]) -AS_IF([test "x${enable_debug}" = "xno"], [ - AC_DEFINE(NDEBUG) -], [ - AC_CHECK_HEADERS([valgrind/valgrind.h]) -]) - dnl dnl Allow running as root (useful for people running on embedded platforms) dnl AC_ARG_ENABLE(run-as-root, -[ --enable-run-as-root allow running VLC as root (default disabled)]) + [AS_HELP_STRING([--enable-run-as-root], + [allow running VLC as root (default disabled)])]) AS_IF([test "${enable_run_as_root}" = "yes"],[ AC_DEFINE(ALLOW_RUN_AS_ROOT, 1, [Define to 1 to allow running VLC as root (uid 0).]) ]) -dnl -dnl Test coverage -dnl -AC_ARG_ENABLE(coverage, - [ --enable-coverage build for test coverage (default disabled)],, - [enable_coverage="no"]) -AS_IF([test "${enable_coverage}" != "no"], [ - CFLAGS="-fprofile-arcs -ftest-coverage ${CFLAGS}" - CXXFLAGS="-fprofile-arcs -ftest-coverage ${CXXFLAGS}" - LDFLAGS="-lgcov ${LDFLAGS}" - dnl ugly... - CFLAGS_save="${CFLAGS}" - CXXFLAGS_save="${CXXFLAGS}" - LDFLAGS_save="${LDFLAGS}" -]) - dnl dnl Stream output dnl AC_ARG_ENABLE(sout, - [ --enable-sout Stream output modules (default enabled)]) + [AS_HELP_STRING([--disable-sout], + [disable streaming output (default enabled)])]) AS_IF([test "${enable_sout}" != "no"], [ AC_DEFINE(ENABLE_SOUT, 1, [Define to 1 for stream output support.]) ]) @@ -1582,8 +1674,8 @@ AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"]) dnl Lua modules AC_ARG_ENABLE(lua, - AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface - plugins (default enabled)])) + [AS_HELP_STRING([--disable-lua], + [disable LUA scripting support (default enabled)])]) if test "${enable_lua}" != "no" then PKG_CHECK_MODULES(LUA, lua5.1, @@ -1627,37 +1719,20 @@ dnl dnl HTTP daemon dnl AC_ARG_ENABLE(httpd, - [ --enable-httpd HTTP daemon (default enabled)]) + [AS_HELP_STRING([--disable-httpd], + [disable the built-in HTTP server (default enabled)])]) if test "${enable_httpd}" != "no" then - 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"]) -dnl -dnl libproxy support -dnl -AC_ARG_ENABLE(libproxy, - [ --enable-libproxy libproxy support (default auto)]) -AS_IF([test "${enable_libproxy}" != "no"], [ - PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, [ - AC_DEFINE(HAVE_LIBPROXY, 1, [Define if libproxy is available]) - VLC_ADD_CFLAGS([access_http],[$LIBPROXY_CFLAGS]) - VLC_ADD_LIBS([access_http],[$LIBPROXY_LIBS]) - ], [ - AS_IF([test "x${enable_libproxy}" != "x"], [ - AC_MSG_ERROR([libproxy could not be found on your system]) - ]) - ]) -]) - - dnl dnl VideoLAN manager dnl AC_ARG_ENABLE(vlm, - [ --enable-vlm VideoLAN manager (default enabled)],, + [AS_HELP_STRING([--disable-vlm], + [disable the stream manager (default enabled)])],, [enable_vlm="${enable_sout}"]) AS_IF([test "${enable_vlm}" != "no"], [ AS_IF([test "${enable_sout}" = "no"], [ @@ -1675,9 +1750,10 @@ AC_ARG_ENABLE(growl, [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] ) ]) ] @@ -1689,21 +1765,19 @@ dnl PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notification], [auto]) dnl -dnl Taglibplugin +dnl Taglib plugin dnl AC_ARG_ENABLE(taglib, - [ --disable-taglib Taglib support (default enabled) ]) - AS_IF([test "${enable_taglib}" != "no"],[ - PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5, - [ 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)]) - ]) + [AS_HELP_STRING([--disable-taglib], + [do not use TagLib (default enabled)])]) +AS_IF([test "${enable_taglib}" != "no"], [ + PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5, [ + VLC_ADD_PLUGIN([taglib]) + VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz]) + VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) + ], [ + AC_MSG_WARN(TagLib library not found)]) +]) dnl dnl Input plugins @@ -1711,13 +1785,33 @@ dnl EXTEND_HELP_STRING([Input plugins:]) +dnl +dnl libproxy support +dnl +AC_ARG_ENABLE(libproxy, + [AS_HELP_STRING([--enable-libproxy],[support libproxy (default auto)])]) +AS_IF([test "${enable_libproxy}" != "no"], [ + PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, [ + AC_DEFINE(HAVE_LIBPROXY, 1, [Define if libproxy is available]) + VLC_ADD_CFLAGS([access_http],[$LIBPROXY_CFLAGS]) + VLC_ADD_LIBS([access_http],[$LIBPROXY_LIBS]) + ], [ + AS_IF([test "x${enable_libproxy}" != "x"], [ + AC_MSG_ERROR([libproxy could not be found on your system]) + ]) + ]) +]) + +dnl dnl live555 input dnl AC_ARG_ENABLE(live555, -[ --enable-live555 live555 RTSP input plugin (default enabled)]) + [AS_HELP_STRING([--enable-live555], + [enable RTSP input through live555 (default enabled)])]) +AC_ARG_WITH(live555-tree, + [AS_HELP_STRING([--with-live555-tree=PATH], + [live555 tree for static linking])]) if test "${enable_live555}" != "no"; then - AC_ARG_WITH(live555-tree, - [ --with-live555-tree=PATH live.com tree for static linking]) dnl dnl test for --with-live555-tree @@ -1845,20 +1939,17 @@ PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto]) AC_ARG_ENABLE(linsys, - [ --enable-linsys Linux Linear Systems Ltd. SDI and HD-SDI input cards (default enabled)]) -case "${SYS}" in - linux*) -if test "${enable_linsys}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then + [AS_HELP_STRING([--enable-linsys], + [Linux Linear Systems Ltd. SDI and HD-SDI input cards (default enabled)])]) +if test "$SYS" = "linux" -a "${enable_linsys}" != "no"; then VLC_ADD_PLUGIN([linsys_hdsdi]) PKG_CHECK_MODULES(LINSYS_SDI, zvbi-0.2 >= 0.2.28, [ VLC_ADD_LIBS([linsys_sdi],[$LINSYS_SDI_LIBS]) VLC_ADD_CFLAGS([linsys_sdi],[$LINSYS_SDI_CFLAGS]) VLC_ADD_PLUGIN([linsys_sdi]) ], - [AC_MSG_WARN([Couldn't find zvbi >= 0.2.28, install libzvbi-dev ?])] + [AC_MSG_WARN([Could not find zvbi >= 0.2.28, install libzvbi-dev ?])] ) fi -;; -esac dnl dnl dvdread module: check for libdvdread @@ -1871,7 +1962,8 @@ dnl dnl libdvdnav plugin dnl AC_ARG_ENABLE(dvdnav, - [ --enable-dvdnav dvdnav input module (default enabled)]) + [AS_HELP_STRING([--disable-dvdnav], + [disable DVD navigation with libdvdnav (default auto)])]) if test "${enable_dvdnav}" != "no" then dnl prepend -ldvdcss on OS that need it @@ -1894,7 +1986,8 @@ dnl dnl Windows DirectShow access module dnl AC_ARG_ENABLE(dshow, - [ --enable-dshow Win32 DirectShow support (default enabled on Win32)]) + [AS_HELP_STRING([--disable-dshow], + [support DirectShow (default auto)])]) if test "${enable_dshow}" != "no" then if test "${SYS}" = "mingw32" @@ -1908,40 +2001,22 @@ then fi fi -dnl -dnl Windows DirectShow BDA access module -dnl -AC_ARG_ENABLE(bda, - AS_HELP_STRING([--enable-bda],[Win32 DirectShow BDA support (default - enabled on Win32)])) -if test "${enable_bda}" != "no" -then - if test "${SYS}" = "mingw32" - then - AC_CHECK_HEADERS(dshow.h, - [ VLC_ADD_PLUGIN([bda]) - VLC_ADD_CXXFLAGS([bda],[]) - VLC_ADD_LIBS([bda],[-lstrmiids -lole32 -loleaut32 -luuid]) ]) - fi -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 dnl -PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example], [opencv], (OpenCV (computer vision) filter), [off]) +PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (OpenCV (computer vision) filter), [off]) dnl dnl libsmbclient plugin dnl AC_ARG_ENABLE(smb, - [ --enable-smb smb input module (default enabled)]) + [AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])]) if test "${enable_smb}" != "no"; then AC_CHECK_HEADERS(libsmbclient.h, [ VLC_ADD_PLUGIN([access_smb]) @@ -1956,7 +2031,8 @@ dnl dnl sftp access support dnl AC_ARG_ENABLE(sftp, - [ --enable-sftp sftp input access module (default disable)]) + [AS_HELP_STRING([--enable-sftp], + [support SFTP file transfer via libssh2 (default disabled)])]) if test "${enable_sftp}" = "yes"; then AC_CHECK_HEADERS(libssh2.h, [ VLC_ADD_PLUGIN([access_sftp]) @@ -1964,122 +2040,16 @@ if test "${enable_sftp}" = "yes"; then ]) fi -dnl -dnl libdvbpsi ts demux/mux -dnl -AC_ARG_ENABLE(dvbpsi, - [ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)]) -have_dvbpsi=no -if test "${enable_dvbpsi}" != "no" -then - AC_ARG_WITH(dvbpsi, - [ --with-dvbpsi=PATH libdvbpsi headers and libraries]) - AC_ARG_WITH(dvbpsi, - [ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking]) - case "${with_dvbpsi}" in - ""|yes) - if test -z "${with_dvbpsi_tree}" - then - AC_CHECK_HEADERS(dvbpsi/dr.h, - [ VLC_ADD_PLUGIN([ts]) - if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGIN([mux_ts]) - fi - VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi]) - have_dvbpsi=yes], - [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], - [#if defined( HAVE_STDINT_H ) -# include -#elif defined( HAVE_INTTYPES_H ) -# include -#endif -#include -#include -#include -#include ]) - else - AC_MSG_CHECKING(for libdvbpsi.a in ${with_dvbpsi_tree}) - real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`" - if test -z "${real_dvbpsi_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_dvbpsi_tree}]) - fi - if test -f "${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" - then - dnl Use a custom libdvbpsi - AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a) - VLC_ADD_PLUGIN([ts]) - if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGIN([mux_ts]) - fi - VLC_ADD_CPPFLAGS([mux_ts ts dvb],[-I${real_dvbpsi_tree}/src]) - VLC_ADD_LIBS([mux_ts ts dvb],[${real_dvbpsi_tree}/src/.libs/libdvbpsi.a]) - have_dvbpsi=yes - else - dnl The given libdvbpsi wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a, make sure you compiled libdvbpsi in ${with_dvbpsi_tree}]) - fi - fi - ;; - no) - dnl Compile without dvbpsi - ;; - *) - AC_MSG_CHECKING(for dvbpsi headers in ${with_dvbpsi}) - if test -z "${with_dvbpsi}" - then - LDFLAGS_test="" - CPPFLAGS_test="" - else - LDFLAGS_test="-L${with_dvbpsi}/lib" - CPPFLAGS_test="-I${with_dvbpsi}/include" - fi - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" - AC_CHECK_HEADERS([dvbpsi/dr.h],[ - VLC_ADD_PLUGIN([ts]) - if test "${enable_sout}" != "no"; then - 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]) - have_dvbpsi=yes - ],[ - 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.6]) - fi - ], - [#if defined( HAVE_STDINT_H ) -# include -#elif defined( HAVE_INTTYPES_H ) -# include -#endif -#include -#include -#include -#include ]) - CPPFLAGS="${CPPFLAGS_save}" - ;; - esac - AC_CHECK_LIB(dvbpsi, dvbpsi_GenSDTSections, [ - AC_DEFINE(HAVE_DVBPSI_SDT, 1, [Define if you have dvbpsi_GenSDTSections.]) - ], [], [${LIBS_ts}]) - -fi - dnl dnl Video4Linux2 plugin dnl AC_ARG_ENABLE(v4l2, - [ --enable-v4l2 Video4Linux2 input support (default enabled)]) + [AS_HELP_STRING([--disable-v4l2], + [do not support Video4Linux version 2 (default auto)])]) +AC_ARG_WITH(v4l2, + [AS_HELP_STRING([--with-v4l2=PATH], [path to a V4L2-enabled kernel tree])]) if test "${enable_v4l2}" != "no" then - AC_ARG_WITH(v4l2, - [ --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]) @@ -2095,8 +2065,9 @@ fi dnl dnl libv4l2 support for video4linux. dnl -AC_ARG_ENABLE( libv4l2, - [ --enable-libv4l2 Libv4l2 Video4Linux2 support (default enabled)]) +AC_ARG_ENABLE(libv4l2, + [AS_HELP_STRING([--enable-libv4l2], + [use V4L2 through libv4l2 (default auto)])]) if test "${enable_libv4l2}" != "no" -a "${enable_v4l2}" != "no" then PKG_CHECK_MODULES( LIBV4L2, libv4l2, [ @@ -2111,44 +2082,24 @@ dnl dnl special access module for Hauppauge PVR cards dnl AC_ARG_ENABLE(pvr, - [ --enable-pvr PVR cards access module (default disabled)]) + [AS_HELP_STRING([--enable-pvr], + [support PVR V4L2 cards (default disabled)])]) if test "${enable_pvr}" = "yes" then VLC_ADD_PLUGIN([pvr]) - AC_ARG_WITH(videodev2, - [ --with-videodev2=FILE Location of videodev2.h file (default /usr/include/linux/videodev2.h)],[],[]) - if test "${with_videodev2}" != "no" -a -n "${with_videodev2}" - then - AC_DEFINE_UNQUOTED(VIDEODEV2_H_FILE, "${with_videodev2}", [Location of videodev2.h]) - fi - - AC_CACHE_CHECK([for new linux/videodev2.h], - [ac_cv_new_linux_videodev2_h], - [AC_TRY_COMPILE([ - #include - # ifdef VIDEODEV2_H_FILE - # include VIDEODEV2_H_FILE - # else - # include - # endif - ], - [struct v4l2_ext_controls ctrls; ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG; ], - ac_cv_new_linux_videodev2_h=yes, - ac_cv_new_linux_videodev2_h=no)]) - if test "${ac_cv_new_linux_videodev2_h}" != "no"; then - AC_DEFINE(HAVE_NEW_LINUX_VIDEODEV2_H, 1, [Define if new linux/videodev2.h present]) - fi fi dnl dnl special access module for Blackmagic SDI cards dnl AC_ARG_ENABLE(decklink, - [ --enable-decklink Blackmagic DeckLink SDI access module (default enabled)]) + [AS_HELP_STRING([--disable-decklink], + [disable Blackmagic DeckLink SDI input (default auto)])]) +AC_ARG_WITH(decklink_sdk, + [AS_HELP_STRING[--with-decklink-sdk=DIR], + [location of Blackmagic DeckLink SDI SDK])]) if test "${enable_decklink}" != "no" then - AC_ARG_WITH(decklink_sdk, - [ --with-decklink-sdk=DIR Location of Blackmagic DeckLink SDI SDK],[],[]) if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}" then VLC_ADD_CPPFLAGS([decklink],[-I${with_decklink_sdk}/include]) @@ -2172,8 +2123,8 @@ dnl dnl VCDX modules dnl AC_ARG_ENABLE(vcdx, - [ --enable-vcdx VCD with navigation via libvcdinfo (default disabled)]) - + [AS_HELP_STRING([--enable-vcdx], + [navigate VCD with libvcdinfo (default disabled)])]) if test "${enable_vcdx}" = "yes" then PKG_CHECK_MODULES(LIBCDIO, [libcdio >= 0.78.2 libiso9660 >= 0.72], @@ -2191,10 +2142,12 @@ dnl dnl Built-in CD-DA and VCD module dnl AC_ARG_ENABLE(vcd, - [ --enable-vcd built-in VCD and CD-DA (default enabled)]) + [AS_HELP_STRING([--disable-vcd], + [disable built-in VCD and CD-DA support (default enabled)])]) AC_ARG_ENABLE(libcddb, - [ --enable-libcddb CDDB support for libcdio audio CD (default enabled)]) + [AS_HELP_STRING([--disable-libcddb], + [disable CDDB for Audio CD (default enabled)])]) if test "${enable_vcd}" != "no" then @@ -2249,35 +2202,18 @@ then fi dnl -dnl DVB-S/DVB-T/DVB-C satellite/teresterial/cable input using v4l2 +dnl libdvbpsi check for ts mux/demux dnl -AC_ARG_ENABLE(dvb, - [ --enable-dvb DVB-S/T/C card support (default enabled)]) - -if test "${enable_dvb}" != "no" -then - AS_IF([test "${have_dvbpsi}" = "yes" ],[ - AC_ARG_WITH(dvb, - [ --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 - CPPFLAGS="${CPPFLAGS_save} -I${with_dvb}/include" - AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [ - VLC_ADD_PLUGIN([dvb]) - ],[AC_MSG_WARN(linux-dvb headers not found, dvb disabled)]) - CPPFLAGS="${CPPFLAGS_save}" - ],[ - AC_MSG_WARN([the dvb access module requires libdvbpsi]) - ]) -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 dnl AC_ARG_ENABLE(screen, - [ --enable-screen Screen capture support (default enabled)]) + [AS_HELP_STRING([--enable-screen], + [disable screen capture (default enabled)])]) if test "${enable_screen}" != "no"; then if test "${SYS}" = "darwin"; then AC_CHECK_HEADERS(OpenGL/gl.h, [ @@ -2295,7 +2231,7 @@ if test "${enable_screen}" != "no"; then fi dnl -dnl ipv6 plugin +dnl ipv6 support dnl have_ipv6=no AC_CHECK_FUNCS(inet_pton,[have_ipv6=yes],[ @@ -2314,7 +2250,8 @@ dnl dnl GME demux plugin dnl AC_ARG_ENABLE(gme, - [ --enable-gme Game Music Emu support (default auto)]) + [AS_HELP_STRING([--enable-gme], + [use Game Music Emu (default auto)])]) AS_IF([test "${enable_gme}" != "no"], [ AC_CHECK_HEADER([gme/gme.h], [ VLC_ADD_LIBS([gme], [-lgme]) @@ -2330,7 +2267,27 @@ AS_IF([test "${enable_gme}" != "no"], [ dnl dnl SIDPlay plugin dnl -PKG_ENABLE_MODULES_VLC([SID], [], [libsidplay2], [C64 sid demux support], [auto], [], [-lresid-builder]) +PKG_WITH_MODULES([SID], [libsidplay2], + AC_LANG_PUSH(C++) + oldCPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $SID_CFLAGS" + AC_CHECK_HEADER([sidplay/builders/resid.h], [ + VLC_ADD_PLUGIN([sid]) + VLC_ADD_CFLAGS([sid], [$SID_CFLAGS]) + VLC_ADD_LIBS([sid], [$SID_LIBS] [-lresid-builder]) + ], [ + AS_IF([test "x${enable_sid}" = "xyes"], + [AC_MSG_ERROR(Library libresid-builder needed for sid was not found)], + [AC_MSG_WARN(Library libresid-builder needed for sid was not found)] + ) + ]) + CPPFLAGS="$oldCPPFLAGS" + AC_LANG_POP(C++), + AS_IF([test "x${enable_sid}" = "xyes"], + [AC_MSG_ERROR(Library libsidplay2 needed for sid was not found)], + [AC_MSG_WARN(Library libsidplay2 needed for sid was not found)] + ), + [C64 sid demux support], [auto]) dnl @@ -2350,7 +2307,8 @@ dnl dnl matroska demux plugin dnl AC_ARG_ENABLE(mkv, - [ --enable-mkv Matroska demux support (default enabled)]) + [AS_HELP_STRING([--disable-mkv], + [do not use libmatroska (default auto)])]) if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then AC_LANG_PUSH(C++) AC_CHECK_HEADERS(ebml/EbmlVersion.h, [ @@ -2381,14 +2339,14 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then AC_CHECK_LIB(ebml_pic, main, [ VLC_ADD_PLUGIN([mkv]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic]) - ], + ],[ AC_CHECK_LIB(ebml, main, [ VLC_ADD_PLUGIN([mkv]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml]) ]) - ) - ], - [AC_MSG_RESULT([no]) + ]) + ], [ + AC_MSG_RESULT([no]) AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.]) ]) ]) @@ -2404,7 +2362,8 @@ dnl dnl modplug demux plugin dnl AC_ARG_ENABLE(mod, - [ --enable-mod Mod demux support (default auto)]) + [AS_HELP_STRING([--disable-mod], + [do not use libmodplug (default auto)])]) if test "${enable_mod}" != "no" ; then PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.4 libmodplug != 0.8.8], [ VLC_ADD_PLUGIN([mod]) @@ -2421,7 +2380,7 @@ dnl dnl mpc demux plugin dnl AC_ARG_ENABLE(mpc, - [ --enable-mpc Mpc demux support (default enabled)]) + [AS_HELP_STRING([--disable-mpc], [do not use libmpcdec (default auto)])]) if test "${enable_mpc}" != "no" then AC_CHECK_HEADERS([mpc/mpcdec.h], [ @@ -2473,9 +2432,9 @@ dnl dnl CrystalHD codec plugin dnl AC_ARG_ENABLE(crystalhd, - [ --enable-crystalhd crystalhd codec plugin (default disabled)]) -if test "${enable_crystalhd}" == "yes"; then - AC_CHECK_HEADERS(libcrystalhd/libcrystalhd_if.h, [ + [ --enable-crystalhd crystalhd codec plugin (default auto)]) +if test "${enable_crystalhd}" != "no"; then + AC_CHECK_HEADER(libcrystalhd/libcrystalhd_if.h, [ VLC_ADD_PLUGIN([crystalhd]) VLC_ADD_LIBS([crystalhd], [-lcrystalhd]) ],[ @@ -2486,10 +2445,16 @@ if test "${enable_crystalhd}" == "yes"; then VLC_ADD_LIBS([crystalhd], [-lbcmDIL]) ]) ],[ - AC_MSG_ERROR("Could not find CrystalHD development headers") + AS_IF([test x"${enable_crystalhd}" = "xyes"], + [AC_MSG_ERROR("Could not find CrystalHD development headers")], + [AC_MSG_WARN("Could not find CrystalHD development headers")]) + ],[#define __LINUX_USER__ + #include ]) fi - ]) + ],[ + #include + ]) fi dnl @@ -2575,8 +2540,8 @@ AS_IF([test "${enable_avcodec}" != "no"], [ VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" - AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h) - AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h) + AC_CHECK_HEADERS(libavcodec/avcodec.h) + AC_CHECK_HEADERS(libavutil/avutil.h) VLC_ADD_PLUGIN([avcodec]) VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ @@ -2692,8 +2657,8 @@ then VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}" CFLAGS="${CFLAGS} ${AVFORMAT_CFLAGS}" - AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h libavformat/avio.h) - AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h) + AC_CHECK_HEADERS(libavformat/avformat.h libavformat/avio.h) + AC_CHECK_HEADERS(libavutil/avutil.h) AS_IF([test "$enable_merge_ffmpeg" = "no"], [ VLC_ADD_PLUGIN([avformat access_avio]) VLC_ADD_LIBS([avformat access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS]) @@ -2725,7 +2690,7 @@ then VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${SWSCALE_CFLAGS}" CFLAGS="${CFLAGS} ${SWSCALE_CFLAGS}" - AC_CHECK_HEADERS(libswscale/swscale.h ffmpeg/swscale.h) + AC_CHECK_HEADERS(libswscale/swscale.h) VLC_ADD_PLUGIN([swscale]) VLC_ADD_LIBS([swscale],[$SWSCALE_LIBS]) VLC_ADD_CFLAGS([swscale],[$SWSCALE_CFLAGS]) @@ -2848,18 +2813,6 @@ if test "${enable_realrtsp}" = "yes"; then VLC_ADD_PLUGIN([access_realrtsp]) fi -dnl -dnl skins2 module -dnl -AC_ARG_ENABLE(libtar, - [ --enable-libtar libtar support for skins2 (default enabled)]) - -AS_IF([test "${enable_libtar}" != "no"],[ - AC_CHECK_HEADERS(libtar.h, [ - VLC_ADD_LIBS([skins2],[-ltar]) - ] ) -]) - dnl dnl A52/AC3 decoder plugin dnl @@ -2988,7 +2941,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 @@ -3115,7 +3068,7 @@ dnl AC_ARG_ENABLE(libass, [ --enable-libass Subtitle support using libass (default enabled)]) AS_IF( [test "${enable_libass}" != "no"], [ - PKG_CHECK_MODULES(LIBASS, libass >= 0.9.6, + PKG_CHECK_MODULES(LIBASS, libass >= 0.9.8, [ VLC_ADD_LIBS([libass],[$LIBASS_LIBS]) VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS]) @@ -3207,22 +3160,17 @@ AC_ARG_ENABLE(xvideo, enable_xvideo="$enable_xcb" ]) -need_xid_provider="no" 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], [ VLC_ADD_PLUGIN([xcb_xv]) - ], [ - PKG_CHECK_MODULES(XCB_XV, [xcb-xv], [ - VLC_ADD_PLUGIN([xcb_xv]) - VLC_ADD_CFLAGS([xcb_xv], [-DXCB_XV_OLD]) - ]) ]) ]) @@ -3236,24 +3184,13 @@ AS_IF([test "${enable_xcb}" != "no"], [ dnl xcb-utils PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [ - have_xcb_keysyms="yes" - ], [ - PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms], [ - have_xcb_keysyms="yes" - VLC_ADD_CFLAGS([globalhotkeys], [-DXCB_KEYSYM_OLD_API]) - ], [ - have_xcb_keysyms="no" - need_xid_provider="yes" - AC_MSG_WARN([libxcb-keysyms not found. Hotkeys will not be supported.]) - ]) - ]) - - AS_IF([test "${have_xcb_keysyms}" = "yes"], [ PKG_CHECK_MODULES(XPROTO, [xproto]) VLC_ADD_PLUGIN([globalhotkeys]) VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}]) VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}]) VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS]) + ], [ + AC_MSG_WARN([libxcb-keysyms (0.3.4 or later) not found. Hotkeys will not work.]) ]) ]) AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"]) @@ -3274,20 +3211,14 @@ AS_IF([test "${enable_glx}" != "no"], [ ]) VLC_ADD_PLUGIN([xcb_glx]) ]) -AC_SUBST([GL_CFLAGS]) -AC_SUBST([GL_LIBS]) dnl -dnl EGL +dnl OpenGL dnl -AC_ARG_ENABLE(egl, - [ --enable-egl EGL support (default disabled)],, [ - enable_egl="no" -]) -AS_IF([test "${enable_egl}" != "no"], [ - PKG_CHECK_MODULES(EGL, [egl]) - VLC_ADD_PLUGIN([egl]) -]) +PKG_ENABLE_MODULES_VLC([GL], [], [gl], [OpenGL support], [auto]) +PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [auto]) +PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [auto]) +PKG_ENABLE_MODULES_VLC([EGL], [], [egl], [EGL support], [auto]) dnl dnl SDL module @@ -3330,48 +3261,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)]) -if test "${enable_freetype}" != "no" -then - PKG_CHECK_MODULES(FREETYPE, freetype2,[ - VLC_ADD_PLUGIN([freetype]) + [ --enable-fontconfig fontconfig support (default auto)]) + +if test "${enable_freetype}" != "no"; then + 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}]) - 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(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_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 + dnl fribidi support + 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 @@ -3384,16 +3318,6 @@ dnl SVG module dnl PKG_ENABLE_MODULES_VLC([SVG], [], [librsvg-2.0 >= 2.9.0], [SVG rendering library],[auto]) -dnl -dnl Snapshot vout module (with cache) -dnl -AC_ARG_ENABLE(snapshot, - [ --enable-snapshot snapshot module (default disabled)]) -if test "${enable_snapshot}" = "yes" -then - VLC_ADD_PLUGIN([snapshot]) -fi - dnl dnl iOS vout module dnl @@ -3489,14 +3413,10 @@ fi dnl dnl Linux framebuffer module dnl -AC_ARG_ENABLE(fb, - [ --enable-fb Linux framebuffer support (default enabled on Linux)]) - if test "${enable_fb}" != "no" - then - AC_CHECK_HEADERS(linux/fb.h, [ - VLC_ADD_PLUGIN([fb]) - ]) - fi +AC_CHECK_HEADER([linux/fb.h], [ + VLC_ADD_PLUGIN([fb]) +]) + dnl dnl DirectFB module @@ -3595,49 +3515,74 @@ dnl EXTEND_HELP_STRING([Audio plugins:]) -dnl -dnl OSS /dev/dsp module (enabled by default except on win32) -dnl -AC_ARG_ENABLE(oss, - [ --enable-oss Open Sound System OSS support (default enabled)]) - -if test "${enable_oss}" != "no" && - (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || - test "${enable_oss}" = "yes") -then - AC_CHECK_HEADERS([soundcard.h sys/soundcard.h], [ - VLC_ADD_PLUGIN([oss access_oss]) - AC_CHECK_LIB(ossaudio,main,[VLC_ADD_LIBS([oss access_oss],[-lossaudio])]) - ]) -fi - dnl dnl Pulseaudio module dnl -PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.22], [PulseAudio support], [auto]) - -dnl -dnl Portaudio module -dnl -PKG_ENABLE_MODULES_VLC([PORTAUDIO], [], [portaudio-2.0], [Portaudio library support], [auto]) +AC_ARG_ENABLE(pulse, + [AS_HELP_STRING([--enable-pulse], + [use the PulseAudio client library (default auto)])]) +have_pulse="no" +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.]) + ]) + ]) +]) +AM_CONDITIONAL([HAVE_PULSE], [test "${have_pulse}" = "yes"]) dnl dnl ALSA module dnl AC_ARG_ENABLE(alsa, - [ --enable-alsa Advanced Linux Sound Architecture (default auto)]) + [AS_HELP_STRING([--enable-alsa], + [support the Advanced Linux Sound Architecture (default auto)])],, [ + AS_IF([test "$SYS" = "linux" -a "${have_pulse}" = "no"], [ + enable_alsa="yes" + ]) +]) have_alsa="no" AS_IF([test "${enable_alsa}" != "no"], [ - PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.0], [ + PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16], [ have_alsa="yes" ], [ AS_IF([test "x${enable_alsa}" != "x"], [ - AC_MSG_ERROR([alsa-lib not found]) + AC_MSG_ERROR([$ALSA_PKG_ERRORS. alsa-lib 1.0.16 or later required.]) ]) ]) ]) AM_CONDITIONAL([HAVE_ALSA], [test "${have_alsa}" = "yes"]) +dnl +dnl Open Sound System module +dnl +AC_ARG_ENABLE(oss, + [AS_HELP_STRING([--enable-oss], + [support the Open Sound System OSS (default enabled on BSD)])],, [ + AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "mingwce" -o "$SYS" = "linux"], [ + enable_oss="no" + ]) +]) +have_oss="no" +OSS_LIBS="" +AS_IF([test "$enable_oss" != "no"], [ + AC_CHECK_HEADERS([soundcard.h sys/soundcard.h], [ + have_oss="yes" + AC_CHECK_LIB(ossaudio, main, [ + OSS_LIBS="-lossaudio" + ]) + ]) +]) +AC_SUBST(OSS_LIBS) +AM_CONDITIONAL([HAVE_OSS], [test "${have_oss}" = "yes"]) + +dnl +dnl Portaudio module +dnl +PKG_ENABLE_MODULES_VLC([PORTAUDIO], [], [portaudio-2.0], [Portaudio library support], [auto]) + dnl dnl win32 waveOut plugin dnl @@ -3678,22 +3623,6 @@ then VLC_ADD_LDFLAGS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation]) fi -dnl -dnl Roku HD1000 audio -dnl -AC_ARG_ENABLE(hd1000a, - [ --enable-hd1000a HD1000 audio module (default enabled on HD1000)]) -if test "${enable_hd1000a}" != "no" -a "${CXX}" != "" && - (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || - test "${enable_hd1000a}" = "yes") -then - AC_LANG_PUSH([C++]) - AC_CHECK_HEADERS(deschutes/libraries/hdmachinex225/PCMAudioPlayer.h, [ - VLC_ADD_PLUGIN([hd1000a]) - AC_CHECK_LIB(HDMachineX225,main,VLC_ADD_LIBS([hd1000a],[-lHDMachineX225])) ]) - AC_LANG_POP([C++]) -fi - dnl dnl JACK modules dnl @@ -3702,8 +3631,8 @@ PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modul dnl dnl UPnP Plugin (Intel SDK) dnl -PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto]) -VLC_ADD_CXXFLAGS([upnp_intel],[${UPNP_CFLAGS}]) +PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPnp SDK],[auto]) +VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}]) dnl dnl Interface plugins @@ -3714,50 +3643,52 @@ EXTEND_HELP_STRING([Interface plugins:]) dnl dnl Skins2 module dnl +AC_ARG_ENABLE(libtar, + [ --enable-libtar libtar support for skins2 (default auto)]) +AS_IF([test "${enable_libtar}" != "no"], [ + AC_CHECK_HEADERS(libtar.h, [ + VLC_ADD_LIBS([skins2],[-ltar]) + ]) +]) + AC_ARG_ENABLE(skins2, [AS_HELP_STRING([--enable-skins2],[Skins2 interface module (default - enabled except on MacOSX and WinCE)])]) -if test "${enable_skins2}" != "no" || - (test "${SYS}" != "darwin" && - test "${SYS}" != "mingwce" && test "${enable_skins2}" == "yes"); then - - dnl test for the required libraries - skins2_missing_lib="no" - + enabled except on MacOSX and WinCE)])],, [ + AS_IF([test "${SYS}" != "darwin" && test "${SYS}" != "mingwce"], [ + enable_skins2="yes" + ], [ + enable_skins2="no" + ]) +]) +AS_IF([test "${enable_skins2}" = "yes"], [ dnl freetype - if test "${have_freetype}" != "yes"; then - skins2_missing_lib="yes" - if test "${enable_skins2}" = "yes"; then - AC_MSG_ERROR([Could not find freetype (required for skins2)]) - fi - fi + AS_IF([test "${have_freetype}" != "yes"], [ + AC_MSG_ERROR([Could not find FreeType (required for skins2)]) + ]) - if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32"); then - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" + AS_IF([test "${SYS}" = "mingw32"], [ VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32 -luser32]) - else if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "darwin"); then - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" + ], [test "${SYS}" = "darwin"], [ VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LDFLAGS([skins2],[-Wl,-framework,Carbon]) - else if test "${skins2_missing_lib}" = "no"; then - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" - VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS]) + ], [ + 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} -lXext -lXpm -lX11]) - need_xid_provider="no" - fi fi fi -fi -AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" || - (test "${SYS}" != "darwin" && - test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")]) + VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} ${XINERAMA_LIBS} -lX11]) + + ]) + VLC_ADD_PLUGIN([skins2]) + ALIASES="${ALIASES} svlc" +]) +AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) dnl dnl Hildon UI @@ -3776,7 +3707,6 @@ AS_IF([test "${enable_hildon}" = "yes"], [ VLC_ADD_LIBS([hildon],[${HILDON_LIBS} ${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_PLUGIN([hildon]) ALIASES="${ALIASES} mvlc" - need_xid_provider="no" ], [ AS_IF([test "${enable_hildon}" = "yes"],[ AC_MSG_ERROR([Hildon libraries not found]) @@ -3805,15 +3735,14 @@ AS_IF([test "${enable_qt4}" != "no"], [ AC_MSG_CHECKING([whether Qt uses X11]) CPPFLAGS="${CPPFLAGS} ${QT4_CFLAGS}" - AC_PREPROC_IFELSE([ + AC_PREPROC_IFELSE([AC_LANG_SOURCE([ #include #if !defined (Q_WS_X11) # error Fail #endif - ], [ + ])], [ AC_MSG_RESULT([yes]) VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11]) - need_xid_provider="no" VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}]) ], [ AC_MSG_RESULT([no]) @@ -3861,9 +3790,12 @@ then 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]) + VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit -Wl,-framework,BGHUDAppKit]) + VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit]) dnl For bug report VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit]) @@ -3922,7 +3854,6 @@ AC_ARG_ENABLE(macosx-vlc-app, 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 @@ -3980,13 +3911,6 @@ then ]) fi -dnl -dnl Post-interface configuration checks -dnl -AS_IF([test "$need_xid_provider" = "yes"], [ - AC_MSG_ERROR([X11 video outputs need a window provider (Qt4, Skins2, Hildon or xcb-utils), but none were found. Please install xcb-keysyms.]) -]) - dnl dnl Visualisation plugin dnl @@ -4101,7 +4025,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"], [ @@ -4110,22 +4034,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}]) ]) - dnl The GnuTLS plugin invokes gcry_control directly. - AS_IF([test "${have_libgcrypt}" = "yes"],[ - VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}]) - VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}]) - ]) + 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)]) ]) ]) ]) @@ -4134,24 +4055,22 @@ AS_IF([test "${enable_gnutls}" != "no"], [ dnl dnl RemoteOSD plugin (VNC client as video filter) dnl -AC_ARG_ENABLE(remoteosd, - [ --disable-remoteosd RemoteOSD plugin (default enabled)]) - -AS_IF([test "${enable_remoteosd}" != "no"], [ - AS_IF([test "${have_libgcrypt}" = "yes"],[ - VLC_ADD_PLUGIN([remoteosd]) - VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS}) - VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS}) - ], [ - AC_MSG_ERROR([libgcrypt support required for RemoteOSD plugin]) - ]) +AC_MSG_CHECKING([whether to enable the RemoteOSD plugin]) +AS_IF([test "${have_libgcrypt}" = "yes"],[ + AC_MSG_RESULT(yes) + VLC_ADD_PLUGIN([remoteosd]) + VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS}) + VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS}) +], [ + AC_MSG_RESULT(no) + AC_MSG_WARN([libgcrypt support required for RemoteOSD plugin]) ]) dnl dnl RAOP plugin dnl -AC_MSG_CHECKING([whether to enable RAOP plugin]) +AC_MSG_CHECKING([whether to enable the RAOP plugin]) AS_IF([test "${have_libgcrypt}" = "yes"], [ AC_MSG_RESULT(yes) VLC_ADD_PLUGIN([stream_out_raop]) @@ -4226,20 +4145,16 @@ 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 - if test "${enable_media_library}" == "yes"; then - AC_MSG_ERROR([SQLite module is required for the media library]) - else - AC_MSG_WARN([SQLite module is required for the media library]) - fi + AC_MSG_ERROR([SQLite module is required for the media library]) else AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library]) VLC_ADD_CPPFLAGS([qt4],"-DMEDIA_LIBRARY") VLC_ADD_PLUGIN([media_library]) fi fi -AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" != "no"]) +AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" = "yes"]) dnl dnl Endianness check @@ -4422,9 +4337,7 @@ AC_CONFIG_FILES([ test/Makefile modules/access/Makefile modules/access/bd/Makefile - modules/access/bda/Makefile modules/access/dshow/Makefile - modules/access/dvb/Makefile modules/access/mms/Makefile modules/access/rtp/Makefile modules/access/rtsp/Makefile @@ -4434,10 +4347,6 @@ AC_CONFIG_FILES([ modules/access/zip/Makefile modules/access_output/Makefile modules/audio_filter/Makefile - modules/audio_filter/channel_mixer/Makefile - modules/audio_filter/converter/Makefile - modules/audio_filter/resampler/Makefile - modules/audio_filter/spatializer/Makefile modules/audio_mixer/Makefile modules/audio_output/Makefile modules/codec/Makefile @@ -4448,7 +4357,6 @@ AC_CONFIG_FILES([ modules/codec/spudec/Makefile modules/codec/wmafixed/Makefile modules/control/Makefile - modules/control/http/Makefile modules/control/dbus/Makefile modules/control/globalhotkeys/Makefile modules/demux/Makefile @@ -4466,10 +4374,10 @@ AC_CONFIG_FILES([ modules/gui/macosx_dialog_provider/Makefile modules/gui/qt4/Makefile modules/gui/skins2/Makefile + modules/lua/Makefile modules/meta_engine/Makefile modules/misc/Makefile modules/misc/dummy/Makefile - modules/misc/lua/Makefile modules/misc/notify/Makefile modules/misc/playlist/Makefile modules/misc/osd/Makefile @@ -4547,10 +4455,7 @@ version : ${VERSION} system : ${SYS} architecture : ${ARCH} build flavour : " -test "${enable_debug}" = "yes" && printf "debug " -test "${enable_cprof}" = "yes" && printf "cprof " -test "${enable_gprof}" = "yes" && printf "gprof " -test "${enable_optimizations}" = "yes" && printf "optim " +test "${enable_optimizations}" != "no" && printf ${enable_optimizations} echo "" if test "${enable_vlc}" != "no"; then echo "vlc aliases :${ALIASES}"