X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=8fbcd81261b4dfc8e357091a68a0567c545f4748;hb=aff4cad782e0939afc520f82735ebfac27cd3b9c;hp=5f99552f82a26ce4afdf3e1e7a35a454e3414bac;hpb=a71d33159c47a752acc753ebddf1f7ef13790a07;p=vlc diff --git a/configure.ac b/configure.ac index 5f99552f82..8fbcd81261 100644 --- a/configure.ac +++ b/configure.ac @@ -142,6 +142,11 @@ case "${host_os}" in x86_64*) ARCH_flag="-arch x86_64" ;; + arm*) + ARCH_flag="-arch armv7" + ac_cv_c_bigendian="no" + ac_cv_c_attribute_packed="no" + ;; esac SYS=darwin @@ -151,8 +156,8 @@ case "${host_os}" in OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}" LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}" 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_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,Appkit]) + VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress]) VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation]) @@ -168,29 +173,34 @@ case "${host_os}" in AC_LIBOBJ([strnlen])],) dnl - dnl Check for Mac OS X SDK settings + dnl Handle Mac OS X SDK flags dnl AC_ARG_WITH(macosx-sdk, [AS_HELP_STRING([--with-macosx-sdk=DIR], [compile using the SDK in DIR])]) - test "${with_macosx_sdk}" = "" && with_macosx_sdk=/Developer/SDKs/MacOSX10.6.sdk - test ! -d "${with_macosx_sdk}" && AC_MSG_ERROR([SDK "${with_macosx_sdk}" not found]) + if test "${with_macosx_sdk}" != "" ; then + test ! -d "${with_macosx_sdk}" && AC_MSG_ERROR([SDK "${with_macosx_sdk}" not found]) + 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}" + fi AC_ARG_WITH(macosx-version-min, [AS_HELP_STRING([--with-macosx-version-min=VERSION], - [compile for MacOS X VERSION and above])]) - if test "${with_macosx_version_min}" = "" ; then - with_macosx_version_min=10.5 + [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 - MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min} - CPP="${CPP} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" - CC="${CC} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" - CXX="${CXX} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" - OBJC="${OBJC} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}" - LD="${LD} -syslibroot ${with_macosx_sdk} -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 ;; *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) @@ -199,10 +209,6 @@ case "${host_os}" in AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.]) case "${host_os}" in - *wince* | *mingwce* | *mingw32ce*) - SYS=mingwce - dnl Sadly CeGCC still needs non-wince macros - ;; *mingw32*) SYS=mingw32 ;; @@ -218,10 +224,10 @@ case "${host_os}" in esac if test "${SYS}" = "mingw32"; then - VLC_ADD_LIBS([libvlccore],[-lnetapi32 -lwinmm]) + VLC_ADD_LIBS([libvlccore],[-lwinmm]) VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([win32text],[-lgdi32]) - VLC_ADD_LIBS([cdda vcdx sdl_image vout_sdl],[-lwinmm]) + VLC_ADD_LIBS([vcdx],[-lwinmm]) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) ac_default_prefix="`pwd`/_win32" DESTDIR="`pwd`/_win32/" @@ -241,12 +247,6 @@ case "${host_os}" in AC_SUBST(PROGRAMFILES) fi - if test "${SYS}" = "mingwce"; then - VLC_ADD_LIBS([libvlccore],[-lmmtimer]) - AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) - ac_default_prefix="`pwd`/_wince" - DESTDIR="`pwd`/_wince/" - fi ;; *nto*) SYS=nto @@ -273,7 +273,6 @@ 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") dnl @@ -391,6 +390,8 @@ LT_INIT([dlopen win32-dll shared disable-static]) LT_LANG([C++]) LT_LANG([Windows Resource]) +DOLT + m4_undefine([AC_DEPLIBS_CHECK_METHOD]) m4_defun([AC_DEPLIBS_CHECK_METHOD],[]) @@ -404,7 +405,7 @@ dnl dnl Gettext stuff dnl AM_GNU_GETTEXT_VERSION([0.18.1]) -AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT([external], [need-ngettext]) dnl dnl Iconv stuff @@ -412,20 +413,22 @@ dnl AM_ICONV dnl Check for broken versions of mingw-runtime compatability library -AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ +AS_IF([test "${SYS}" = "mingw32"], [ AC_MSG_CHECKING(for broken mingw-runtime) AC_PREPROC_IFELSE([AC_LANG_SOURCE([ #include <_mingw.h> -#if (__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15) -#ifndef __MINGW64_VERSION_MAJOR +#if defined(__MINGW64_VERSION_MAJOR) +# if __MINGW64_VERSION_MAJOR < 3 +# error Attempting to use mingw-runtime with broken vsnprintf and direct2d support +# endif +#elif __MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION < 15 # error Attempting to use mingw-runtime with broken vsnprintf support -#endif #endif ])], [ AC_MSG_RESULT([ok]) ], [ AC_MSG_RESULT([present]) - AC_MSG_ERROR([LibVLC requires mingw-runtime version 3.15 or higher!]) + AC_MSG_ERROR([LibVLC requires mingw-runtime version 3.15 or higher, or mingw-w64 version 3.0 or higher!]) ]) dnl force use of mingw provided c99 *printf over msvcrt CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1" @@ -504,7 +507,8 @@ AC_LINK_IFELSE([ c = NULL; ])],[AC_DEFINE([HAVE_ASPRINTF],[1],[Define to 1 if you have asprintf function])],[AC_LIBOBJ([asprintf])]) AC_LINK_IFELSE([ - AC_LANG_PROGRAM([#include ], [ + AC_LANG_PROGRAM([#include + #include ], [ char *c; va_list ap; if (vasprintf(&c, "%s %d", ap) == -1) @@ -554,9 +558,6 @@ AC_SEARCH_LIBS(connect, [socket], [ AS_IF([test "${SYS}" = "mingw32"], [ SOCKET_LIBS="-lws2_32" ]) - AS_IF([test "${SYS}" = "mingwce"], [ - SOCKET_LIBS="-lws2" - ]) ]) AC_SEARCH_LIBS([getaddrinfo], [nsl], [ @@ -596,9 +597,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( UNDER_CE ) - # include - #elif defined( WIN32 ) + #if defined( WIN32 ) # include #else # include @@ -620,7 +619,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 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 freetype mpc dmo mp4 quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264 hqdn3d anaglyph],[-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 freetype mpc dmo mp4 quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x26410b hqdn3d anaglyph oldrc ncurses],[-lm]) LIBM="-lm" ], [ LIBM="" @@ -645,19 +644,13 @@ AC_SEARCH_LIBS(dlopen, [dl svld], [ VLC_RESTORE_FLAGS # Windows -AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ +AS_IF([test "${SYS}" = "mingw32"], [ LIBDL="" have_dynamic_objects="yes" #assume we can use shared objects ]) -test "${enable_shared}" = "no" && have_dynamic_objects=no - -AS_IF([test "${have_dynamic_objects}" != "no"], [ - AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, - [Define to 1 if dynamic plugins are supported.]) -], [ - dnl Clear $LIBDL so as not to break linking - LIBDL="" +AS_IF([test "${enable_shared}" = "no"], [ + have_dynamic_objects=no ]) AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"]) @@ -665,7 +658,7 @@ AC_SUBST(LIBDL) VLC_ADD_LIBS([lua],[$LIBDL]) dnl Check for thread library -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then +if test "${SYS}" != "mingw32"; then VLC_SAVE_FLAGS LIBS="" @@ -689,7 +682,7 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then dnl HP/UX port AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])]) ]) -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" +fi # end "${SYS}" != "mingw32" dnl Check for headers AC_CHECK_HEADERS([search.h]) @@ -706,11 +699,11 @@ AC_CHECK_HEADERS([sys/mount.h], [], [], #include ]) -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then +if test "${SYS}" != "mingw32"; then AC_CHECK_HEADERS(machine/param.h sys/shm.h) AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h]) AC_CHECK_HEADERS(syslog.h mntent.h) -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" +fi # end "${SYS}" != "mingw32" dnl LP64 and LLP64 architectures had better define ssize_t by themselves... AH_TEMPLATE(ssize_t, [Define to `int' if does not define.]) dnl ` (fix VIM syntax highlight @@ -719,9 +712,9 @@ AC_CHECK_TYPE(ssize_t,, [ ]) dnl Check for threads library -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then +if test "${SYS}" != "mingw32"; then AC_CHECK_HEADERS(pthread.h) -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" +fi # end "${SYS}" != "mingw32" dnl It seems that autoconf detects pkg-config only during the first dnl PKG_CHECK_MODULES from configure.ac - which makes sense. But in our case, @@ -733,7 +726,7 @@ PKG_PROG_PKG_CONFIG() dnl On some OS we need static linking AS_IF([test -n "${PKG_CONFIG}" ],[ - AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ],[ + AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ],[ PKG_CONFIG="${PKG_CONFIG} --static" ]) ]) @@ -763,17 +756,14 @@ fi AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ]) -dnl Manual switch for UTF-8 -AC_ARG_ENABLE(non-utf8, - [AS_HELP_STRING([--enable-non-utf8], - [support legacy non-UTF-8 systems (default disabled)])],, [ - AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "os2"], [ - enable_non_utf8="no" - ]) -]) -AS_IF([test "${enable_non_utf8}" != "no"], [ - AC_DEFINE([ASSUME_UTF8], [1], - [Define to 1 if the operating system uses UTF-8 internally]) +dnl +dnl Domain name i18n support via GNU libidn +dnl +PKG_CHECK_MODULES([IDN], [libidn], [ + have_libidn="yes" + AC_DEFINE([HAVE_IDN], 1, [Define to 1 if you have GNU libidn.]) +], [ + have_libidn="no" ]) @@ -783,7 +773,7 @@ AC_ARG_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" +if test "${enable_dbus}" != "no" -a "${SYS}" != "mingw32" then dnl api stable dbus PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0.0], @@ -800,14 +790,6 @@ then VLC_ADD_LIBS([dbus],[$DBUS_LIBS]) VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS]) fi - dnl Check for Telepathy - AC_ARG_ENABLE(telepathy, - AS_HELP_STRING([--enable-telepathy],[Telepathy Presence plugin through DBus(default enabled)])) - if test "${enable_telepathy}" != "no"; then - VLC_ADD_PLUGIN([telepathy]) - VLC_ADD_LIBS([telepathy],[$DBUS_LIBS]) - VLC_ADD_CFLAGS([telepathy],[$DBUS_CFLAGS]) - fi dnl Power Management Inhibiter VLC_ADD_PLUGIN([inhibit]) VLC_ADD_LIBS([inhibit],[$DBUS_LIBS]) @@ -894,7 +876,7 @@ AS_IF([test "${enable_coverage}" != "no"], [ LDFLAGS="-lgcov ${LDFLAGS}" ]) -AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ +AS_IF([test "${SYS}" != "mingw32"], [ VLC_SAVE_FLAGS CFLAGS="${CFLAGS} -fvisibility=hidden" CXXFLAGS="${CXXFLAGS} -fvisibility=hidden" @@ -1074,13 +1056,9 @@ dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" = "os2"; then VLC_ADD_PLUGIN([dynamicoverlay]) -elif test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then +elif test "${SYS}" != "mingw32"; then VLC_ADD_PLUGIN([dynamicoverlay access_shm]) -elif test "${SYS}" != "mingwce"; then - VLC_ADD_PLUGIN([access_smb dmo globalhotkeys]) - VLC_ADD_LIBS([dmo],[-lole32 -luuid]) -fi -if test "${SYS}" = "darwin"; then +elif test "${SYS}" = "darwin"; then VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices]) fi @@ -1364,29 +1342,21 @@ AC_ARG_ENABLE(neon, ]) AS_IF([test "${enable_neon}" != "no"], [ VLC_SAVE_FLAGS - CFLAGS="${CFLAGS} -mfpu=neon" - AC_CACHE_CHECK([if $CC groks NEON inline assembly], [ac_cv_neon_inline], [ + CFLAGS="${CFLAGS} -mfpu=neon -mhard-float" + AC_CACHE_CHECK([if $CCAS groks ARM NEON assembly], [ac_cv_arm_neon], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM(,[[ asm volatile("vqmovun.s64 d0, q1":::"d0"); -asm volatile("ssat r0, #1, r0":::"r0"); /* assume ARMv6 */ ]]) ], [ - ac_cv_neon_inline="-mfpu=neon" + ac_cv_arm_neon="yes" ], [ - ac_cv_neon_inline="no" + ac_cv_arm_neon="no" ]) ]) VLC_RESTORE_FLAGS - 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(NEON_CFLAGS) -AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_neon_inline}" != "no"]) +AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_arm_neon}" = "yes"]) AC_ARG_ENABLE(altivec, @@ -1489,44 +1459,6 @@ dnl - Others: test should fail ]) AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"]) -dnl -dnl Special arch tuning -dnl -AC_ARG_WITH(tuning, - [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}" = "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 - CFLAGS_TUNING="-mtune=athlon64" - elif test "${host_cpu}" = "powerpc"; then - CFLAGS_TUNING="-mtune=G4"; - fi -fi - -dnl NOTE: this can't be cached cleanly -AS_IF([test -n "${CFLAGS_TUNING}"], [ - VLC_SAVE_FLAGS - CFLAGS="${CFLAGS} ${CFLAGS_TUNING}" - AC_MSG_CHECKING([whether $CC accepts ${CFLAGS_TUNING}]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [ - AC_MSG_RESULT([yes]) - ], [ - VLC_RESTORE_FLAGS - AC_MSG_RESULT([no]) - AS_IF([test "${with_tuning}"], [AC_MSG_ERROR([requested tuning not supported])]) - ]) -]) - dnl dnl Memory usage dnl @@ -1666,7 +1598,14 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [ AC_LANG_PUSH(C++) VLC_SAVE_FLAGS AS_IF([test -z "${CONTRIB_DIR}"], [ - CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/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" + ]) ], [ CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment" ]) @@ -1674,6 +1613,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"], [ CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS" ]) CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}" + LDFLAGS="${LDFLAGS} ${LDFLAGS_live555}" AC_CACHE_CHECK([for live555 version 1324598400 or later], [ac_cv_live555], [ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([ @@ -1700,14 +1640,12 @@ You can get an updated one from http://www.live555.com/liveMedia .]) AS_IF([test "${SYS}" = "mingw32"], [ # add ws2_32 for closesocket, select, recv other_libs="$other_libs -lws2_32" - ], [test "${SYS}" = "mingwce"], [ - # add ws2 for closesocket, select, recv - other_libs="$other_libs -lws2" ]) 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}]) @@ -1726,8 +1664,8 @@ dnl - special access module for dc1394 input dnl - dv module: digital video module check for libraw1394 dnl - linsys modules: access module check for libzvbi dnl -PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], [dc1394 access module], [auto]) -PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto]) +PKG_ENABLE_MODULES_VLC([DC1394], [], [libdc1394-2 >= 2.1.0], [IIDC FireWire input module], [auto]) +PKG_ENABLE_MODULES_VLC([DV1394], [], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV FireWire input module], [auto]) AC_ARG_ENABLE(linsys, [AS_HELP_STRING([--enable-linsys], @@ -1795,7 +1733,7 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2.1], (libbluray f dnl dnl OpenCV wrapper and example filters dnl -PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (OpenCV (computer vision) filter), [off]) +PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0], (OpenCV (computer vision) filter), [auto]) dnl @@ -1840,11 +1778,6 @@ AS_IF([test "$enable_v4l2" != "no"], [ ]) ]) AS_IF([test "$have_v4l2" = "yes"], [ - PKG_CHECK_MODULES(LIBV4L2, libv4l2, [ - AC_DEFINE(HAVE_LIBV4L2, 1, [Define to 1 if libv4l2 is available]) - ], [ - AC_MSG_WARN([${LIBV4L2_PKG_ERRORS}.]) - ]) AS_IF([test "${enable_pvr}" = "yes"], [ VLC_ADD_PLUGIN([pvr]) ]) @@ -1967,17 +1900,21 @@ fi dnl dnl Linux DVB dnl -AC_CACHE_CHECK([for Linux DVB version 5], [ac_cv_linux_s2api], [ +AC_CACHE_CHECK([for Linux DVB version 5.1], [ac_cv_linux_dvb_5_1], [ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([ [#include #if (DVB_API_VERSION < 5) -EXPLODE -#endif]])], [ - ac_cv_linux_s2api=yes +# error Linux DVB API v3.2 and older are not supported. +#endif +#if (DVB_API_VERSION == 5 && DVB_API_VERSION_MINOR < 1) +# error Linux DVB API v5.0 is unsupported. Please update. +#endif +]])], [ + ac_cv_linux_dvb_5_1=yes ], [ - ac_cv_linux_s2api=no + ac_cv_linux_dvb_5_1=no ])]) -AM_CONDITIONAL([HAVE_LINUX_DVB], [test "$ac_cv_linux_s2api" = "yes"]) +AM_CONDITIONAL([HAVE_LINUX_DVB], [test "$ac_cv_linux_dvb_5_1" = "yes"]) dnl dnl Screen capture module @@ -2135,9 +2072,6 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then [AC_MSG_RESULT([yes]) AC_CHECK_HEADERS(matroska/KaxAttachments.h) VLC_ADD_CXXFLAGS([mkv],[]) - if test "${SYS}" = "darwin"; then - VLC_ADD_CXXFLAGS([mkv],[-O1]) - fi AC_CHECK_LIB(ebml_pic, main, [ VLC_ADD_PLUGIN([mkv]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic]) @@ -2348,7 +2282,7 @@ dnl AC_ARG_ENABLE(avcodec, [ --enable-avcodec libavcodec codec (default enabled)]) AS_IF([test "${enable_avcodec}" != "no"], [ - PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil], + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil >= 49.5.0], [ VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" @@ -2441,6 +2375,38 @@ AS_IF([test "${enable_dxva2}" != "no"], [ fi ]) +dnl +dnl vda needs avcodec +dnl +AC_ARG_ENABLE(vda, + [ --enable-vda VDA support (default auto)]) + +AS_IF([test "${enable_vda}" != "no"], [ + if test "${SYS}" = "darwin"; then + AS_IF([test "x${have_avcodec}" = "xyes"], [ + AC_CHECK_HEADERS(VideoDecodeAcceleration/VDADecoder.h, + [ + AC_CHECK_HEADERS(libavcodec/vda.h, [ + VLC_ADD_LIBS([avcodec],[-Wl,-framework,CoreFoundation,-framework,VideoDecodeAcceleration,-framework,QuartzCore]) + VLC_ADD_LDFLAGS([vda],[-Wl,-framework,CoreFoundation,-framework,VideoDecodeAcceleration,-framework,QuartzCore]) + AC_DEFINE(HAVE_AVCODEC_VDA, 1, [Define if avcodec has to be built with VDA support.]) + ],[ + AS_IF([test "${enable_vda}" == "yes"], + [AC_MSG_ERROR([vda is present but libavcodec/vda.h is missing])], + [AC_MSG_WARN([vda is present but libavcodec/vda.h is missing ])]) + ]) + ],[ + AS_IF([test "${enable_vda}" == "yes"], + [AC_MSG_ERROR([Could not find required VideoDecodeAcceleration/VDADecoder.h])], + [AC_MSG_WARN([VideoDecodeAcceleration/VDADecoder.h not found])]) + ]) + ],[ + AS_IF([test "x${enable_vda}" != "x"], [ + AC_MSG_ERROR([--enable-vda and --disable-avcodec options are mutually exclusive.]) + ]) + ]) + fi +]) dnl dnl stream_out switcher needs libavcodec @@ -2450,7 +2416,7 @@ AC_ARG_ENABLE(switcher, AS_IF([test "${enable_switcher}" = "yes"], [ AS_IF([test "x${have_avcodec}" = "xyes"], [ VLC_ADD_PLUGIN([stream_out_switcher]) - VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS $AVUTIL_LIBS]) + VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS $AVUTIL_LIBS $LIBM]) VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS $AVUTIL_CFLAGS]) ],[AC_MSG_ERROR([Stream_out switcher depends on avcodec]) ]) @@ -2545,24 +2511,19 @@ dnl dnl faad decoder plugin dnl AC_ARG_ENABLE(faad, -[ --enable-faad faad codec (default disabled)]) -if test "${enable_faad}" = "yes" -then - AC_ARG_WITH(faad-tree, - [ --with-faad-tree=PATH faad tree for static linking]) - if test -n "${with_faad_tree}" - then +[ --enable-faad faad codec (default auto)]) +if test "${enable_faad}" != "no"; then + AC_ARG_WITH(faad-tree, [ --with-faad-tree=PATH faad tree for static linking]) + if test -n "${with_faad_tree}"; then AC_MSG_CHECKING(for libfaad.a in ${with_faad_tree}) real_faad_tree="`cd ${with_faad_tree} 2>/dev/null && pwd`" - if test -z "${real_faad_tree}" - then + if test -z "${real_faad_tree}"; then dnl The given directory can't be found AC_MSG_RESULT(no) AC_MSG_ERROR([cannot cd to ${with_faad_tree}]) fi - if test -f "${real_faad_tree}/libfaad/.libs/libfaad.a" - then - dnl Use a custom faad + if test -f "${real_faad_tree}/libfaad/.libs/libfaad.a"; then + dnl Use the custom faad AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a) VLC_ADD_PLUGIN([faad]) VLC_ADD_LIBS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a]) @@ -2576,15 +2537,19 @@ then VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_faad}" LDFLAGS="${LDFLAGS} ${LIBS_faad}" - AC_CHECK_HEADERS(faad.h, , - [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ]) - AC_CHECK_LIB(faad, faacDecOpen, [ - VLC_ADD_PLUGIN([faad]) - VLC_ADD_LIBS([faad],[-lfaad]) ], - AC_CHECK_LIB(faad, NeAACDecOpen, [ - VLC_ADD_PLUGIN([faad]) - VLC_ADD_LIBS([faad],[-lfaad]) ], - [ AC_MSG_ERROR([Cannot find libfaad library...]) ])) + AC_CHECK_HEADERS(faad.h, + [ AC_CHECK_LIB(faad, faacDecOpen, [ + VLC_ADD_PLUGIN([faad]) + VLC_ADD_LIBS([faad],[-lfaad]) ], [ + AC_CHECK_LIB(faad, NeAACDecOpen, [ + VLC_ADD_PLUGIN([faad]) + VLC_ADD_LIBS([faad],[-lfaad]) ], [ + AS_IF([test "${enable_faad}" = "yes"], + [ AC_MSG_ERROR([Cannot find libfaad library...]) ], + [ AC_MSG_WARN([Cannot find libfaad library...]) ]) ]) ]) + ] , [ AS_IF([test "${enable_faad}" = "yes"], + [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ], + [ AC_MSG_WARN([Cannot find development headers for libfaad...]) ]) ]) VLC_RESTORE_FLAGS fi fi @@ -2734,6 +2699,11 @@ AS_IF([test "${enable_speex}" != "no"], [ ]) AM_CONDITIONAL([HAVE_SPEEXDSP], [test "$have_speexdsp" = "yes"]) +dnl +dnl Opus plugin +dnl +PKG_ENABLE_MODULES_VLC([OPUS], [], [ogg opus], [Opus support], [auto]) + dnl dnl theora decoder plugin dnl @@ -2767,6 +2737,60 @@ AC_CHECK_HEADERS(png.h, [ fi AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_png}" != "no"]) +dnl +dnl H264 encoder plugin (10-bit lib264) +dnl +AC_ARG_ENABLE(x26410b, + [ --enable-x26410b H264 10-bit encoding support with static libx264 (default disabled)]) +if test "${enable_x26410b}" != "no"; then +AC_ARG_WITH(x26410b-tree, + [ --with-x26410b-tree=PATH H264 10-bit encoding module with libx264 (static linking)],[],[]) + if test "${with_x26410b_tree}" != "no" -a -n "${with_x26410b_tree}" + then + real_x26410b_tree="̧`cd ${with_x26410b_tree} 2>/dev/null && pwd`" + if test -z "${real_x26410b_tree}" + then + AC_MSG_RESULT(no) + AC_MSG_ERROR([${with_x26410b_tree} directory does not exist]) + fi + AC_MSG_CHECKING(for x264.h in ${real_x26410b_tree}) + if test -f ${with_x26410b_tree}/x264_config.h + then + AC_MSG_RESULT(yes) + AC_MSG_CHECKING(for 10-bit build of x264) + if grep -q "BIT_DEPTH.*10" ${with_x26410b_tree}/x264_config.h ;then + AC_MSG_RESULT(yes) + VLC_ADD_PLUGIN([x26410b]) + VLC_ADD_CFLAGS([x26410b],[-I${with_x26410b_tree}]) + VLC_ADD_LIBS([x26410b],[-L${with_x26410b_tree} -lm -lpthread -lx264]) + else + AC_MSG_RESULT(no) + AC_MSG_ERROR([${with_x26410b_tree} isnt build 10-bit]) + fi + else + AC_MSG_RESULT(no) + AC_MSG_ERROR([${with_x26410b_tree} doesnt have x264_config.h]) + fi + else + PKG_CHECK_MODULES(X26410B, x26410b, [ + VLC_ADD_PLUGIN([x26410b]) + VLC_ADD_LDFLAGS([x26410b],[${X26410B_LIBS}]) + AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ + VLC_ADD_LIBS([x26410b],[-Wl,-Bsymbolic]) + ]) + VLC_ADD_CFLAGS([x26410b],[${X26410B_CFLAGS}]) + if echo ${X26410B_LIBS} |grep -q 'pthreadGC2'; then + VLC_ADD_CFLAGS([x26410b], [-DPTW32_STATIC_LIB]) + fi + ], [ + if test "${enable_x26410b}" = "yes"; then + AC_MSG_ERROR([x26410b module doesn't work without staticly compiled libx264.a]) + fi + ]) + fi +fi + + dnl dnl H264 encoder plugin (using libx264) dnl @@ -2829,7 +2853,7 @@ fi dnl dnl libfluidsynth (MIDI synthetizer) plugin dnl -PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth >= 1.1.0], [MIDI synthetiser with libfluidsynth], [auto]) +PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth >= 1.1.2], [MIDI synthetiser with libfluidsynth], [auto]) dnl dnl Teletext Modules @@ -2957,7 +2981,7 @@ dnl X C Bindings modules dnl AC_ARG_ENABLE(xcb, [ --enable-xcb X11 support with XCB (default enabled)],, [ - AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin" -a "${SYS}" != "symbian"], [ + AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" -a "${SYS}" != "symbian"], [ enable_xcb="yes" ], [ enable_xcb="no" @@ -3160,46 +3184,53 @@ dnl dnl Windows DirectX module dnl -if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" +if test "${SYS}" = "mingw32" then VLC_ADD_PLUGIN([panoramix]) fi AC_ARG_ENABLE(directx, - [ --enable-directx Win32 DirectX support (default enabled on Win32)]) -if test "${enable_directx}" != "no"; then - if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then - dnl DDraw - AC_CHECK_HEADERS(ddraw.h, - [ VLC_ADD_PLUGIN([directx aout_directx]) - VLC_ADD_LIBS([directx],[-luser32 -lgdi32]) - ],[AC_MSG_ERROR([Cannot find DirectX headers!])] - ) - - dnl OpenGL - AC_CHECK_HEADERS(GL/wglew.h, - [ VLC_ADD_PLUGIN([glwin32]) - VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32]) - ],[],[ - #include - #include - ]) + [AS_HELP_STRING([--enable-directx], + [Microsoft DirectX support (default enabled on Windows)])],, [ + AS_IF([test "${SYS}" = "mingw32"], [ + enable_directx="yes" + ], [ + enable_directx="no" + ]) +]) +have_directx="no" +AS_IF([test "${enable_directx}" != "no"], [ + dnl DirectDraw + AC_CHECK_HEADERS(ddraw.h, [ + have_directx="yes" + ], [ + AC_MSG_ERROR([Cannot find DirectX headers!]) + ]) - dnl Direct3D - AC_CHECK_HEADERS(d3d9.h, - [ VLC_ADD_PLUGIN([direct3d]) - VLC_ADD_LIBS([direct3d],[-lgdi32]) - ]) - VLC_ADD_LIBS([direct3d directx glwin32],[-lole32 -luuid]) - fi -fi + dnl OpenGL + AC_CHECK_HEADERS(GL/wglew.h, [ + VLC_ADD_PLUGIN([glwin32]) + VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32]) + ],, [ + #include + #include + ]) + + dnl Direct3D + AC_CHECK_HEADERS(d3d9.h, [ + VLC_ADD_PLUGIN([direct3d]) + VLC_ADD_LIBS([direct3d],[-lgdi32]) + ]) + VLC_ADD_LIBS([direct3d glwin32],[-lole32 -luuid]) +]) +AM_CONDITIONAL([HAVE_DIRECTX], [test "$have_directx" = "yes"]) dnl dnl Windows Direct2D plugin dnl AC_ARG_ENABLE(direct2d, [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)],, [ - AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ + AS_IF([test "${SYS}" != "mingw32"], [ enable_direct2d="no" ]) ]) @@ -3222,11 +3253,6 @@ if test "${enable_wingdi}" != "no"; then VLC_ADD_PLUGIN([wingdi]) VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32 -luuid]) fi - if test "${SYS}" = "mingwce"; then - VLC_ADD_PLUGIN([wingdi wingapi]) - VLC_ADD_LIBS([wingdi],[-laygshell]) - VLC_ADD_LIBS([wingapi],[-laygshell]) - fi fi @@ -3412,7 +3438,7 @@ dnl AC_ARG_ENABLE(oss, [AS_HELP_STRING([--enable-oss], [support the Open Sound System OSS (default enabled on FreeBSD/NetBSD/DragonFlyBSD)])],, [ - AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "mingwce" -o "$SYS" = "linux" -o "$SYS" = "openbsd"], [ + AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "linux" -o "$SYS" = "openbsd"], [ enable_oss="no" ]) ]) @@ -3447,6 +3473,25 @@ AS_IF([test "$enable_sndio" != "no"], [ ]) AM_CONDITIONAL([HAVE_SNDIO], [test "${have_sndio}" = "yes"]) +dnl +dnl Windows Audio Session plugin +dnl +AC_ARG_ENABLE([wasapi], + [AS_HELP_STRING([--enable-wasapi], + [use the Windows Audio Session API (default auto)]) +]) +have_wasapi="no" +AS_IF([test "$enable_wasapi" != "no"], [ + AC_CHECK_HEADER([audioclient.h], [ + have_wasapi="yes" + ], [ + AS_IF([test "x${enable_wasapi}" != "x"], [ + AC_MSG_ERROR([Windows Audio Session API not found.]) + ]) + ]) +]) +AM_CONDITIONAL([HAVE_WASAPI], [test "${have_wasapi}" = "yes"]) + dnl dnl win32 waveOut plugin dnl @@ -3457,9 +3502,6 @@ if test "${enable_waveout}" != "no"; then VLC_ADD_PLUGIN([waveout]) VLC_ADD_LIBS([waveout],[-lwinmm]) fi - if test "${SYS}" = "mingwce"; then - VLC_ADD_PLUGIN([waveout]) - fi fi dnl @@ -3540,90 +3582,71 @@ dnl EXTEND_HELP_STRING([Interface plugins:]) dnl -dnl Hildon UI +dnl QT dnl -AC_ARG_ENABLE(hildon, - [ --enable-hildon Hildon touchscreen UI (default disabled)]) -AS_IF([test "${enable_hildon}" = "yes"], [ - PKG_CHECK_MODULES(HILDON, [hildon-1], [ - PKG_CHECK_MODULES(HILDON_FM, hildon-fm-2, [ - VLC_ADD_CFLAGS([hildon],[${HILDON_FM_CFLAGS} -DHAVE_HILDON_FM]) - VLC_ADD_LIBS([hildon],[${HILDON_FM_LIBS}]) - ], [ - AC_MSG_WARN([${HILDON_FM_PKG_ERRORS}.]) - ]) - VLC_ADD_CFLAGS([hildon],[${HILDON_CFLAGS} ${X_CFLAGS}]) - VLC_ADD_LIBS([hildon],[${HILDON_LIBS} ${X_LIBS} ${X_PRE_LIBS} -lX11]) - VLC_ADD_PLUGIN([hildon]) - ALIASES="${ALIASES} mvlc" - ], [ - AS_IF([test "${enable_hildon}" = "yes"],[ - AC_MSG_ERROR([${HILDON_PKG_ERRORS}.]) +AC_ARG_ENABLE(qt, [ + AS_HELP_STRING([--disable-qt], [Qt UI support (default enabled)])],, [ + AS_IF([test "${SYS}" = "darwin"], [ + enable_qt="no" + ]) +]) +AS_IF([test "${enable_qt}" != "no"], [ + PKG_CHECK_MODULES([QT], [QtCore >= 5 QtWidgets QtGui],, [ + PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [ + AS_IF([test -n "${enable_qt}"],[ + AC_MSG_ERROR([${QT_PKG_ERRORS}.]) + ],[ + AC_MSG_WARN([${QT_PKG_ERRORS}.]) + ]) + enable_qt="no" ]) - enable_hildon="no" ]) ]) -AM_CONDITIONAL(BUILD_HILDON, [test "${enable_hildon}" = "yes"]) +AS_IF([test "${enable_qt}" != "no"], [ + VLC_ADD_PLUGIN([qt4]) + VLC_ADD_LIBS([qt4],[${QT_LIBS}]) + VLC_ADD_CXXFLAGS([qt4],[${QT_CFLAGS}]) + ALIASES="${ALIASES} qvlc" -dnl -dnl QT 4 -dnl -AC_ARG_ENABLE(qt4, - [ --enable-qt4 Qt 4 support (default enabled) ],, [ - AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no]) -]) -AS_IF([test "${enable_qt4}" != "no"], [ - PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.6.0], [ - VLC_ADD_PLUGIN([qt4]) - VLC_ADD_LIBS([qt4],[${QT4_LIBS}]) - VLC_ADD_CXXFLAGS([qt4],[${QT4_CFLAGS}]) - ALIASES="${ALIASES} qvlc" - - AC_LANG_PUSH([C++]) - VLC_SAVE_FLAGS + AC_LANG_PUSH([C++]) + VLC_SAVE_FLAGS - AC_MSG_CHECKING([whether Qt uses X11]) - CPPFLAGS="${CPPFLAGS} ${QT4_CFLAGS}" - AC_PREPROC_IFELSE([AC_LANG_SOURCE([ + AC_MSG_CHECKING([whether Qt uses Xlib]) + CPPFLAGS="${CPPFLAGS} ${QT_CFLAGS}" + 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]) - VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}]) - ], [ - AC_MSG_RESULT([no]) - ]) + ])], [ + AC_MSG_RESULT([yes]) + VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11]) + VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}]) + ], [ + AC_MSG_RESULT([no]) + ]) - VLC_RESTORE_FLAGS - AC_LANG_POP([C++]) + VLC_RESTORE_FLAGS + AC_LANG_POP([C++]) - AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ - VLC_ADD_LIBS([qt4],[-lole32]) - ]) - AS_IF([test "${SYS}" = "darwin" ],[ - 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) - AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin) - ], [ - AS_IF([test -n "${enable_qt4}"],[ - AC_MSG_ERROR([${QT4_PKG_ERRORS}.]) - ],[ - AC_MSG_WARN([${QT4_PKG_ERRORS}.]) - ]) - enable_qt4="no" + AS_IF([test "${SYS}" = "mingw32"], [ + VLC_ADD_LIBS([qt4],[-lole32]) + ]) + AS_IF([test "${SYS}" = "darwin" ],[ + VLC_ADD_LIBS([qt4], [-Wl,-framework,Cocoa]) ]) + + QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" + AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin]) + AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin]) + AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [${QT_PATH}/bin]) ]) -AM_CONDITIONAL(ENABLE_QT4, [test "x$enable_qt4" != "xno"]) +AM_CONDITIONAL(ENABLE_QT4, [test "$enable_qt" != "no"]) dnl dnl Simple test for skins2 dependency dnl -AS_IF([test "x$enable_qt4" = "xno"], [ +AS_IF([test "$enable_qt" = "no"], [ AS_IF([test "${enable_skins2}" = "yes"], [ AC_MSG_ERROR([The skins2 module depends on the Qt4 interface. Without it you will not be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the Qt4 development package or alternatively you can also configure with: --disable-qt4 --disable-skins2.]) ], [ @@ -3642,24 +3665,24 @@ AS_IF([test "${enable_skins2}" != "no"], [ dnl Win32 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_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -DWIN32_SKINS]) VLC_ADD_LIBS([skins2],[-lgdi32 -lole32 -luuid -lmsimg32]) dnl MacOS ], [test "${SYS}" = "darwin"], [ - VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS]) - VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) + VLC_ADD_CPPFLAGS([skins2],[ -DMACOSX_SKINS]) VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon]) dnl Linux/Unix ], [ PKG_CHECK_MODULES([XPM], [xpm],, [have_skins_deps="no"]) PKG_CHECK_MODULES([XINERAMA], [xinerama],, [have_skins_deps="no"]) PKG_CHECK_MODULES([XEXT], [xext],, [have_skins_deps="no"]) - VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} ${XEXT_CFLAGS} ${XPM_CFLAGS} -DX11_SKINS]) - VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) + VLC_ADD_CPPFLAGS([skins2],[${X_CFLAGS} ${XEXT_CFLAGS} ${XPM_CFLAGS} -DX11_SKINS]) VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} ${XINERAMA_LIBS} -lX11]) ]) + dnl for All OSes + VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) + dnl we need freetype AS_IF([test "${have_freetype}" != "yes"], [ have_skins_deps="no" @@ -3699,7 +3722,7 @@ then VLC_ADD_OBJCFLAGS([macosx minimal_macosx], [-fobjc-exceptions] ) VLC_ADD_PLUGIN([macosx minimal_macosx]) - VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration]) if test ! -d ${CONTRIB_DIR}/Sparkle.framework then @@ -3734,58 +3757,18 @@ dnl ncurses module dnl AC_ARG_ENABLE(ncurses, [AS_HELP_STRING([--disable-ncurses],[ncurses text-based interface (default auto)])]) -if test "${enable_ncurses}" != "no"; then - VLC_SAVE_FLAGS - LIBS="" - AC_CHECK_HEADER(ncurses.h, [ - AC_CHECK_LIB(ncursesw, mvprintw, [ - AC_SEARCH_LIBS([tgetent], [ncursesw tinfow tinfo], [ - VLC_ADD_PLUGIN([ncurses]) - ALIASES="${ALIASES} nvlc" - VLC_ADD_LIBS([ncurses],[-lncursesw ${LIBS}]) - ], [ - AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([tgetent not found])]) - ]) - ], [ - AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([libncursesw not found])]) - ]) +AS_IF([test "${enable_ncurses}" != "no"] ,[ + PKG_CHECK_MODULES([NCURSES], [ncursesw], [ + VLC_ADD_PLUGIN([ncurses]) + VLC_ADD_CFLAGS([ncurses],[${NCURSES_CFLAGS}]) + VLC_ADD_LIBS([ncurses],[${NCURSES_LIBS}]) + ALIASES="${ALIASES} nvlc" ], [ - AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([ncurses.h not found])]) - ]) - VLC_RESTORE_FLAGS -fi - -dnl -dnl XOSD plugin -dnl -AC_ARG_ENABLE(xosd, - [ --enable-xosd xosd interface support (default disabled)]) -if test "${enable_xosd}" = "yes" -then - AC_CHECK_HEADERS(xosd.h, - AC_CHECK_LIB(xosd, xosd_set_horizontal_offset, [ - AS_IF([test "${no_x}" != "yes"], [ - VLC_ADD_PLUGIN([xosd]) - VLC_ADD_LIBS([xosd],[-lxosd ${X_LIBS} ${X_PRE_LIBS} -lX11]) - VLC_ADD_CFLAGS([xosd],[${X_CFLAGS}]) - ],[ - AC_MSG_ERROR([Xlib is required with xosd.]) - ]) + AS_IF([test -n "${enable_ncurses}"], [ + AC_MSG_ERROR([${NCURSES_PKG_ERRORS}.]) ]) - ) -fi - -dnl -dnl Framebuffer (overlay) plugin -dnl -AC_ARG_ENABLE(fbosd, - [ --enable-fbosd fbosd interface support (default disabled)]) -if test "${enable_fbosd}" = "yes" -then - AC_CHECK_HEADERS(linux/fb.h, [ - VLC_ADD_PLUGIN([fbosd]) - ]) -fi + ]) +]) dnl dnl Lirc plugin @@ -3839,6 +3822,23 @@ AS_IF([test "${enable_projectm}" != "no"], ]) ]) +dnl +dnl Vovoid VSXu visualization plugin +dnl +AC_ARG_ENABLE(vsxu, + [ --enable-vsxu Vovoid VSXu visualization plugin (default auto)]) +AS_IF([test "${enable_vsxu}" != "no"], + [ + PKG_CHECK_MODULES(VSXU, libvsxu, + [ + VLC_ADD_PLUGIN([vsxu]) + VLC_ADD_CXXFLAGS([vsxu],[$VSXU_CFLAGS]) + VLC_ADD_LIBS([vsxu],[$VSXU_LIBS]) + ],[ + AC_MSG_WARN([${VSXU_PKG_ERRORS}.]) + ]) + ]) + dnl dnl AtmoLight (homemade Philips Ambilight clone) dnl @@ -3919,7 +3919,7 @@ AS_IF([test "${have_libgcrypt}" != "yes"], [ enable_gnutls="no" ]) AS_IF([test "${enable_gnutls}" != "no"], [ - PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.0.0], [ + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.6.6], [ VLC_ADD_PLUGIN([gnutls]) ], [ AS_IF([test -n "${enable_gnutls}"], [ @@ -3947,7 +3947,7 @@ AC_ARG_ENABLE(taglib, [AS_HELP_STRING([--disable-taglib], [do not use TagLib (default enabled)])]) AS_IF([test "${enable_taglib}" != "no"], [ - PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5, [ + 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]) @@ -3979,9 +3979,9 @@ AC_ARG_ENABLE(growl, [ --enable-growl growl notification plugin (default disabled)],, [enable_growl=no]) AS_IF([test "${enable_growl}" != "no"], [ - AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl.framework/Versions/A/Headers/GrowlDefines.h, [ + AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl.framework/Versions/A/Headers/Growl.h, [ VLC_ADD_PLUGIN([growl]) - VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR} -Wl,-framework,Growl,-framework,CoreFoundation]) + VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR} -Wl,-framework,Growl,-framework,Foundation]) VLC_ADD_OBJCFLAGS([growl], [-F${CONTRIB_DIR}]) VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] ) ]) @@ -4044,7 +4044,7 @@ AC_ARG_WITH(kde-solid, AS_HELP_STRING([--with-kde-solid=PATH], [KDE Solid actions directory (auto)]),, [ -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin" ; then +if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ; then with_kde_solid="yes" fi ]) @@ -4111,9 +4111,9 @@ AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_REVISION) AC_SUBST(VERSION_EXTRA) AC_SUBST(COPYRIGHT_YEARS) -AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) +AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami|sed -e 's/\\\/\\\\\\\/g'`", [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]) +AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1 | sed -e 's/ *$//'`", [compiler]) dnl dnl Handle substvars that use $(top_srcdir) dnl @@ -4146,7 +4146,6 @@ AC_CONFIG_FILES([ share/Makefile compat/Makefile src/Makefile - src/test/Makefile lib/Makefile bin/Makefile test/Makefile @@ -4186,7 +4185,6 @@ AC_CONFIG_FILES([ modules/demux/playlist/Makefile modules/gui/Makefile modules/gui/macosx/Makefile - modules/gui/hildon/Makefile modules/gui/minimal_macosx/Makefile modules/gui/macosx_dialog_provider/Makefile modules/gui/qt4/Makefile @@ -4216,8 +4214,6 @@ AC_CONFIG_FILES([ modules/visualization/Makefile modules/visualization/visual/Makefile modules/mmx/Makefile - modules/mmxext/Makefile - modules/3dnow/Makefile modules/sse2/Makefile modules/altivec/Makefile modules/arm_neon/Makefile