X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=5f426078e324ce10d127c2e6f3955090dceedb68;hb=c8d812a3393bd3c84feea0b50c608be2d4f95135;hp=02331dde2603620b305f717e4849634f304879fb;hpb=55f8f754788a0ad228f53ea40706710b517e5f2a;p=vlc diff --git a/configure.ac b/configure.ac index 02331dde26..5f426078e3 100644 --- a/configure.ac +++ b/configure.ac @@ -2,12 +2,12 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN]) -AC_INIT(vlc, 2.1.0-git) +AC_INIT(vlc, 2.1.0-pre1) VERSION_MAJOR=2 VERSION_MINOR=1 VERSION_REVISION=0 VERSION_EXTRA=0 -VERSION_DEV=git +VERSION_DEV=pre1 PKGDIR="vlc" AC_SUBST(PKGDIR) @@ -158,7 +158,7 @@ case "${host_os}" in VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit]) VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress]) VLC_ADD_CFLAGS([motion rotate],[-fconstant-cfstrings]) - VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation]) + VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,SystemConfiguration]) dnl Allow binaries created on Lion to run on earlier releases AC_EGREP_CPP(yes, @@ -204,11 +204,7 @@ case "${host_os}" in *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) - AC_PATH_PROGS(GENDEF,[${GENDEF} gendef], [false]) - AS_IF([test "${GENDEF}" = "false"], [ - AC_MSG_ERROR([Could not find gendef.]) - ]) - AH_TOP([#if defined(WIN32) && !defined(_WIN32_WINNT)]) + AH_TOP([#if defined(_WIN32) && !defined(_WIN32_WINNT)]) AH_TOP([# define _WIN32_WINNT 0x0502 /* Windows XP SP2 */]) AH_TOP([#endif]) AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.]) @@ -223,7 +219,7 @@ case "${host_os}" in dnl Check if we are using the mno-cygwin mode in which case we are dnl actually dealing with a mingw32 compiler. AC_EGREP_CPP(yes, - [#ifdef WIN32 + [#ifdef _WIN32 yes #endif], SYS=mingw32, AC_MSG_ERROR([VLC requires -mno-cygwin])) @@ -231,6 +227,9 @@ case "${host_os}" in esac if test "${SYS}" = "mingw32"; then + # DEP, ASLR, NO SEH + LDFLAGS="${LDFLAGS} -Wl,--nxcompat -Wl,--no-seh -Wl,--dynamicbase" + VLC_ADD_LIBS([libvlccore],[-lwinmm]) VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([win32text],[-lgdi32]) @@ -414,7 +413,7 @@ AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [ dnl dnl Gettext stuff dnl -AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT_VERSION([0.18.2]) AM_GNU_GETTEXT([external], [need-ngettext]) dnl @@ -475,10 +474,9 @@ AC_ARG_ENABLE(winstore_app, AS_HELP_STRING([--enable-winstore-app], [Build targetted for Windows Store apps (default disabled)])) -AS_IF([test "${SYS}" = "mingw32"], [ - AS_IF([test "${enable_winstore_app}" == "yes"], [ - AC_DEFINE(WINAPI_FAMILY_APP, 1, [Define if you want to build for Windows Store apps])]) - ]) +vlc_winstore_app=0 +AS_IF([test "${SYS}" = "mingw32" -a "${enable_winstore_app}" = "yes"], [vlc_winstore_app=1]) +AC_DEFINE_UNQUOTED(VLC_WINSTORE_APP, ${vlc_winstore_app}, [Define to 1 if you want to build for Windows Store apps]) dnl @@ -566,7 +564,7 @@ AC_CHECK_TYPES([struct pollfd],,, [#include #if HAVE_POLL # include -#elif defined (WIN32) +#elif defined (_WIN32) # include #endif ]) @@ -592,9 +590,13 @@ AC_SEARCH_LIBS([getaddrinfo], [nsl], [ LIBS="${LIBS} ${SOCKET_LIBS}" AC_LINK_IFELSE([ - AC_LANG_PROGRAM([#ifdef WIN32 + AC_LANG_PROGRAM([#ifdef _WIN32 + # if _WIN32_WINNT < 0x600 + # error Needs vista+ + # endif #include #else + #include #include #endif], [ char dst[[sizeof(struct in_addr)]]; @@ -614,7 +616,7 @@ AC_CACHE_CHECK([for socklen_t in sys/socket.h], dnl ` (fix VIM syntax highlight ac_cv_type_socklen_t, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ [#include -#ifdef WIN32 +#ifdef _WIN32 # include # include #else @@ -631,7 +633,7 @@ AH_TEMPLATE(ss_family, [Define to `sa_family' if does not define. AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage, [AC_TRY_COMPILE( [#include - #if defined( WIN32 ) + #if defined( _WIN32 ) # include #else # include @@ -653,7 +655,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 panoramix rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm]) LIBM="-lm" ], [ LIBM="" @@ -1507,28 +1509,35 @@ AC_ARG_ENABLE(lua, [disable LUA scripting support (default enabled)])]) if test "${enable_lua}" != "no" then - PKG_CHECK_MODULES(LUA, lua5.1, + PKG_CHECK_MODULES(LUA, lua5.2, [ have_lua=yes ], [ - AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead]) - PKG_CHECK_MODULES(LUA, lua >= 5.1, + AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead]) + + PKG_CHECK_MODULES(LUA, lua5.1, [ have_lua=yes ], [ - AC_MSG_WARN([${LUA_PKG_ERRORS}, trying manual detection instead]) - have_lua=yes - AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], - [], - [ have_lua=no ] ) - AC_CHECK_LIB( lua5.1 , luaL_newstate, - [LUA_LIBS="-llua5.1"], - AC_CHECK_LIB( lua51 , luaL_newstate, - [LUA_LIBS="-llua51"], - AC_CHECK_LIB( lua , luaL_newstate, - [LUA_LIBS="-llua"], - [ have_lua=no - ], [-lm]) - ) - ) + AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead]) + PKG_CHECK_MODULES(LUA, lua >= 5.1, + [ have_lua=yes ], + [ + AC_MSG_WARN([${LUA_PKG_ERRORS}, trying manual detection instead]) + have_lua=yes + AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], + [], + [ have_lua=no ] ) + AC_CHECK_LIB( lua5.2 , luaL_newstate, + [LUA_LIBS="-llua5.2"], + AC_CHECK_LIB( lua5.1 , luaL_newstate, + [LUA_LIBS="-llua5.1"], + AC_CHECK_LIB( lua51 , luaL_newstate, + [LUA_LIBS="-llua51"], + AC_CHECK_LIB( lua , luaL_newstate, + [LUA_LIBS="-llua"], + [ have_lua=no + ], [-lm]) + ))) + ]) ]) ]) if test "x${have_lua}" = "xyes" ; then @@ -1584,23 +1593,6 @@ 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 -n "${enable_libproxy}"], [ - AC_MSG_ERROR([${LIBPROXY_PKG_ERRORS}.]) - ]) - ]) -]) - dnl dnl live555 input dnl @@ -1609,74 +1601,83 @@ AC_ARG_ENABLE(live555, [enable RTSP input through live555 (default enabled)])]) AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [ - AC_LANG_PUSH(C++) - VLC_SAVE_FLAGS - - dnl detect include paths - AS_IF([test -f "${CONTRIB_DIR}/include/UsageEnvironment.hh"], [ - CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment" + PKG_CHECK_MODULES(LIVE555, live555, [ + VLC_ADD_PLUGIN([live555]) + VLC_ADD_CXXFLAGS([live555], [$LIVE555_CFLAGS]) + VLC_ADD_LIBS([live555],[$LIVE555_LIBS]) ], [ - AS_IF([test ${SYS} != "os2"], [ - LIVE555_PREFIX=${LIVE555_PREFIX-"/usr"} - CPPFLAGS_live555="-I${LIVE555_PREFIX}/include/liveMedia -I${LIVE555_PREFIX}/include/groupsock -I${LIVE555_PREFIX}/include/BasicUsageEnvironment -I${LIVE555_PREFIX}/include/UsageEnvironment" + AC_MSG_WARN([${LIVE555_PKG_ERRORS}.]) + + AC_LANG_PUSH(C++) + VLC_SAVE_FLAGS + + dnl detect include paths + AS_IF([test -f "${CONTRIB_DIR}/include/UsageEnvironment.hh"], [ + CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment" ], [ - LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"} - CPPFLAGS_live555="-I${LIVE555_PREFIX}/liveMedia/include -I${LIVE555_PREFIX}/groupsock/include -I${LIVE555_PREFIX}/BasicUsageEnvironment/include -I${LIVE555_PREFIX}/UsageEnvironment/include" - LDFLAGS_live555="-L${LIVE555_PREFIX}/liveMedia -L${LIVE555_PREFIX}/groupsock -L${LIVE555_PREFIX}/BasicUsageEnvironment -L${LIVE555_PREFIX}/UsageEnvironment" + AS_IF([test "${SYS}" != "os2"], [ + LIVE555_PREFIX=${LIVE555_PREFIX-"/usr"} + CPPFLAGS_live555="-I${LIVE555_PREFIX}/include/liveMedia -I${LIVE555_PREFIX}/include/groupsock -I${LIVE555_PREFIX}/include/BasicUsageEnvironment -I${LIVE555_PREFIX}/include/UsageEnvironment" + ], [ + LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"} + CPPFLAGS_live555="-I${LIVE555_PREFIX}/liveMedia/include -I${LIVE555_PREFIX}/groupsock/include -I${LIVE555_PREFIX}/BasicUsageEnvironment/include -I${LIVE555_PREFIX}/UsageEnvironment/include" + LDFLAGS_live555="-L${LIVE555_PREFIX}/liveMedia -L${LIVE555_PREFIX}/groupsock -L${LIVE555_PREFIX}/BasicUsageEnvironment -L${LIVE555_PREFIX}/UsageEnvironment" + ]) ]) - ]) - dnl CPP Flags - AS_IF([test "${SYS}" = "solaris"], [ - CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS" - ]) - CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}" - LDFLAGS="${LDFLAGS} ${LDFLAGS_live555}" + dnl CPP Flags + AS_IF([test "${SYS}" = "solaris"], [ + CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS" + ]) + CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}" + LDFLAGS="${LDFLAGS} ${LDFLAGS_live555}" - dnl version check - AC_CACHE_CHECK([for live555 version 1324598400 or later], [ac_cv_live555], [ - AC_PREPROC_IFELSE([AC_LANG_PROGRAM([ + dnl version check + AC_CACHE_CHECK([for live555 version 1324598400 or later], [ac_cv_live555], [ + AC_PREPROC_IFELSE([AC_LANG_PROGRAM([ [#include #if !defined (LIVEMEDIA_LIBRARY_VERSION_INT) || (LIVEMEDIA_LIBRARY_VERSION_INT < 1324598400) # error BOOM #endif]]) - ], [ - ac_cv_live555="yes" - ], [ - ac_cv_live555="no" + ], [ + ac_cv_live555="yes" + ], [ + ac_cv_live555="no" + ]) ]) - ]) - AS_IF([test "$ac_cv_live555" = "no"], [ - AC_MSG_WARN([liveMedia is missing or its installed version is too old: + AS_IF([test "$ac_cv_live555" = "no"], [ + AC_MSG_WARN([live555 is missing or its installed version is too old: Version 2011.12.23 or later is required to proceed. You can get an updated one from http://www.live555.com/liveMedia .]) - AS_IF([test -n "${enable_live555}"], [ - AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.]) - ]) - ], [ - other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" - other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" - AS_IF([test "${SYS}" = "mingw32"], [ - # add ws2_32 for closesocket, select, recv - other_libs="$other_libs -lws2_32" - ]) + AS_IF([test -n "${enable_live555}"], [ + AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.]) + ]) + ], [ + other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" + other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" + AS_IF([test "${SYS}" = "mingw32"], [ + # add ws2_32 for closesocket, select, recv + other_libs="$other_libs -lws2_32" + ]) - dnl We need to check for pic because live555 don't provide shared libs - dnl and we want to build a plugins so we need -fPIC on some arch. - VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}]) - VLC_ADD_LDFLAGS([live555], [${LDFLAGS_live555}]) - AC_CHECK_LIB(liveMedia_pic, main, [ - VLC_ADD_PLUGIN([live555]) - VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}]) - ],[ - AC_CHECK_LIB(liveMedia, main, [ + dnl We need to check for pic because live555 don't provide shared libs + dnl and we want to build a plugins so we need -fPIC on some arch. + VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}]) + VLC_ADD_LDFLAGS([live555], [${LDFLAGS_live555}]) + AC_CHECK_LIB(liveMedia_pic, main, [ VLC_ADD_PLUGIN([live555]) - VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}]) - ],[],[${other_libs}])],[${other_libs_pic}]) + VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}]) + ],[ + AC_CHECK_LIB(liveMedia, main, [ + VLC_ADD_PLUGIN([live555]) + VLC_ADD_LIBS([live555], [-lliveMedia ${other_libs}]) + ],[],[${other_libs}]) + ],[${other_libs_pic}]) + ]) + VLC_RESTORE_FLAGS + AC_LANG_POP(C++) ]) - VLC_RESTORE_FLAGS - AC_LANG_POP(C++) ]) dnl @@ -1892,19 +1893,22 @@ AC_ARG_ENABLE(screen, [disable screen capture (default enabled)])]) if test "${enable_screen}" != "no"; then if test "${SYS}" = "darwin"; then - AC_CHECK_HEADERS(OpenGL/gl.h, [ - AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ - VLC_ADD_PLUGIN([screen]) - ]) + AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ + VLC_ADD_PLUGIN([screen]) ]) fi fi +AM_CONDITIONAL(HAVE_MAC_SCREEN, [test "${SYS}" = "darwin" -a "x${enable_screen}" != "xno"]) dnl dnl VNC/RFB access module dnl PKG_ENABLE_MODULES_VLC([LIBVNC], [libvnc], [libvncclient >= 0.9.9], (VNC/rfb client support), [auto]) +dnl RDP/Remote Desktop access module +dnl +PKG_ENABLE_MODULES_VLC([LIBFREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) ) + dnl dnl Real RTSP plugin dnl @@ -1937,6 +1941,24 @@ then fi AM_CONDITIONAL(HAVE_QTKIT, [test "${SYS}" = "darwin" -a "x${enable_macosx_qtkit}" != "xno"]) +dnl +dnl AVFoundation +AC_SUBST(have_avfoundation, ["no"]) +AC_ARG_ENABLE(macosx-avfoundation, + [ --enable-macosx-avfoundation Mac OS X avcapture (video) module (default enabled on Mac OS X)]) +if test "x${enable_macosx_avfoundation}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_avfoundation}" = "yes") +then + SAVED_LIBS="${LIBS}" + LIBS="-framework AVFoundation" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],[have_avfoundation=yes],[have_avfoundation=no]) + LIBS="${SAVED_LIBS}" + if test "${have_avfoundation}" != "no" + then + VLC_ADD_PLUGIN([avcapture]) + fi +fi +AM_CONDITIONAL(HAVE_AVFOUNDATION, [test "${have_avfoundation}" != "no"]) dnl dnl Demux plugins @@ -2295,7 +2317,7 @@ AS_IF([test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" ], [ AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive. Use --enable-avcodec.]) ]) have_avcodec_vaapi="no" -AS_IF([test "${enable_libva}" != "no" -a "${have_avcodec}" == "yes"], [ +AS_IF([test "${enable_libva}" != "no" -a "${have_avcodec}" = "yes"], [ PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [ VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" @@ -2816,6 +2838,11 @@ if test "${enable_x264}" != "no"; then fi fi +dnl +dnl Intel QuickSync (aka MediaSDK) H264/H262 encoder +dnl +PKG_ENABLE_MODULES_VLC([QUICKSYNC], [qsv], [libmfx], [Intel QuickSync MPEG4-Part10/MPEG2 (aka H.264/H.262) encoder], [auto]) + dnl dnl libfluidsynth (MIDI synthetizer) plugin dnl @@ -3017,7 +3044,7 @@ AC_ARG_ENABLE(vdpau, [AS_HELP_STRING([--enable-vdpau], [VDPAU hardware decoder support (default auto)])]) have_vdpau="no" -AS_IF([test "${enable_vdpau}" != "no" -a "${have_avcodec}" == "yes"], [ +AS_IF([test "${enable_vdpau}" != "no" -a "${have_avcodec}" = "yes"], [ PKG_CHECK_MODULES([VDPAU], [vdpau], [ have_vdpau="yes" AS_IF([test "${no_x}" = "yes"], [ @@ -3105,6 +3132,28 @@ AC_ARG_ENABLE(fribidi, AC_ARG_ENABLE(fontconfig, [ --enable-fontconfig fontconfig support (default auto)]) +AC_ARG_WITH([default-font], + AS_HELP_STRING([--with-default-font=PATH], + [Path to the default font]), + [AC_DEFINE_UNQUOTED([DEFAULT_FONT_FILE], + "$withval", [Default font])]) +AC_ARG_WITH([default-monospace-font], + AS_HELP_STRING([--with-default-monospace-font=PATH], + [Path to the default font]), + [AC_DEFINE_UNQUOTED([DEFAULT_MONOSPACE_FONT_FILE], + "$withval", [Default monospace font])]) + +AC_ARG_WITH([default-font-family], + AS_HELP_STRING([--with-default-font-family=NAME], + [Path to the default font family]), + [AC_DEFINE_UNQUOTED([DEFAULT_FAMILY], + "$withval", [Default font family])]) +AC_ARG_WITH([default-monospace-font-family], + AS_HELP_STRING([--with-default-monospace-font-family=NAME], + [Path to the default font family]), + [AC_DEFINE_UNQUOTED([DEFAULT_MONOSPACE_FAMILY], + "$withval", [Default monospace font family])]) + if test "${enable_freetype}" != "no"; then PKG_CHECK_MODULES(FREETYPE, freetype2, [ have_freetype=yes @@ -3188,6 +3237,18 @@ then VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation]) fi +dnl +dnl iOS ES2 vout module +dnl +AC_ARG_ENABLE(ios-vout2, + [ --enable-ios-vout2 iOS video output module (default disabled)]) +if test "${enable_ios_vout2}" = "yes" +then + VLC_ADD_PLUGIN([vout_ios2]) + VLC_ADD_LIBS([vout_ios2], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit]) +fi + + dnl dnl Windows DirectX module dnl @@ -3497,6 +3558,19 @@ then ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi +dnl +dnl iOS CoreAudio plugin +dnl +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, + [ 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 + dnl dnl AudioQueue plugin dnl @@ -3511,7 +3585,29 @@ fi dnl dnl JACK modules dnl -PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modules],[auto]) +AC_ARG_ENABLE(jack, + [AS_HELP_STRING([--disable-jack], + [do not use jack (default auto)])]) +if test "${enable_jack}" != "no" ; then + PKG_CHECK_MODULES(JACK, jack >= 1.9.7, + [ have_jack=yes ], + [ + AC_MSG_WARN([${JACK_PKG_ERRORS}, trying jack1 instead]) + + PKG_CHECK_MODULES(JACK, jack >= 0.120.1 jack < 1.0, + [ have_jack=yes ], + [ + AS_IF([test -n "${enable_jack}"], + [AC_MSG_ERROR([${JACK_PKG_ERRORS}.])], + [AC_MSG_WARN([${JACK_PKG_ERRORS}.])]) + ]) + ]) + if test "x${have_jack}" = "xyes" ; then + VLC_ADD_PLUGIN([jack access_jack]) + VLC_ADD_LIBS([jack access_jack],[$JACK_LIBS]) + VLC_ADD_CFLAGS([jack access_jack],[$JACK_CFLAGS]) + fi +fi dnl dnl OpenSLES Android @@ -3554,6 +3650,22 @@ AS_IF([test "$enable_kai" != "no"], [ AC_SUBST(KAI_LIBS) AM_CONDITIONAL([HAVE_KAI], [test "${have_kai}" = "yes"]) +dnl +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_CFLAGS([stream_out_chromaprint],[${CHROMAPRINT_CFLAGS}] [-I./webservices -I../stream_out]) + VLC_ADD_LIBS([stream_out_chromaprint],[${CHROMAPRINT_LIBS}]) + VLC_ADD_LIBS([fingerprinter],[-lm]), + 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)] + ), + [(Chromaprint based audio fingerprinter)],[auto]) +m4_popdef([libchromaprint_version]) + dnl dnl Interface plugins dnl @@ -3650,6 +3762,9 @@ AS_IF([test "${enable_skins2}" != "no"], [ ], [test "${SYS}" = "darwin"], [ VLC_ADD_CPPFLAGS([skins2],[ -DMACOSX_SKINS]) VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon]) + dnl OS/2 + ], [test "${SYS}" = "os2"], [ + VLC_ADD_CPPFLAGS([skins2],[ -DOS2_SKINS]) dnl Linux/Unix ], [ PKG_CHECK_MODULES([XPM], [xpm],, [have_skins_deps="no"]) @@ -4000,20 +4115,7 @@ AC_SUBST(soliddatadir) AM_CONDITIONAL(KDE_SOLID, [test "x${soliddatadir}" != "x"]) dnl -dnl DLL loader copied from MPlayer copied from somewhere else (WINE ?) -dnl -loader=false -AC_ARG_ENABLE(loader, - AS_HELP_STRING([--enable-loader],[build DLL loader for ELF i386 platforms - (default disabled)])) -AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) -AS_IF([test "${enable_loader}" = "yes"], - [ VLC_ADD_PLUGIN([dmo]) - VLC_ADD_CPPFLAGS([dmo quicktime ],[-I\\\$(srcdir)/loader]) - VLC_ADD_LIBS([dmo quicktime ],[libloader.la]) - VLC_ADD_LIBS([dmo quicktime], [-lpthread]) - ]) - +dnl DMO codec AS_IF([test "${SYS}" = "mingw32"], [VLC_ADD_PLUGIN([dmo]) VLC_ADD_LIBS([dmo],[-lole32 -luuid]) ]) EXTEND_HELP_STRING([Components:])