X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=bd9a073369194571cb5089546dc1c268f07644d1;hb=6fdf44fd13f5c24efb7ac5a593e967d02449b665;hp=c24ca7a07bcedc90f0c3e09805e04008ea51e44b;hpb=3a4ab15b543f3689b3d9d4ac2666097b713ec261;p=vlc diff --git a/configure.ac b/configure.ac index c24ca7a07b..bd9a073369 100644 --- a/configure.ac +++ b/configure.ac @@ -3,10 +3,12 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 2002-2011 the VideoLAN team]) AC_INIT(vlc, 1.2.0-git) -VERSION_MAJOR="1" -VERSION_MINOR="2" -VERSION_REVISION="0" -VERSION_EXTRA="-git" +VERSION_MAJOR=1 +VERSION_MINOR=2 +VERSION_REVISION=0 +VERSION_EXTRA=0 +VERSION_DEV=git + PKGDIR="vlc" AC_SUBST(PKGDIR) @@ -102,52 +104,76 @@ dnl dnl Check for the contrib directory dnl AC_ARG_WITH(contrib, - [AS_HELP_STRING([--without-contrib], - [do not use the libraries in CONTRIB_DIR])]) -AC_ARG_VAR([CONTRIB_DIR], [directory containing pre-built contrib, overriding extras/contrib]) -AS_IF([test "${with_contrib}" != "no"],[ - AS_IF([test -z "$CONTRIB_DIR"], [ - topdir="`dirname $0`" - if test "`echo \"$topdir\" | cut -c 1`" != "/"; then - topdir="`pwd`/$topdir" - fi - CONTRIB_DIR="${topdir}/extras/contrib/hosts/${host}" - if ! test -d "$CONTRIB_DIR" - then - gccmachine=`$CC -dumpmachine` - CONTRIB_DIR="${topdir}/extras/contrib/hosts/${gccmachine}" - fi + [AS_HELP_STRING([--with-contrib[=DIR]], + [search for 3rd party libraries in DIR/include and DIR/lib]) +]) +AC_MSG_CHECKING([for 3rd party libraries path]) +AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [ + CONTRIB_DIR="${srcdir}/contrib/${host}" + AS_IF([test ! -d "${CONTRIB_DIR}"], [ + echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD + CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`" + AS_IF([test ! -d "${CONTRIB_DIR}"], [ + echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD + CONTRIB_DIR="${srcdir}/extras/contrib/hosts/${host}" + AS_IF([test ! -d "${CONTRIB_DIR}"], [ + echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD + CONTRIB_DIR="${srcdir}/extras/contrib/hosts/`$CC -dumpmachine`" + AS_IF([test ! -d "${CONTRIB_DIR}"], [ + echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD + CONTRIB_DIR="" + AC_MSG_RESULT([not found]) + ]) + ]) + ]) ]) - AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}]) +], [ + AS_IF([test "${with_contrib}" != "no"], [ + CONTRIB_DIR="${with_contrib}" + ], [ + CONTRIB_DIR="" + AC_MSG_RESULT([disabled]) + ]) +]) +AS_IF([test -n "${CONTRIB_DIR}"], [ AS_IF([test -d "${CONTRIB_DIR}/lib"],[ - AC_MSG_RESULT([yes]) - AC_SUBST(CONTRIB_DIR) - export PATH=${CONTRIB_DIR}/bin:$PATH - CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include" - CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include" - CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include" - CFLAGS_save="${CFLAGS_save} -I${CONTRIB_DIR}/include" - CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include" - CXXFLAGS_save="${CXXFLAGS_save} -I${CONTRIB_DIR}/include" - OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include" - OBJCFLAGS_save="${OBJCFLAGS_save} -I${CONTRIB_DIR}/include" - if test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"; then - export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH" - else - export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig" - fi - LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib" - LDFLAGS_save="${LDFLAGS_save} -L${CONTRIB_DIR}/lib" - - if test "${SYS}" = "darwin"; then - export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH" - export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH" - fi - ],[ - AC_MSG_RESULT([no]) + CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd` + ], [ + echo "${CONTRIB_DIR}/lib not found" >&AS_MESSAGE_LOG_FD CONTRIB_DIR="" + AC_MSG_RESULT([not usable]) + ]) + +]) +AS_IF([test -n "${CONTRIB_DIR}"], [ + AC_MSG_RESULT([${CONTRIB_DIR}]) + export PATH=${CONTRIB_DIR}/bin:$PATH + CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include" + CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include" + CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include" + CFLAGS_save="${CFLAGS_save} -I${CONTRIB_DIR}/include" + CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include" + CXXFLAGS_save="${CXXFLAGS_save} -I${CONTRIB_DIR}/include" + OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include" + OBJCFLAGS_save="${OBJCFLAGS_save} -I${CONTRIB_DIR}/include" + AS_IF([test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"], [ + export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH" + ], [ + export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig" + ]) + LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib" + LDFLAGS_save="${LDFLAGS_save} -L${CONTRIB_DIR}/lib" + + AS_IF([test "${SYS}" = "darwin"], [ + export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH" + export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH" + ]) +], [ + AS_IF([test -n "${with_contrib}" && test "${with_contrib}" != "no"], [ + AC_MSG_ERROR([Third party libraries not found!]) ]) ]) +AC_SUBST(CONTRIB_DIR) dnl dnl Set default values @@ -213,11 +239,11 @@ case "${host_os}" in CPPFLAGS_save="${CPPFLAGS_save} ${ARCH_flag}"; CPPFLAGS="${CPPFLAGS_save}" OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"; OBJCFLAGS="${OBJCFLAGS_save}" LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names ${ARCH_flag}"; LDFLAGS="${LDFLAGS_save}" - VLC_ADD_LDFLAGS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation]) - VLC_ADD_LDFLAGS([libvlc vlc],[-Wl,-undefined,dynamic_lookup]) - VLC_ADD_LDFLAGS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress]) + VLC_ADD_LIBS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation]) + VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup]) + VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress]) VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) - VLC_ADD_LDFLAGS([libvlccore],[-Wl,-framework,CoreFoundation]) + VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation]) AC_ARG_ENABLE(macosx-defaults, AS_HELP_STRING([--enable-macosx-defaults],[Build the default configuration on Mac OS X (default enabled)])) if test "x${enable_macosx_defaults}" != "xno" @@ -294,21 +320,20 @@ case "${host_os}" in *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) + AC_DEFINE([_WIN32_WINNT], 0x0600, [Define to '0x0600' for Windows Vista 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 @@ -318,13 +343,10 @@ case "${host_os}" in esac if test "${SYS}" = "mingw32"; then - # add ws2_32 for closesocket, select, recv - VLC_ADD_LIBS([libvlccore],[-lws2_32 -lnetapi32 -lwinmm]) + VLC_ADD_LIBS([libvlccore],[-lnetapi32 -lwinmm]) VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([win32text],[-lgdi32]) - VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-lwinmm]) - VLC_ADD_LIBS([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]) + VLC_ADD_LIBS([cdda vcdx sdl_image vout_sdl],[-lwinmm]) dnl dnl DEP and ASLR options dnl @@ -354,8 +376,6 @@ 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 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" @@ -403,6 +423,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 @@ -498,22 +535,6 @@ if test "${SYS}" = "mingw32" ; then CFLAGS="${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" fi -dnl Check for fvtable-thunks support for mingw32 -if test "${SYS}" = "mingw32" -a "${CXX}" != "" ; then - AC_LANG_PUSH(C++) - AC_CACHE_CHECK([if \$CXX accepts -fvtable-thunks], - [ac_cv_cxx_fvtable_thunks], - [CXXFLAGS="${CXXFLAGS_save} -Wall -Werror -fvtable-thunks" - AC_TRY_COMPILE([],,ac_cv_cxx_fvtable_thunks=yes, - ac_cv_cxx_fvtable_thunks=no)]) - if test "${ac_cv_cxx_fvtable_thunks}" = "yes"; then - CXXFLAGS_mingw32_special="-fvtable-thunks" - fi - - CXXFLAGS_save="${CXXFLAGS_save} ${CXXFLAGS_mingw32_special}"; CXXFLAGS="${CXXFLAGS_save}" - AC_LANG_POP(C++) -fi - dnl dnl Buggy glibc prevention. Purposedly not cached. dnl See sourceware.org bugs 5058 and 5443. @@ -550,8 +571,9 @@ dnl Check for system libs needed need_libc=false dnl Check for usual libc functions -AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale]) -AC_REPLACE_FUNCS([asprintf atof atoll dirfd 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_DECLS([nanosleep],,,[#include ]) +AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale]) +AC_REPLACE_FUNCS([asprintf atof atoll dirfd flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) @@ -564,21 +586,45 @@ AC_CHECK_FUNCS([accept4 pipe2 eventfd vmsplice sched_getaffinity]) AH_BOTTOM([#include ]) -SOCKET_LIBS="" -AC_CHECK_FUNCS(connect,,[ - AC_CHECK_LIB(socket,connect,[ - VLC_ADD_LIBS([libvlccore cdda],-lsocket) - SOCKET_LIBS="-lsocket" +dnl Check for poll +AC_SEARCH_LIBS(poll, [poll], [ + AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS has poll().]) +], [ + AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ + AC_MSG_ERROR([poll() is required.]) ]) ]) -AC_SUBST(SOCKET_LIBS) -AC_CHECK_FUNCS(send,,[ - AC_CHECK_LIB(socket,send,[ - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp sap access_output_udp access_output_rtmp stream_out_standard growl_udp remoteosd netsync],[-lsocket]) - ]) +dnl Check for struct pollfd +AC_CHECK_TYPES([struct pollfd],,, +[#include +#if HAVE_POLL +# include +#elif defined (WIN32) +# include +#endif ]) +dnl Check for connect +LIBS_save="$LIBS" +SOCKET_LIBS="" +AC_SEARCH_LIBS(connect, [socket], [ + AS_IF([test "$ac_cv_search_connect" != "none required"], [ + SOCKET_LIBS="$ac_cv_search_connect" + ]) +], [ + AS_IF([test "${SYS}" = "mingw32"], [ + SOCKET_LIBS="-lws2_32" + ]) + AS_IF([test "${SYS}" = "mingwce"], [ + SOCKET_LIBS="-lws2" + ]) +]) +LIBS="$LIBS_save" +AS_IF([test -n "$SOCKET_LIBS"], [ + VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap 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],[${SOCKET_LIBS}]) +]) +AC_SUBST(SOCKET_LIBS) dnl Check for socklen_t AH_TEMPLATE(socklen_t, [Define to `int' if does not define.]) @@ -624,26 +670,6 @@ LIBS_save="${LIBS}" AC_SEARCH_LIBS([getaddrinfo], [nsl],,, [${SOCKET_LIBS}]) LIBS="${LIBS_save}" -dnl Check for va_copy -AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy, - AC_TRY_LINK( - [#include ], - [va_list ap1, ap2; va_copy(ap1,ap2);], - [ac_cv_c_va_copy="yes"], - [ac_cv_c_va_copy="no"])) -if test "${ac_cv_c_va_copy}" = "yes"; then - AC_DEFINE(HAVE_VA_COPY, 1, [Define if defines va_copy.]) -fi -AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy, - AC_TRY_LINK( - [#include ], - [va_list ap1, ap2; __va_copy(ap1,ap2);], - [ac_cv_c___va_copy="yes"], - [ac_cv_c___va_copy="no"])) -if test "${ac_cv_c___va_copy}" = "yes"; then - AC_DEFINE(HAVE___VA_COPY, 1, [Define if defines __va_copy.]) -fi - AC_CHECK_FUNCS(inet_aton,,[ AC_CHECK_LIB(resolv,inet_aton,[ VLC_ADD_LIBS([libvlccore],[-lresolv]) @@ -659,29 +685,13 @@ AC_CHECK_FUNC(getopt_long,, [ ]) AC_SUBST(GNUGETOPT_LIBS) -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_LIB(m,cos,[ - VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger],[-lm]) -]) -AC_CHECK_LIB(m,pow,[ - VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo qt4],[-lm]) -]) -AC_CHECK_LIB(m,sqrt,[ - VLC_ADD_LIBS([compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm]) -]) -AC_CHECK_LIB(m,ceil,[ - VLC_ADD_LIBS([access_imem hotkeys mosaic],[-lm]) -]) -AC_CHECK_LIB(m,exp,[ - VLC_ADD_LIBS([gaussianblur],[-lm]) -]) -AC_CHECK_LIB(m,round,[ - VLC_ADD_LIBS([dbus],[-lm]) -]) -AC_CHECK_LIB(m,sqrtf,[ - VLC_ADD_LIBS([x264],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate libvlccore freetype mod mpc dmo quicktime realvideo qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264],[-lm]) + LIBM="-lm" +], [ + LIBM="" ]) -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" +AC_SUBST(LIBM) AC_CHECK_LIB(m,lrintf, [ AC_DEFINE(HAVE_LRINTF, 1, [Define to 1 if you have the lrintf function]) @@ -696,7 +706,6 @@ if test "${ac_cv_have_plugins}" = "no"; then if test "${SYS}" = "mingw32" ; then AC_CHECK_LIB(kernel32, main, [VLC_ADD_LIBS([libvlccore],[-lkernel32]) - AC_DEFINE(HAVE_DL_WINDOWS, 1, [Define if you have Windows' LoadLibrary]) ac_cv_have_plugins=yes]) fi fi @@ -704,7 +713,6 @@ fi # WinCE style if test "${ac_cv_have_plugins}" = "no"; then if test "${SYS}" = "mingwce"; then - AC_DEFINE(HAVE_DL_WINDOWS, 1, [Define if you have Windows' LoadLibrary]) ac_cv_have_plugins=yes fi fi @@ -756,23 +764,19 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_LIB(rt, clock_nanosleep, [ VLC_ADD_LIBS([libvlccore],[-lrt]) - AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.]) ], [ + AC_CHECK_FUNC(nanosleep,,[ + AC_CHECK_LIB(rt,nanosleep, [ + VLC_ADD_LIBS([libvlccore],[-lrt]) + ], [ + AC_CHECK_LIB(posix4,nanosleep, [ + VLC_ADD_LIBS([libvlccore],[-lposix4]) + ]) + ]) + ]) dnl HP/UX port AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])]) ]) - - have_nanosleep=false - AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ - AC_CHECK_LIB(rt,nanosleep, - [VLC_ADD_LIBS([libvlccore],[-lrt]) have_nanosleep=:], - [AC_CHECK_LIB(posix4,nanosleep, - [VLC_ADD_LIBS([libvlccore],[-lposix4]) have_nanosleep=:])] - ) - ]) - if ${have_nanosleep}; then - AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if nanosleep is available.]) - fi fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" dnl Check for misc headers @@ -810,36 +814,6 @@ AC_CHECK_TYPE(ssize_t,, [ AC_DEFINE(ssize_t, int) ]) -dnl Check for poll -AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])], [ -if test ${SYS} != "mingw32" -a ${SYS} != "mingwce" -then - AC_MSG_WARN([Your platform does not support poll(). VLC has it's own poll() implementation, but it is only intended to be used on Windows. VLC might crash or be insecure when you see this message. Either switch to an OS with a proper poll() implementation, or implement one for your OS in VLC]) -fi -]) - -dnl Mac OS X and other OSes don't have declaration for nanosleep -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - AC_MSG_CHECKING(for nanosleep in time.h) - AC_EGREP_HEADER(nanosleep,time.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_DECL_NANOSLEEP, 1, - Define if defines nanosleep.) - ],[ - AC_MSG_RESULT(no) - ]) -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" - -dnl Make sure we have timespecs -AC_MSG_CHECKING(for timespec in sys/time.h) -AC_EGREP_HEADER(timespec,sys/time.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1, - Define if defines struct timespec.) -],[ - AC_MSG_RESULT(no) -]) - dnl Check for threads library if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(pthread.h) @@ -1019,15 +993,14 @@ AS_IF([test "${enable_coverage}" != "no"], [ CFLAGS="-fprofile-arcs -ftest-coverage ${CFLAGS}" CXXFLAGS="-fprofile-arcs -ftest-coverage ${CXXFLAGS}" LDFLAGS="-lgcov ${LDFLAGS}" - CFLAGS_save="${CFLAGS}" - CXXFLAGS_save="${CXXFLAGS}" - LDFLAGS_save="${LDFLAGS}" ]) +VLC_SAVE_FLAGS + AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ AC_CACHE_CHECK([if $CC accepts -fvisibility=hidden], [ac_cv_c_visibility_hidden], [ - CFLAGS="${CFLAGS_save} -ffast-math" + CFLAGS="${CFLAGS_save} -fvisibility=hidden" AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ ac_cv_c_visibility_hidden=yes ], [ @@ -1035,13 +1008,14 @@ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ ]) ]) 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 ]) ]) -VLC_SAVE_FLAGS dnl dnl Enable/disable optimizations @@ -1252,7 +1226,7 @@ elif test "${SYS}" != "mingwce"; then VLC_ADD_LIBS([dmo],[-lole32 -luuid]) fi if test "${SYS}" = "darwin"; then - VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,ApplicationServices]) + VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices]) fi dnl @@ -1473,12 +1447,16 @@ asm volatile("ssat r0, #1, r0":::"r0"); /* assume ARMv6 */ ]) CFLAGS="${CFLAGS_save}" ]) - ARM_NEON_CFLAGS="$ac_cv_neon_inline" + AS_IF([test "$ac_cv_neon_inline" != "no"], [ + NEON_CFLAGS="$ac_cv_neon_inline" + AC_DEFINE([CAN_COMPILE_NEON], 1, + [Define to 1 if NEON (and ARMv6) assembly is available with NEON_CFLAGS.]) + ]) ], [ ac_cv_neon_inline="no" ]) -AC_SUBST(ARM_NEON_CFLAGS) -AM_CONDITIONAL(HAVE_ARM_NEON, [test "${ac_cv_neon_inline}" != "no"]) +AC_SUBST(NEON_CFLAGS) +AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_neon_inline}" != "no"]) AC_ARG_ENABLE(altivec, @@ -1579,7 +1557,7 @@ dnl - Others: test should fail LDFLAGS="${LDFLAGS_save}" ]) AS_IF([test "${ac_cv_ld_altivec}" != "no"], [ - VLC_ADD_LDFLAGS([libvlccore memcpyaltivec],[-Wl,-framework,vecLib]) + VLC_ADD_LIBS([libvlccore memcpyaltivec],[-Wl,-framework,vecLib]) ]) ]) AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"]) @@ -1736,7 +1714,7 @@ AS_IF([test "${enable_growl}" != "no"], [ VLC_ADD_PLUGIN([growl_udp]) AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl/Growl.framework/Versions/A/Headers/GrowlDefines.h, [ VLC_ADD_PLUGIN([growl]) - VLC_ADD_LDFLAGS([growl], [-F${CONTRIB_DIR}/Growl -Wl,-framework,Growl,-framework,CoreFoundation]) + VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR}/Growl -Wl,-framework,Growl,-framework,CoreFoundation]) VLC_ADD_OBJCFLAGS([growl], [-F${CONTRIB_DIR}/Growl]) VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] ) ]) @@ -1759,10 +1737,6 @@ AS_IF([test "${enable_taglib}" != "no"], [ VLC_ADD_PLUGIN([taglib]) VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz]) VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) - AC_LANG_PUSH(C++) - AC_CHECK_HEADERS(taglib/mp4coverart.h) - AC_CHECK_HEADERS(taglib/apefile.h) - AC_LANG_POP(C++) ], [ AC_MSG_WARN(TagLib library not found)]) ]) @@ -1830,7 +1804,7 @@ if test "${enable_live555}" != "no"; then AC_MSG_WARN([The installed liveMedia version is too old: Version 2010.05.29 or later is required to proceed. You can get an updated one from http://www.live555.com/liveMedia .]) - AS_IF([test "${enable_live555}" == "yes"], [ + AS_IF([test "${enable_live555}" = "yes"], [ AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable the plugin.]) ]) ],[ @@ -2033,22 +2007,14 @@ dnl Video4Linux2 plugin dnl AC_ARG_ENABLE(v4l2, [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 - if test "${with_v4l2}" != "no" -a -n "${with_v4l2}" - then - VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include]) - fi - - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" - AC_CHECK_HEADERS(linux/videodev2.h sys/videoio.h, [ - VLC_ADD_PLUGIN([v4l2]) - ],[]) - CPPFLAGS="${CPPFLAGS_save}" -fi + [disable Video4Linux2 support (default auto)])]) +have_v4l2="no" +AS_IF([test "${enable_v4l2}" != "no"], [ + AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [ + have_v4l2="yes" + ]) +]) +AM_CONDITIONAL(HAVE_V4L2, [test "${have_v4l2}" != "no"]) dnl dnl libv4l2 support for video4linux. @@ -2059,7 +2025,7 @@ AC_ARG_ENABLE(libv4l2, if test "${enable_libv4l2}" != "no" -a "${enable_v4l2}" != "no" then PKG_CHECK_MODULES( LIBV4L2, libv4l2, [ - VLC_ADD_LDFLAGS([v4l2],[${LIBV4L2_LIBS}]) + VLC_ADD_LIBS([v4l2],[${LIBV4L2_LIBS}]) VLC_ADD_CFLAGS([v4l2],[${LIBV4L2_CFLAGS}]) AC_DEFINE(HAVE_LIBV4L2, 1, Define if libv4l2 is available)], AC_MSG_WARN([LibV4L2 support disabled because libv4l2 development headers were not found]) @@ -2173,7 +2139,7 @@ then if test "${SYS}" = "darwin" then VLC_ADD_PLUGIN([vcd cdda]) - VLC_ADD_LDFLAGS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation]) + VLC_ADD_LIBS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LIBS([vcdx cdda],[-liconv]) fi @@ -2207,7 +2173,7 @@ if test "${enable_screen}" != "no"; then AC_CHECK_HEADERS(OpenGL/gl.h, [ AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ VLC_ADD_PLUGIN([screen]) - VLC_ADD_LDFLAGS([screen],[-Wl,-framework,OpenGL,-framework,ApplicationServices]) + VLC_ADD_LIBS([screen],[-Wl,-framework,OpenGL,-framework,ApplicationServices]) ]) ]) elif test "${SYS}" = "mingw32"; then @@ -2533,7 +2499,7 @@ AS_IF([test "${enable_avcodec}" != "no"], [ VLC_ADD_PLUGIN([avcodec]) VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LDFLAGS([avcodec],[-Wl,-Bsymbolic]) + VLC_ADD_LIBS([avcodec],[-Wl,-Bsymbolic]) ]) VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) VLC_RESTORE_FLAGS @@ -2564,13 +2530,13 @@ AS_IF([test "${enable_libva}" != "no"], [ AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.]) echo "VAAPI acceleration activated" ],[ - AS_IF([test "${enable_libva}" == "yes"], + AS_IF([test "${enable_libva}" = "yes"], [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])], [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])]) ]) VLC_RESTORE_FLAGS ],[ - AS_IF([test "${enable_libva}" == "yes"], + AS_IF([test "${enable_libva}" = "yes"], [AC_MSG_ERROR([Could not find required libva.])], [AC_MSG_WARN([libva not found ])]) ]) @@ -2597,12 +2563,12 @@ AS_IF([test "${enable_dxva2}" != "no"], [ AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.]) echo "DxVA2 acceleration activated" ],[ - AS_IF([test "${enable_dxva2}" == "yes"], + AS_IF([test "${enable_dxva2}" = "yes"], [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])], [AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])]) ]) ],[ - AS_IF([test "${enable_dxva2}" == "yes"], + AS_IF([test "${enable_dxva2}" = "yes"], [AC_MSG_ERROR([Could not find required dxva2api.h])], [AC_MSG_WARN([dxva2api.h not found])]) ]) @@ -2652,7 +2618,7 @@ then VLC_ADD_LIBS([avformat access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS]) VLC_ADD_CFLAGS([avformat access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LDFLAGS([avformat access_avio],[-Wl,-Bsymbolic]) + VLC_ADD_LIBS([avformat access_avio],[-Wl,-Bsymbolic]) ]) ], [ VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS]) @@ -2683,7 +2649,7 @@ then VLC_ADD_LIBS([swscale],[$SWSCALE_LIBS]) VLC_ADD_CFLAGS([swscale],[$SWSCALE_CFLAGS]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LDFLAGS([swscale],[-Wl,-Bsymbolic]) + VLC_ADD_LIBS([swscale],[-Wl,-Bsymbolic]) ]) VLC_RESTORE_FLAGS ],[ @@ -2778,7 +2744,7 @@ if test "${enable_quicktime}" = "yes"; then else AC_CHECK_HEADERS(QuickTime/QuickTime.h, [ VLC_ADD_PLUGIN([quicktime]) - VLC_ADD_LDFLAGS([quicktime],[-Wl,-framework,QuickTime,-framework,Carbon]) + VLC_ADD_LIBS([quicktime],[-Wl,-framework,QuickTime,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find QuickTime headers]) ]) fi fi @@ -2940,7 +2906,7 @@ if test "${enable_png}" != "no"; then AC_CHECK_HEADERS(png.h, [ LDFLAGS="${LDFLAGS_save} -lz" AC_CHECK_LIB(png, png_set_rows, [ - VLC_ADD_LIBS([png],[-lpng -lz]) + VLC_ADD_LIBS([png],[-lpng -lz -lm]) VLC_ADD_PLUGIN([png osdmenu osd_parser])], [],[-lz]) LDFLAGS="${LDFLAGS_save}" @@ -2974,7 +2940,7 @@ if test "${enable_x264}" != "no"; then VLC_ADD_LIBS([x264],[-L${real_x264_tree}]) PKG_CHECK_MODULES(X264,x264, [ VLC_ADD_PLUGIN([x264]) - VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) + VLC_ADD_LIBS([x264],[${X264_LIBS}]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB]) @@ -2993,7 +2959,7 @@ if test "${enable_x264}" != "no"; then VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LDFLAGS([x264],[-Wl,-Bsymbolic]) + VLC_ADD_LIBS([x264],[-Wl,-Bsymbolic]) ]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) @@ -3014,6 +2980,11 @@ dnl libfluidsynth (MIDI synthetizer) plugin dnl PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto]) +dnl +dnl libsamplerate plugin +dnl +PKG_ENABLE_MODULES_VLC([SAMPLERATE], [], [samplerate], [Resampler with libsamplerate], [auto]) + dnl dnl Teletext Modules dnl vbi decoder plugin (using libzbvi) @@ -3084,8 +3055,7 @@ AS_IF([test "${enable_kate}" != "no"], [ AC_CHECK_HEADERS(kate/kate.h, [ AC_CHECK_LIB(kate, kate_decode_init, [ VLC_ADD_PLUGIN([kate]) - kate_libs="-lkate -logg" - VLC_ADD_LDFLAGS([kate],[${kate_libs}]) ],[ + VLC_ADD_LIBS([kate],[-lkate -logg]) ],[ AS_IF([test "x${enable_kate}" != "x"], [ AC_MSG_ERROR([libkate doesn't appear to be installed on your system. You also need to check that you have a libogg posterior to the 1.0 release.]) @@ -3151,9 +3121,10 @@ AC_ARG_ENABLE(xvideo, have_xcb="no" AS_IF([test "${enable_xcb}" != "no"], [ dnl libxcb - PKG_CHECK_MODULES(XCB, [xcb]) + PKG_CHECK_MODULES(XCB, [xcb >= 1.6]) have_xcb="yes" PKG_CHECK_MODULES(XCB_SHM, [xcb-shm]) + PKG_CHECK_MODULES(XCB_COMPOSITE, [xcb-composite]) AS_IF([test "${enable_xvideo}" != "no"], [ PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [ @@ -3219,13 +3190,13 @@ then PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [ # SDL on Darwin is heavily patched and can only run SDL_image if test "${SYS}" != "darwin"; then - VLC_ADD_PLUGIN([vout_sdl aout_sdl]) + VLC_ADD_PLUGIN([vout_sdl]) fi if test "${SYS}" != "mingw32"; then VLC_ADD_LIBS([vout_sdl],[${X_LIBS} ${X_PRE_LIBS} -lX11]) fi - VLC_ADD_CFLAGS([vout_sdl aout_sdl],[${SDL_CFLAGS}]) - VLC_ADD_LIBS([vout_sdl aout_sdl],[${SDL_LIBS}]) + VLC_ADD_CFLAGS([vout_sdl],[${SDL_CFLAGS}]) + VLC_ADD_LIBS([vout_sdl],[${SDL_LIBS}]) # SDL_image AS_IF([ test "${enable_sdl_image}" != "no"],[ @@ -3265,7 +3236,7 @@ if test "${enable_freetype}" != "no"; then VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}]) AC_CHECK_HEADERS(Carbon/Carbon.h, - [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) + [VLC_ADD_LIBS([freetype],[-Wl,-framework,Carbon])]) dnl fontconfig support if test "${SYS}" != "mingw32"; then @@ -3305,6 +3276,19 @@ dnl SVG module dnl PKG_ENABLE_MODULES_VLC([SVG], [], [librsvg-2.0 >= 2.9.0], [SVG rendering library],[auto]) +dnl +dnl android surface module +dnl +AC_ARG_ENABLE(android-surface, + [ --enable-android-surface Android Surface video output module (default disabled)]) +if test "${enable_android_surface}" = "yes"; then + if test "${HAVE_ANDROID}" = "1"; then + VLC_ADD_PLUGIN([android_surface]) + VLC_ADD_LDFLAGS([android_surface], [-ldl]) + fi +fi + + dnl dnl iOS vout module dnl @@ -3314,7 +3298,7 @@ if test "${enable_ios_vout}" = "yes" then VLC_ADD_PLUGIN([vout_ios]) VLC_ADD_CFLAGS([vout_ios], [-DUSE_OPENGL_ES=1]) - VLC_ADD_LDFLAGS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation]) + VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation]) fi dnl @@ -3326,7 +3310,7 @@ if test "x${enable_macosx_quartztext}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_quartztext}" = "yes") then VLC_ADD_PLUGIN([quartztext]) - VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,ApplicationServices]) + VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices]) fi dnl @@ -3350,7 +3334,7 @@ then VLC_ADD_LIBS([directx],[-lgdi32]) ],[AC_MSG_ERROR([Cannot find DirectX headers!])] ) - AC_CHECK_HEADERS(GL/gl.h, + AC_CHECK_HEADERS(GL/glext.h, [ VLC_ADD_PLUGIN([glwin32]) VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32]) ]) @@ -3366,18 +3350,21 @@ dnl dnl Windows Direct2D plugin dnl AC_ARG_ENABLE(direct2d, - [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)]) -if test "${enable_direct2d}" != "no"; then - if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" - then - AC_CHECK_HEADERS(d2d1.h, - [ - VLC_ADD_PLUGIN([direct2d]) - VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32]) - ], [AC_MSG_WARN([Cannot find Direct2D headers!])] - ) - fi -fi + [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)],, [ + AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ + enable_direct2d="no" + ]) +]) +AS_IF([test "${enable_direct2d}" != "no"], [ + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS(d2d1.h, [ + VLC_ADD_PLUGIN([direct2d]) + VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32]) + ], [ + AC_MSG_WARN([Cannot find Direct2D headers!]) + ]) + AC_LANG_POP([C++]) +]) dnl dnl win32 GDI plugin @@ -3513,8 +3500,20 @@ AS_IF([test "${enable_pulse}" != "no"], [ PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.22], [ have_pulse="yes" ], [ - AS_IF([test "x${enable_pulse}" != "x"], [ - AC_MSG_ERROR([$PULSE_PKG_ERRORS. PulseAudio 0.9.22 or later required.]) + PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.16], [ + AS_IF([test "${no_x}" != "yes"], [ + have_pulse="yes" + PULSE_LIBS="$PULSE_LIBS ${X_LIBS} ${X_PRE_LIBS} -lX11" + ], [ + AS_IF([test "${enable_pulse}" = "yes"], [ + AC_MSG_ERROR([Xlib is required with PulseAudio pre-0.9.22 versions +(see http://www.pulseaudio.org/ticket/799 for further reference).]) + ]) + ]) + ], [ + AS_IF([test "x${enable_pulse}" != "x"], [ + AC_MSG_ERROR([$PULSE_PKG_ERRORS. PulseAudio 0.9.22 or later required.]) + ]) ]) ]) ]) @@ -3595,7 +3594,7 @@ if test "x${enable_macosx_audio}" != "xno" && then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, [ VLC_ADD_PLUGIN([auhal]) - VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) + VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -3607,7 +3606,7 @@ AC_ARG_ENABLE(audioqueue, if test "${enable_audioqueue}" = "yes" then VLC_ADD_PLUGIN([audioqueue]) - VLC_ADD_LDFLAGS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation]) + VLC_ADD_LIBS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation]) fi dnl @@ -3615,6 +3614,19 @@ dnl JACK modules dnl PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modules],[auto]) +dnl +dnl OpenSLES Android +dnl +AC_ARG_ENABLE(opensles, + [ --enable-opensles Android OpenSL ES audio module (default disabled)]) +if test "${HAVE_ANDROID}" = "1"; then + if test "${enable_opensles}" = "yes"; then + AC_CHECK_HEADERS(SLES/OpenSLES.h, + [ VLC_ADD_PLUGIN([opensles_android]) ], + [ AC_MSG_ERROR([cannot find OpenSLES headers])] ) + fi +fi + dnl dnl UPnP Plugin (Intel SDK) dnl @@ -3661,14 +3673,15 @@ AS_IF([test "${enable_skins2}" = "yes"], [ ], [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]) + VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon]) ], [ PKG_CHECK_MODULES([XPM], [xpm]) + PKG_CHECK_MODULES([XINERAMA], [xinerama]) PKG_CHECK_MODULES([XEXT], [xext]) VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} ${XEXT_CFLAGS} ${XPM_CFLAGS} -DX11_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) - VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} -lX11]) + VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} ${XINERAMA_LIBS} -lX11]) ]) VLC_ADD_PLUGIN([skins2]) @@ -3741,7 +3754,7 @@ AS_IF([test "${enable_qt4}" != "no"], [ VLC_ADD_LIBS([qt4],[-lole32]) ]) AS_IF([test "${SYS}" = "darwin" ],[ - VLC_ADD_LDFLAGS([qt4], [-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([qt4], [-Wl,-framework,Cocoa]) ]) AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROG(RCC, rcc, rcc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin) @@ -3769,22 +3782,23 @@ dnl MacOS X video output/gui modules dnl AC_ARG_ENABLE(macosx, [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)]) -if test "x${enable_macosx}" = "xyes" +if test "x${enable_macosx}" != "xno" && +(test "${SYS}" = "darwin" || test "${enable_macosx}" = "yes") then - VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,Cocoa]) - VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,OpenGL]) - VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon]) - VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices]) - VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL]) - VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QTKit]) - VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) - VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) + VLC_ADD_LIBS([macosx minimal_macosx],[-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([macosx minimal_macosx],[-Wl,-framework,OpenGL]) + VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,Carbon]) + VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,CoreServices]) + VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,AGL]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,IOKit]) + VLC_ADD_LIBS([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_LIBS([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]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,AddressBook]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,WebKit]) VLC_ADD_OBJCFLAGS([macosx minimal_macosx], [-fobjc-exceptions] ) VLC_ADD_PLUGIN([macosx minimal_macosx]) @@ -3799,8 +3813,8 @@ AC_ARG_ENABLE(macosx-vout, if test "x${enable_macosx_vout}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes") then - VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,Cocoa]) - VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,OpenGL]) + VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,OpenGL]) VLC_ADD_PLUGIN([vout_macosx]) fi @@ -3809,7 +3823,7 @@ AC_ARG_ENABLE(macosx-dialog-provider, if test "x${enable_macosx_dialog_provider}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_dialog_provider}" = "yes") then - VLC_ADD_LDFLAGS([macosx_dialog_provider],[-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([macosx_dialog_provider],[-Wl,-framework,Cocoa]) VLC_ADD_PLUGIN([macosx_dialog_provider]) fi @@ -3818,11 +3832,11 @@ AC_ARG_ENABLE(macosx-qtcapture, if test "x${enable_macosx_qtcapture}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes") then - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,Cocoa]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QuartzCore]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QTKit]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreAudio]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QuartzCore]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreVideo]) VLC_ADD_PLUGIN([qtcapture]) fi @@ -3831,7 +3845,7 @@ AC_ARG_ENABLE(macosx-eyetv, if test "x${enable_macosx_eyetv}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_eyetv}" = "yes") then - VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation]) + VLC_ADD_LIBS([access_eyetv], [-Wl,-framework,Foundation]) VLC_ADD_PLUGIN([access_eyetv]) fi @@ -4025,7 +4039,7 @@ AS_IF([test "${enable_gnutls}" != "no"], [ VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS]) AS_IF([test "${SYS}" = "mingw32"], [ dnl pkg-config --libs gnutls omits these - VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL}]) + VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL} -lcrypt32]) ]) VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}]) VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}]) @@ -4131,7 +4145,7 @@ dnl dnl media library dnl AC_ARG_ENABLE(media-library, [--enable-media-library media library (default disabled)]) -if test "${enable_media_library}" == "yes"; then +if test "${enable_media_library}" = "yes"; then if test "${enable_sqlite}" != "yes"; then AC_MSG_ERROR([SQLite module is required for the media library]) else @@ -4242,10 +4256,11 @@ AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string]) AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years]) AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line]) -AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number]) -AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number]) -AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,"${VERSION_REVISION}", [version minor number]) -AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,"${VERSION_EXTRA}", [version minor number]) +AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,${VERSION_MAJOR}, [version major number]) +AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,${VERSION_MINOR}, [version minor number]) +AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,${VERSION_REVISION}, [version revision number]) +AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,${VERSION_EXTRA}, [version extra number]) +AC_DEFINE_UNQUOTED(PACKAGE_VERSION_DEV,"${VERSION_DEV}", [version development string]) AC_SUBST(COPYRIGHT_MESSAGE) AC_SUBST(VERSION_MESSAGE) AC_SUBST(VERSION_MAJOR) @@ -4256,18 +4271,9 @@ AC_SUBST(COPYRIGHT_YEARS) AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [host which ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) -dnl Win32 need s a numerical version_extra. -case $( echo ${VERSION_EXTRA}|wc -m ) in - "1") VERSION_EXTRA_RC="0";; - "2") VERSION_EXTRA_RC=$( echo ${VERSION_EXTRA}|tr "abcdefghi" "123456789") ;; - *) VERSION_EXTRA_RC="99" -esac -AC_SUBST(VERSION_EXTRA_RC) dnl dnl Handle substvars that use $(top_srcdir) dnl -VLC_CONFIG="top_srcdir=\"\$(top_srcdir)\" top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config" -AC_SUBST(VLC_CONFIG) CPPFLAGS_save="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS_save}" dnl @@ -4280,11 +4286,6 @@ dnl Sort the modules list dnl PLUGINS=$( (for i in `echo $PLUGINS`; do echo $i; done)|sort|xargs ) -dnl -dnl Create the vlc-config script -dnl -LDFLAGS_libvlc="${LDFLAGS_libvlc} ${LDFLAGS_builtin}" - dnl dnl Configuration is finished dnl @@ -4303,9 +4304,6 @@ AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(FILE_LIBVLCCORE_DLL) AC_SUBST(FILE_LIBVLC_DLL) -dnl Create vlc-config.in -VLC_OUTPUT_VLC_CONFIG_IN - AC_CONFIG_FILES([ Makefile doc/Makefile @@ -4363,19 +4361,19 @@ AC_CONFIG_FILES([ modules/lua/Makefile modules/meta_engine/Makefile modules/misc/Makefile - modules/misc/dummy/Makefile - modules/misc/notify/Makefile modules/misc/playlist/Makefile modules/misc/osd/Makefile modules/misc/stats/Makefile modules/media_library/Makefile modules/mux/Makefile modules/mux/mpeg/Makefile + modules/notify/Makefile modules/packetizer/Makefile modules/services_discovery/Makefile modules/stream_filter/Makefile modules/stream_out/Makefile modules/stream_out/transcode/Makefile + modules/text_renderer/Makefile modules/video_chroma/Makefile modules/video_filter/Makefile modules/video_filter/dynamicoverlay/Makefile @@ -4408,13 +4406,7 @@ AM_COND_IF([HAVE_DARWIN], [ dnl Generate makefiles AC_OUTPUT -# Cannot use AC_CONFIG_FILES([vlc-config]) as is automatically built, -# not provided with the source -${SHELL} ./config.status --file=vlc-config -chmod 0755 vlc-config - -/bin/echo -n "Enabled modules: " -./vlc-config --list plugin +/bin/echo -n "Enabled modules: ${PLUGINS}" dnl Do we have to use make or gmake ? USE_MAKE_OR_GMAKE=`case "${SYS}" in openbsd*) echo "gmake";; *) echo "make";; esac` @@ -4448,16 +4440,5 @@ echo "vlc aliases :${ALIASES}" else echo "build vlc executable : no" fi -echo "plugins/bindings :${PLUGINS_BINDINGS} - -You can tune the compiler flags in vlc-config. -To build vlc and its plugins, type \`./compile' or \`$USE_MAKE_OR_GMAKE'. -" -if test "x$ac_ld_does_not_support_text_reloc" = "xyes"; then - echo "" - echo "Warning: Due to a bug in ld, mmx/sse support has been" - echo " turned off." - echo " FFmpeg will be REALLY slow." - echo " VLC WILL NOT PERFORM AS EXPECTED." - echo "" -fi +echo " +To build vlc and its plugins, type \`./compile' or \`$USE_MAKE_OR_GMAKE'."