X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=8c4647ebfb5780c20bfb44b5de433b8906c2a193;hb=8b84eb692169ff0bed44ba1fd9f95766ad25f35f;hp=d288590c7fc4a763f15b6461b5ce27a20bd4c520;hpb=2585f1d925361c2f2fef4ed750ac201f3ac0f5e2;p=vlc diff --git a/configure.ac b/configure.ac index d288590c7f..8c4647ebfb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf settings for vlc -AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN]) +AC_COPYRIGHT([Copyright 2002-2014 VLC authors and VideoLAN]) AC_INIT(vlc, 2.2.0-git) VERSION_MAJOR=2 @@ -14,7 +14,7 @@ AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Weatherwax" -COPYRIGHT_YEARS="1996-2013" +COPYRIGHT_YEARS="1996-2014" AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) @@ -73,6 +73,7 @@ AM_PROG_AS AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files]) AC_CHECK_PROGS(DESKTOP_FILE_VALIDATE, [${DESKTOP_FILE_VALIDATE} desktop-file-validate], :) +AC_CHECK_PROGS(YASM, yasm) dnl Check for compiler properties AC_C_CONST @@ -96,6 +97,18 @@ dnl dnl Check the operating system dnl HAVE_WIN64="0" + +YASMFLAGS="" +case "${host}" in + i?86*) + YASMFLAGS="-f elf32" + ;; + x86_64*) + YASMFLAGS="-f elf64" + ;; +esac + + case "${host_os}" in "") SYS=unknown @@ -131,6 +144,7 @@ case "${host_os}" in case "${host}" in i?86*) ARCH_flag="-arch i386" + YASMFLAGS="-f macho32" ;; ppc64*) ARCH_flag="-arch ppc64" @@ -140,6 +154,7 @@ case "${host_os}" in ;; x86_64*) ARCH_flag="-arch x86_64" + YASMFLAGS="-f macho64" ;; arm*) ac_cv_c_bigendian="no" @@ -153,11 +168,9 @@ case "${host_os}" in CPPFLAGS="${CPPFLAGS} ${ARCH_flag}" OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}" LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}" - VLC_ADD_LIBS([motion rotate], [-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit]) VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x262 x264 x26410b],[-Wl,-read_only_relocs,suppress]) - VLC_ADD_CFLAGS([motion rotate],[-fconstant-cfstrings]) - VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,SystemConfiguration]) + VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices]) dnl Allow binaries created on Lion to run on earlier releases AC_EGREP_CPP(yes, @@ -188,16 +201,11 @@ case "${host_os}" in [AS_HELP_STRING([--with-macosx-version-min=VERSION], [compile for Mac OS X VERSION and above])]) if test "${with_macosx_version_min}" != "" ; then - MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min} CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}" CC="${CC} -mmacosx-version-min=${with_macosx_version_min}" CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}" OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}" LD="${LD} -mmacosx_version_min=${with_macosx_version_min}" - CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}" - CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}" - OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}" - export MACOSX_DEPLOYMENT_TARGET fi ;; *mingw32* | *cygwin* | *wince* | *mingwce*) @@ -244,10 +252,12 @@ case "${host_os}" in HAVE_WIN64="1" WINDOWS_ARCH="x64" PROGRAMFILES="PROGRAMFILES64" + YASMFLAGS="-f win64" ;; *) WINDOWS_ARCH="x86" PROGRAMFILES="PROGRAMFILES" + YASMFLAGS="-f win32" ;; esac AC_SUBST(WINDOWS_ARCH) @@ -282,6 +292,8 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian") +AC_SUBST(YASMFLAGS) + dnl dnl Sadly autoconf does not think about testing foo.exe when ask to test dnl for program foo on win32 @@ -580,7 +592,7 @@ AC_SEARCH_LIBS(connect, [socket], [ ]) ]) -AC_SEARCH_LIBS([getaddrinfo], [nsl], [ +AC_SEARCH_LIBS([inet_pton], [nsl], [ AS_IF([test "$ac_cv_search_getaddrinfo" != "none required"], [ SOCKET_LIBS="$ac_cv_search_getaddrinfo $SOCKET_LIBS" ]) @@ -604,7 +616,7 @@ AC_CHECK_FUNCS([if_nameindex if_nametoindex]) VLC_RESTORE_FLAGS AS_IF([test -n "$SOCKET_LIBS"], [ - VLC_ADD_LIBS([access_rtmp access_output_udp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls ts audioscrobbler lua remoteosd audiobargraph_a],[${SOCKET_LIBS}]) + VLC_ADD_LIBS([access_rtmp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp oldrc netsync gnutls ts remoteosd audiobargraph_a],[${SOCKET_LIBS}]) ]) AC_SUBST(SOCKET_LIBS) @@ -653,7 +665,7 @@ AC_CHECK_FUNC(getopt_long,, [ AC_SUBST(GNUGETOPT_LIBS) AC_CHECK_LIB(m,cos,[ - VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom rotate noise grain scene lua chorus_flanger freetype swscale postproc equalizer spatializer param_eq samplerate freetype mpc qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom noise grain scene chorus_flanger freetype swscale postproc equalizer spatializer param_eq samplerate freetype mpc qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm]) LIBM="-lm" ], [ LIBM="" @@ -689,7 +701,6 @@ AS_IF([test "${enable_shared}" = "no"], [ AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"]) AC_SUBST(LIBDL) -VLC_ADD_LIBS([lua],[$LIBDL]) dnl Check for thread library LIBPTHREAD="" @@ -783,7 +794,7 @@ then MINIZIP_LIBS="-lminizip -lz" ], [ VLC_ADD_CPPFLAGS([skins2], [-I\\\$(top_srcdir)/modules/access/zip/unzip]) - VLC_ADD_LIBS([skins2], [\\\$(top_builddir)/modules/access/libunzip.la]) + VLC_ADD_LIBS([skins2], [\\\$(top_builddir)/modules/libunzip.la]) have_minizip=no ]) ]) @@ -1019,24 +1030,6 @@ VLC_RESTORE_FLAGS SYMBOLIC_LDFLAGS="${ac_cv_ld_bsymbolic}" AC_SUBST(SYMBOLIC_LDFLAGS) -dnl Check for Darwin plugin linking flags -AS_IF([test "${SYS}" = "darwin"], [ - VLC_SAVE_FLAGS - CFLAGS="${CFLAGS} -bundle -undefined error" - AC_CACHE_CHECK([if $CC accepts -bundle -undefined error], - [ac_cv_ld_darwin], [ - 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]) - ]) - VLC_RESTORE_FLAGS -]) - dnl Checks for __attribute__(aligned()) directive VLC_SAVE_FLAGS CFLAGS="${CFLAGS} -Werror" @@ -1413,53 +1406,18 @@ AS_IF([test "${enable_altivec}" = "yes"], [ have_altivec="yes" ]) -dnl The AltiVec C extensions -dnl -dnl There are several possible cases: -dnl - OS X PPC, gcc 4.x: use -mpim-altivec -force_cpusubtype_ALL, don't -dnl need -dnl - OS X PPC, gcc 3.x: need -faltivec, don't need -dnl - Linux PPC, gcc 3.4, 4.x: need which requires -maltivec -dnl - Linux PPC, gcc 3.3: need and -maltivec -mabi=altivec -dnl - Linux PPC, gcc 3.x: need and -fvec -dnl - Others: test should fail VLC_SAVE_FLAGS AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], - [ac_cv_c_altivec], - [# OS X/PPC test (gcc 4.x) - CFLAGS="${CFLAGS} -mpim-altivec -force_cpusubtype_ALL" - AC_TRY_COMPILE([vector unsigned char foo;], - [vec_ld(0, (unsigned char *)0);], - [ac_cv_c_altivec="-mpim-altivec -force_cpusubtype_ALL"], - [# OS X/PPC test (gcc 3.x) - CFLAGS="${CFLAGS} -faltivec" - AC_TRY_COMPILE([vector unsigned char foo;], - [vec_ld(1 * sizeof(vector float), (unsigned char *)0);], - [ac_cv_c_altivec="-faltivec"], - dnl Below this are the Linux tests - [# Linux/PPC test (gcc 4.x) - CFLAGS="${CFLAGS} -maltivec" - AC_TRY_COMPILE([#include ], - [vec_ld(0, (unsigned char *)0);], - [ac_cv_c_altivec="-maltivec"], - [# Linux/PPC test (gcc 3.3) - CFLAGS="${CFLAGS} -maltivec -mabi=altivec" - AC_TRY_COMPILE([#include ], - [vec_ld(0, (unsigned char *)0);], - [ac_cv_c_altivec="" - ac_cv_c_altivec_abi="-maltivec -mabi=altivec"], - [# Linux/PPC test (gcc 3.3) - CFLAGS="${CFLAGS} -fvec" - AC_TRY_COMPILE([#include ], - [vec_ld(0, (unsigned char *)0);], - [ac_cv_c_altivec="-fvec"], - [ac_cv_c_altivec=no]) - ]) - ]) - ]) - ]) + [ac_cv_c_altivec], [ + CFLAGS="${CFLAGS} -maltivec" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +[#include ]], [ +[vec_ld(0, (unsigned char *)0);]])], [ + ac_cv_c_altivec="-maltivec" + ], [ + ac_cv_c_altivec="no" + ]) ]) - VLC_RESTORE_FLAGS AS_IF([test "${ac_cv_c_altivec}" != "no"], [ CPPFLAGS="${CPPFLAGS} ${ac_cv_c_altivec}" @@ -1553,10 +1511,7 @@ then ]) ]) ]) - if test "x${have_lua}" = "xyes" ; then - VLC_ADD_LIBS([lua],[$LUA_LIBS]) - VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS]) - else + if test "x${have_lua}" != "xyes" ; then AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.]) fi AC_ARG_VAR([LUAC], [LUA byte compiler]) @@ -1564,7 +1519,7 @@ then AS_IF([test "${LUAC}" = "false"], [ AC_MSG_ERROR([Could not find the LUA byte compiler.]) ]) - AS_IF([test -d ${CONTRIB_DIR} -a -f ${CONTRIB_DIR}/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|cut -d' ' -f2` != 0404], [ + AS_IF([test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}"/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|cut -d' ' -f2` != 0404], [ AC_MSG_ERROR([You need 32-bits luac when using using lua from contrib.]) ]) fi @@ -1740,7 +1695,7 @@ AS_IF([test "${enable_dvdnav}" != "no"], [ dnl dnl Blu-ray Disc Support with libbluray dnl -PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2.1], (libbluray for Blu-ray disc support ) ) +PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.3.0], (libbluray for Blu-ray disc support ) ) dnl dnl OpenCV wrapper and example filters @@ -1852,15 +1807,9 @@ then AC_MSG_RESULT(no) ]) - if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32" -o "${SYS}" = "os2" - then - VLC_ADD_PLUGIN([vcd cdda]) - fi - - if test "${SYS}" = "darwin" + if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32" -o "${SYS}" = "os2" -o "${SYS}" = "darwin" then VLC_ADD_PLUGIN([vcd cdda]) - VLC_ADD_LIBS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation]) fi if test "$enable_libcddb" != "no"; then @@ -1968,6 +1917,23 @@ then fi AM_CONDITIONAL(HAVE_AVFOUNDATION, [test "${have_avfoundation}" != "no"]) +dnl +dnl DCP plugin (using asdcplib) +dnl +AC_ARG_ENABLE(dcp, + AS_HELP_STRING([--enable-dcp],[Digital Cinema Package support using asdcplib (default auto)])) +have_asdcp="no" +AS_IF([test "x${enable_dcp}" != "no"], [ + AC_LANG_PUSH(C++) + AC_CHECK_HEADERS( [[AS@&t@_DCP.h]], + [have_asdcp="yes"], + [AS_IF( [test "x${enable_dcp}" = "yes"], + [AC_MSG_ERROR( [ ASDCP library cannot be found (needed for dcp module). Either use --enable-dcp=no or install asdcp library: http://www.cinecert.com/asdcplib/download/] )]) + ]) + AC_LANG_POP(C++) +]) +AM_CONDITIONAL(HAVE_ASDCP, [test "${have_asdcp}" != "no"]) + dnl dnl Demux plugins dnl @@ -2142,14 +2108,10 @@ then fi dnl -dnl shine fixed point mp3 encoder +dnl shine encoder plugin dnl -AC_ARG_ENABLE(shine, - [ --enable-shine shine mp3 encoding module (default disabled)]) -if test "${enable_shine}" = "yes" -then - VLC_ADD_PLUGIN([shine]) -fi +PKG_ENABLE_MODULES_VLC([SHINE], [], [shine >= 3.0.0], [MPEG Audio Layer 3 encoder], [auto], [], [], []) + dnl dnl openmax il codec plugin @@ -2423,6 +2385,7 @@ AS_IF([test "${enable_avformat}" != "no"], [ CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}" CFLAGS="${CFLAGS} ${AVFORMAT_CFLAGS}" AC_CHECK_HEADERS(libavformat/avformat.h libavformat/avio.h) + AC_CHECK_HEADERS(libavcodec/avcodec.h) AC_CHECK_HEADERS(libavutil/avutil.h) AS_IF([test "$enable_merge_ffmpeg" = "no"], [ have_avformat="no" @@ -2531,6 +2494,25 @@ if test "${enable_faad}" != "no"; then fi fi +dnl +dnl libvpx decoder plugin +dnl +AC_ARG_ENABLE(vpx, + AS_HELP_STRING([--enable-vpx],[libvpx VP8/VP9 decoder (default auto)])) +AS_IF([test "${enable_vpx}" != "no"],[ + PKG_CHECK_MODULES([VPX], [vpx] , [ + VLC_ADD_PLUGIN([vpx]) + VLC_ADD_CPPFLAGS([vpx], [${VPX_CFLAGS}]) + VLC_ADD_LIBS([vpx], [${VPX_LIBS}]) + AC_CHECK_LIB([vpx],[vpx_codec_vp9_dx], [ + VLC_ADD_CPPFLAGS([vpx], [-DENABLE_VP9_DECODER]) + ], [], [${VPX_LIBS}]) + ], [ + AS_IF([test "${enable_vpx}" = "yes"],[ + AC_MSG_ERROR([libvpx was not found]) + ])]) +]) + dnl dnl twolame encoder plugin dnl @@ -2678,7 +2660,7 @@ AM_CONDITIONAL([HAVE_SPEEXDSP], [test "$have_speexdsp" = "yes"]) dnl dnl Opus plugin dnl -PKG_ENABLE_MODULES_VLC([OPUS], [], [ogg opus], [Opus support], [auto]) +PKG_ENABLE_MODULES_VLC([OPUS], [], [ogg opus >= 1.0.3], [Opus support], [auto]) dnl dnl theora decoder plugin @@ -2711,6 +2693,17 @@ AC_CHECK_HEADERS(png.h, [ ]) ]) +dnl +dnl JPEG decoder module +dnl +AC_ARG_ENABLE(jpeg, + [ --enable-jpeg JPEG support (default enabled)]) +AS_IF([test "${enable_jpeg}" != "no"], [ +AC_CHECK_HEADERS(jpeglib.h, [ + VLC_ADD_PLUGIN([jpeg]) + ]) +]) + dnl dnl H262 encoder plugin (lib262) dnl @@ -2756,6 +2749,29 @@ AC_ARG_WITH(x262-tree, fi fi +dnl x265 encoder +AC_ARG_ENABLE(x265, + AS_HELP_STRING([--enable-x265],[H265 / HEVC encoding support with libx265 (default enabled)])) +AS_IF( [test "${enable_x265}" != "no"],[ + AC_PREPROC_IFELSE([AC_LANG_SOURCE([ +#include +#if X265_BUILD != 4 +# error Fail +#endif + ])], [ + AC_CHECK_LIB([x265],[x265_encoder_open_4], [ + VLC_ADD_PLUGIN([x265]) + VLC_ADD_LIBS([x265], [-lx265 -lstdc++ -lm -lpthread]) + ], [ + AC_MSG_ERROR([x265 library not found]) + ], [-lstdc++ -lm -lpthread]) + ], [ + AS_IF([test "${enable_x265}" = "yes"], [ + AC_MSG_ERROR([x265.h not found]) + ]) + ]) +]) + dnl dnl H264 encoder plugin (10-bit lib264) @@ -2957,38 +2973,43 @@ EXTEND_HELP_STRING([Video plugins:]) dnl dnl OpenGL dnl +PKG_CHECK_MODULES([EGL], [egl], [ + have_egl="yes" +], [ + have_egl="no" +]) +AM_CONDITIONAL([HAVE_EGL], [test "${have_egl}" = "yes"]) + PKG_CHECK_MODULES([GL], [gl], [ have_gl="yes" ], [ - AC_CHECK_HEADER([GL/gl.h], [ - have_gl="yes" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ + [#include ]], [ + [int t0 = GL_TEXTURE0;]]) + ], [ GL_CFLAGS="" - AS_IF([test "${SYS}" = "mingw32"], [ - GL_LIBS="-lopengl32" - ], [ + AS_IF([test "${SYS}" != "mingw32"], [ + have_gl="yes" GL_LIBS="-lGL" + ], [ + AC_CHECK_HEADER([GL/glew.h], [ + have_gl="yes" + ], [ + have_gl="no" + ]) + GL_LIBS="-lopengl32" ]) ], [ have_gl="no" ]) ]) +AM_CONDITIONAL([HAVE_GL], [test "${have_gl}" = "yes"]) dnl OpenGL ES 2: depends on EGL 1.1 PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [disabled]) dnl OpenGL ES 1: depends on EGL 1.0 PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [disabled]) -AC_ARG_ENABLE(egl, - [ --enable-egl OpenGL support through EGL (default disabled)],, [ - enable_egl="no" -]) -AS_IF([test "$enable_egl" != "no"], [ - PKG_CHECK_MODULES([EGL], [egl], [ - VLC_ADD_PLUGIN([gl]) - VLC_ADD_PLUGIN([egl]) - ]) -]) - dnl dnl Xlib dnl @@ -3017,49 +3038,32 @@ AC_ARG_ENABLE(glx, ]) have_xcb="no" +have_xcb_keysyms="no" have_xcb_randr="no" +have_xcb_xvideo="no" AS_IF([test "${enable_xcb}" != "no"], [ dnl libxcb PKG_CHECK_MODULES(XCB, [xcb >= 1.6]) have_xcb="yes" PKG_CHECK_MODULES(XCB_SHM, [xcb-shm]) PKG_CHECK_MODULES(XCB_COMPOSITE, [xcb-composite]) + PKG_CHECK_MODULES(XPROTO, [xproto]) 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_RANDR, [xcb-randr >= 1.3], [ - have_xcb_randr="yes" + PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [have_xcb_xvideo="yes"]) ]) - PKG_CHECK_MODULES(XPROTO, [xproto], [ - VLC_ADD_PLUGIN([xwd]) + PKG_CHECK_MODULES(XCB_RANDR, [xcb-randr >= 1.3], [have_xcb_randr="yes"]) - dnl xcb-utils - PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [ - VLC_ADD_PLUGIN([xcb_hotkeys]) - VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS]) - ], [ - AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.]) - ]) - ], [ - AC_MSG_WARN([${XPROTO_PKG_ERRORS}. Hotkeys and XWD will not work.]) - ]) - - AS_IF([test "${enable_glx}" != "no"], [ - AS_IF([test "${have_gl}" != "yes"], [ - AC_MSG_ERROR([${GL_PKG_ERRORS}. Pass --disable-glx if you do not need OpenGL X11 support.]) - ]) - VLC_ADD_PLUGIN([xcb_glx]) - VLC_ADD_PLUGIN([glx]) - VLC_ADD_PLUGIN([gl]) + dnl xcb-utils + PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [have_xcb_keysyms="yes"], [ + AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.]) ]) ]) AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"]) +AM_CONDITIONAL([HAVE_XCB_KEYSYMS], [test "${have_xcb_keysyms}" = "yes"]) AM_CONDITIONAL([HAVE_XCB_RANDR], [test "${have_xcb_randr}" = "yes"]) +AM_CONDITIONAL([HAVE_XCB_XVIDEO], [test "${have_xcb_xvideo}" = "yes"]) dnl @@ -3257,17 +3261,6 @@ if test "${enable_android_surface}" = "yes"; then fi -dnl -dnl iOS vout module -dnl -AC_ARG_ENABLE(ios-vout, - [ --enable-ios-vout iOS video output module (default disabled)]) -if test "${enable_ios_vout}" = "yes" -then - VLC_ADD_PLUGIN([vout_ios]) - VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation]) -fi - dnl dnl iOS ES2 vout module dnl @@ -3558,18 +3551,6 @@ AS_IF([test "$enable_wasapi" != "no"], [ ]) AM_CONDITIONAL([HAVE_WASAPI], [test "${have_wasapi}" = "yes"]) -dnl -dnl win32 waveOut plugin -dnl -AC_ARG_ENABLE(waveout, - [ --enable-waveout Win32 waveOut module (default enabled on Win32)]) -if test "${enable_waveout}" != "no"; then - if test "${SYS}" = "mingw32"; then - VLC_ADD_PLUGIN([waveout]) - VLC_ADD_LIBS([waveout],[-lwinmm]) - fi -fi - dnl dnl CoreAudio plugin dnl @@ -3578,9 +3559,8 @@ AC_ARG_ENABLE(macosx-audio, if test "x${enable_macosx_audio}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_audio}" = "yes") then - AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, + AC_CHECK_HEADER([CoreAudio/CoreAudio.h], [ VLC_ADD_PLUGIN([auhal]) - VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -3591,9 +3571,8 @@ AC_ARG_ENABLE(ios-audio, [ --enable-ios-audio Audio module for iOS (default disabled)]) if test "${enable_ios_audio}" = "yes" then - AC_CHECK_HEADERS(AudioUnit/AudioUnit.h, + AC_CHECK_HEADER([AudioUnit/AudioUnit.h], [ VLC_ADD_PLUGIN([audiounit_ios]) - VLC_ADD_LIBS([audiounit_ios],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices]) ], [ AC_MSG_ERROR([cannot find AudioUnit headers]) ]) fi @@ -3605,7 +3584,6 @@ AC_ARG_ENABLE(audioqueue, if test "${enable_audioqueue}" = "yes" then VLC_ADD_PLUGIN([audioqueue]) - VLC_ADD_LIBS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation]) fi dnl @@ -3678,10 +3656,9 @@ dnl chromaprint audio track fingerprinter dnl m4_pushdef([libchromaprint_version], 0.6.0) PKG_WITH_MODULES([CHROMAPRINT],[libchromaprint >= libchromaprint_version], - VLC_ADD_PLUGIN([stream_out_chromaprint fingerprinter]) + VLC_ADD_PLUGIN([stream_out_chromaprint]) VLC_ADD_CFLAGS([stream_out_chromaprint],[${CHROMAPRINT_CFLAGS}] [-I./webservices -I../stream_out]) - VLC_ADD_LIBS([stream_out_chromaprint],[${CHROMAPRINT_LIBS}]) - VLC_ADD_LIBS([fingerprinter],[-lm]), + VLC_ADD_LIBS([stream_out_chromaprint],[${CHROMAPRINT_LIBS}]), AS_IF([test "${enable_chromaprint}" = "yes"], [AC_MSG_ERROR(Library [libchromaprint >= libchromaprint_version] needed for [chromaprint] was not found)], [AC_MSG_WARN(Library [libchromaprint >= libchromaprint_version] needed for [chromaprint] was not found)] @@ -3926,9 +3903,7 @@ AS_IF([test "${enable_projectm}" != "no"], PKG_CHECK_MODULES(PROJECTM, libprojectM, [ VLC_ADD_PLUGIN([projectm]) - VLC_ADD_CXXFLAGS([projectm],[$PROJECTM_CFLAGS]) - VLC_ADD_LIBS([projectm],[$PROJECTM_LIBS]) - PKG_CHECK_MODULES(PROJECTM2, [libprojectM >= 2.0.0], + PKG_CHECK_EXISTS([libprojectM >= 2.0.0], [ AC_DEFINE([HAVE_PROJECTM2], 1, [Define to 1 if using libprojectM 2.x]) ], [ AC_MSG_WARN( [Using libprojectM version 1] ) ]) @@ -3996,7 +3971,6 @@ dnl dnl UPnP Plugin (Intel SDK) dnl PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto]) -VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}]) EXTEND_HELP_STRING([Misc options:]) @@ -4057,8 +4031,6 @@ AC_ARG_ENABLE(taglib, AS_IF([test "${enable_taglib}" != "no"], [ PKG_CHECK_MODULES(TAGLIB, taglib >= 1.6.1, [ VLC_ADD_PLUGIN([taglib]) - VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz]) - VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ], [ AC_MSG_WARN([${TAGLIB_PKG_ERRORS}.])]) ]) @@ -4214,35 +4186,23 @@ AC_CONFIG_FILES([ lib/Makefile bin/Makefile test/Makefile - modules/access/rtp/Makefile modules/access_output/Makefile modules/audio_filter/Makefile - modules/audio_mixer/Makefile - modules/audio_output/Makefile modules/control/Makefile - modules/demux/Makefile modules/gui/Makefile modules/gui/macosx/Makefile modules/gui/minimal_macosx/Makefile 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/mux/Makefile - modules/notify/Makefile modules/packetizer/Makefile - modules/services_discovery/Makefile - modules/stream_filter/Makefile modules/stream_out/Makefile modules/text_renderer/Makefile - modules/video_chroma/Makefile modules/video_filter/Makefile modules/video_output/Makefile - modules/video_splitter/Makefile modules/visualization/Makefile - modules/arm_neon/Makefile modules/hw/vdpau/Makefile ])