X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=eff49952f952dae46e79f463ab59b06aa58d8655;hb=89089ebc9f7625b7317262803394d96139325e54;hp=7ae5cf180a2deed9afb095a758982090a703dc35;hpb=de0f5ec7160c9609c7d9bdf8affb38d642a8e598;p=vlc diff --git a/configure.ac b/configure.ac index 7ae5cf180a..eff49952f9 100644 --- a/configure.ac +++ b/configure.ac @@ -2,9 +2,9 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 2002-2014 VLC authors and VideoLAN]) -AC_INIT(vlc, 2.2.0-git) -VERSION_MAJOR=2 -VERSION_MINOR=2 +AC_INIT(vlc, 3.0.0-git) +VERSION_MAJOR=3 +VERSION_MINOR=0 VERSION_REVISION=0 VERSION_EXTRA=0 VERSION_DEV=git @@ -13,7 +13,7 @@ PKGDIR="vlc" AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" -CODENAME="Weatherwax" +CODENAME="Vetinari" COPYRIGHT_YEARS="1996-2014" AC_CONFIG_SRCDIR(src/libvlc.c) @@ -56,7 +56,11 @@ AC_PROG_CC_C99 AC_USE_SYSTEM_EXTENSIONS AC_DEFINE([_FORTIFY_SOURCE], 2, [Define to 2 to get glibc warnings.]) AC_DEFINE([_FILE_OFFSET_BITS], 64, [Define to 64 for large files support.]) -AC_DEFINE([_REENTRANT],, [Define to expose reentrant functions.]) +AH_TOP([ +#ifndef _REENTRANT +# define _REENTRANT +#endif +]) AC_DEFINE([_THREAD_SAFE],, [Same as _REENTANT for some other OSes.]) AC_DEFINE([__LIBVLC__],, [Define within the LibVLC source code tree.]) AC_DEFINE([WIN32_LEAN_AND_MEAN],, [Define to limit the scope of .]) @@ -171,7 +175,6 @@ 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([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit]) - VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x262 x264 x26410b],[-Wl,-read_only_relocs,suppress]) VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices]) AC_EGREP_CPP(yes, @@ -227,6 +230,14 @@ case "${host_os}" in AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.]) AC_DEFINE([_UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.]) AC_DEFINE([UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.]) + AC_DEFINE([_ISOC99_SOURCE], [1], [Extensions to ISO C89 from ISO C99.]) + AC_DEFINE([_ISOC11_SOURCE], [1], [Extensions to ISO C99 from ISO C11.]) + AC_DEFINE([_POSIX_SOURCE], [1], [IEEE Std 1003.1.]) + AC_DEFINE([_POSIX_C_SOURCE], [200809L], [IEEE Std 1003.1.]) + AC_DEFINE([_XOPEN_SOURCE], [700], [POSIX and XPG 7th edition]) + AC_DEFINE([_XOPEN_SOURCE_EXTENDED], [1], [XPG things and X/Open Unix extensions.]) + AC_DEFINE([_BSD_SOURCE], [1], [ISO C, POSIX, and 4.3BSD things.]) + AC_DEFINE([_SVID_SOURCE], [1], [ISO C, POSIX, and SVID things.]) case "${host_os}" in *mingw32*) @@ -625,7 +636,7 @@ AC_CHECK_FUNCS([if_nameindex if_nametoindex]) VLC_RESTORE_FLAGS AS_IF([test -n "$SOCKET_LIBS"], [ - VLC_ADD_LIBS([access_rtmp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp oldrc netsync gnutls ts remoteosd audiobargraph_a],[${SOCKET_LIBS}]) + VLC_ADD_LIBS([access_rtmp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp oldrc netsync ts remoteosd audiobargraph_a],[${SOCKET_LIBS}]) ]) AC_SUBST(SOCKET_LIBS) @@ -742,25 +753,19 @@ AS_IF([test "${SYS}" != "mingw32"], [ AC_SUBST(LIBPTHREAD) dnl Check for headers -AC_CHECK_HEADERS([search.h]) -AC_CHECK_HEADERS(getopt.h locale.h xlocale.h) -AC_CHECK_HEADERS([sys/time.h sys/ioctl.h]) -AC_CHECK_HEADERS([arpa/inet.h netinet/udplite.h sys/eventfd.h]) +dnl POSIX +AC_CHECK_HEADERS([arpa/inet.h pthread.h search.h syslog.h sys/shm.h sys/socket.h]) AC_CHECK_HEADERS([net/if.h], [], [], - [ - #include - #include - ]) -AC_CHECK_HEADERS([sys/mount.h], [], [], - [ - #include - ]) - -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" +[ +#include +#include +]) +dnl BSD +AC_CHECK_HEADERS([netinet/udplite.h sys/param.h sys/mount.h]) +dnl GNU/Linux +AC_CHECK_HEADERS([getopt.h linux/dccp.h linux/magic.h mntent.h sys/eventfd.h]) +dnl MacOS +AC_CHECK_HEADERS([xlocale.h]) 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 @@ -768,11 +773,6 @@ AC_CHECK_TYPE(ssize_t,, [ AC_DEFINE(ssize_t, int) ]) -dnl Check for threads library -if test "${SYS}" != "mingw32"; then - AC_CHECK_HEADERS(pthread.h) -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, dnl it is nested within a conditional block, so it was not working right. @@ -860,7 +860,7 @@ dnl dnl Compiler warnings dnl -RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration]) +RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration init-self logical-op]) RDC_PROG_CC_FLAGS([-pipe]) AC_LANG_PUSH([C++]) RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var]) @@ -946,7 +946,7 @@ dnl Check for various optimization flags AS_IF([test "${enable_optimizations}" != "no"], [ dnl -O4 and -O3 only in production builds - AS_IF([test "{enable_debug}" = "no"], [ + AS_IF([test "${enable_debug}" = "no"], [ VLC_SAVE_FLAGS CFLAGS="${CFLAGS} -O4" CXXFLAGS="${CXXFLAGS} -O4" @@ -1399,9 +1399,9 @@ AS_IF([test "${enable_altivec}" = "yes"], [ [ac_cv_altivec_inline], [AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], ac_cv_altivec_inline="yes", - [CFLAGS="${CFLAGS} -Wa,-m7400" + [CFLAGS="${CFLAGS} -Wa,-maltivec" AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], - [ac_cv_altivec_inline="-Wa,-m7400"], + [ac_cv_altivec_inline="-Wa,-maltivec"], ac_cv_altivec_inline=no) ])]) VLC_RESTORE_FLAGS @@ -1528,7 +1528,7 @@ then AS_IF([test "${LUAC}" = "false"], [ AC_MSG_ERROR([Could not find the LUA byte compiler.]) ]) - AS_IF([test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}"/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|tr -s ' '|cut -d' ' -f2` != 0404], [ + AS_IF([test -d "${CONTRIB_DIR}" -a -f "${CONTRIB_DIR}/lib/liblua.a" -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|tr -s ' '|cut -d' ' -f2` != 0404], [ AC_MSG_ERROR([You need 32-bits luac when using using lua from contrib.]) ]) fi @@ -1583,6 +1583,11 @@ dnl EXTEND_HELP_STRING([Input plugins:]) +dnl +dnl libarchive access module +dnl +PKG_ENABLE_MODULES_VLC([ARCHIVE], [access_archive], [libarchive >= 2.8.5], (libarchive support), [auto]) + dnl dnl live555 input dnl @@ -1699,7 +1704,7 @@ PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread > 4.9.0], [dvdread input module], dnl dnl libdvdnav plugin dnl -PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav >= 4.2.1], [DVD with navigation input module (dvdnav)], [auto]) +PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 4.9.0], [DVD with navigation input module (dvdnav)], [auto]) dnl dnl Blu-ray Disc Support with libbluray @@ -1718,6 +1723,10 @@ dnl PKG_ENABLE_MODULES_VLC([SMBCLIENT], [smb], [smbclient], (SMB/CIFS support), [auto]) AS_IF([test "${SYS}" = "mingw32"], [ VLC_ADD_PLUGIN([access_smb]) ]) +dnl +dnl liBDSM access module +dnl +PKG_ENABLE_MODULES_VLC([DSM], [dsm], [libdsm], [libdsm SMB/CIFS access/sd module], [auto]) dnl dnl sftp access support @@ -2001,7 +2010,7 @@ dnl PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto]) PKG_CHECK_MODULES(LIBVORBIS, [vorbis >= 1.1], [ AC_DEFINE(HAVE_LIBVORBIS, 1, [Define to 1 if you have the libvorbis]) -],[]) +],[true]) PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto], [${LIBVORBIS_CFLAGS}], [${LIBVORBIS_LIBS}]) if test "${enable_sout}" != "no"; then PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg mux support], [auto]) @@ -2070,6 +2079,7 @@ if test "${enable_mod}" != "no" ; then PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.4 libmodplug != 0.8.8], [ VLC_ADD_PLUGIN([mod]) VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS]) + VLC_ADD_CFLAGS([mod],[$LIBMODPLUG_CFLAGS]) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS]) ],[ AS_IF([test -n "${enable_mod}"], @@ -2146,33 +2156,6 @@ then VLC_ADD_CFLAGS([omxil omxil_vout],[-DRPI_OMX]) fi -dnl -dnl MMAL codec plugin -dnl -AC_ARG_ENABLE(mmal-codec, - AS_HELP_STRING([--enable-mmal-codec], - [Multi-Media Abstraction Layer (MMAL) based codec plugin for Raspberry Pi (default enable)])) -if test "${enable_mmal_codec}" != "no"; then - VLC_SAVE_FLAGS - LDFLAGS="${LDFLAGS} -L/opt/vc/lib" - CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux" - AC_CHECK_HEADERS(interface/mmal/mmal.h, - [ AC_CHECK_LIB(bcm_host, bcm_host_init, [ - VLC_ADD_PLUGIN([mmal_codec]) - VLC_ADD_LDFLAGS([mmal_codec],[ -L/opt/vc/lib ]) - VLC_ADD_CFLAGS([mmal_codec],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ]) - VLC_ADD_LIBS([mmal_codec],[ -lbcm_host -lmmal ]) ], [ - AS_IF([test "${enable_mmal_codec}" = "yes"], - [ AC_MSG_ERROR([Cannot find bcm library...]) ], - [ AC_MSG_WARN([Cannot find bcm library...]) ]) - ], - []) - ] , [ AS_IF([test "${enable_mmal_codec}" = "yes"], - [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ], - [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ]) - VLC_RESTORE_FLAGS -fi - dnl dnl CrystalHD codec plugin dnl @@ -2308,7 +2291,7 @@ dnl AC_ARG_ENABLE(avcodec, [ --enable-avcodec libavcodec codec (default enabled)]) AS_IF([test "${enable_avcodec}" != "no"], [ - PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 54.25.0 libavutil >= 52.0.0], [ dnl PKG_CHECK_EXISTS([libavcodec < 56],, [ dnl AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.]) dnl ]) @@ -2759,6 +2742,11 @@ dnl theora decoder plugin dnl PKG_ENABLE_MODULES_VLC([THEORA], [], [ogg theoradec >= 1.0 theoraenc], [experimental theora codec], [auto]) +dnl +dnl Daala decoder plugin +dnl +PKG_ENABLE_MODULES_VLC([DAALA], [], [ogg daaladec daalaenc], [experimental daala codec], [disabled]) + dnl dnl schroedinger decoder plugin (for dirac format video) dnl @@ -3010,6 +2998,24 @@ AS_IF( [test "${enable_libass}" != "no"], [ ]) ]) +dnl +dnl ARIB subtitles rendering module +dnl +AC_ARG_ENABLE(aribsub, + [ --enable-aribsub ARIB Subtitles support (default enabled)]) +AS_IF( [test "${enable_aribsub}" != "no" ],[ + PKG_CHECK_MODULES(ARIBB24, [aribb24 >= 1.0.1], [ + have_aribb24="yes" + VLC_ADD_PLUGIN([aribsub]) + VLC_ADD_LIBS([aribsub],[-laribb24]) + AC_DEFINE(HAVE_ARIBB24, 1, [Define if libaribb24 is available.]) + ],[ + AC_MSG_WARN(Library [aribb24] needed for [aribsub] was not found) + have_aribb24="no" + ]) + AM_CONDITIONAL([HAVE_ARIBB24], [test "${have_aribb24}" = "yes"]) +]) + dnl dnl kate decoder plugin dnl @@ -3156,20 +3162,38 @@ AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [ libav) av_vdpau_ver="55.26.0" ;; ffmpeg) av_vdpau_ver="55.42.100" ;; esac - PKG_CHECK_EXISTS([libavutil >= 0.52.4 libavcodec >= ${av_vdpau_ver}], [ + PKG_CHECK_EXISTS([libavutil >= 52.4.0 libavcodec >= ${av_vdpau_ver}], [ have_avcodec_vdpau="yes" AC_MSG_NOTICE([VDPAU decoding acceleration activated]) ], [ AS_IF([test -n "${enable_vdpau}"], [ - AC_MSG_ERROR([libavutil >= 0.52.4 and libavcodec >= 55.26.0 are required for VDPAU decoding.]) + AC_MSG_ERROR([libavutil >= 52.4.0 and libavcodec >= 55.26.0 are required for VDPAU decoding.]) ], [ - AC_MSG_WARN([libavutil >= 0.52.4 and libavcodec >= 55.26.0 are required for VDPAU decoding.]) + AC_MSG_WARN([libavutil >= 52.4.0 and libavcodec >= 55.26.0 are required for VDPAU decoding.]) ]) ]) ]) AM_CONDITIONAL([HAVE_AVCODEC_VDPAU], [test "${have_avcodec_vdpau}" = "yes"]) +dnl +dnl Wayland +dnl +AC_ARG_ENABLE(wayland, + [AS_HELP_STRING([--enable-wayland], [Wayland support (default auto)])]) +have_wayland="no" +AS_IF([test "${enable_wayland}" != "no"], [ + PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= 1.5.91], [ + have_wayland="yes" + ], [ + AS_IF([test -n "${enable_wayland}"], [ + AC_MSG_ERROR([${WAYLAND_CLIENT_PKG_ERRORS}.]) + ]) + ]) +]) +AM_CONDITIONAL([HAVE_WAYLAND], [test "${have_wayland}" = "yes"]) + + dnl dnl SDL module dnl @@ -3469,31 +3493,33 @@ AC_SUBST(KVA_LIBS) AM_CONDITIONAL([HAVE_KVA], [test "${have_kva}" = "yes"]) dnl -dnl MMAL vout plugin +dnl MMAL plugin dnl -AC_ARG_ENABLE(mmal-vout, - AS_HELP_STRING([--enable-mmal-vout], - [Multi-Media Abstraction Layer (MMAL) based vout plugin for Raspberry Pi (default enable)])) -if test "${enable_mmal_vout}" != "no"; then +AC_ARG_ENABLE(mmal, + AS_HELP_STRING([--enable-mmal], + [Multi-Media Abstraction Layer (MMAL) hardware plugin (default enable)])) +if test "${enable_mmal}" != "no"; then VLC_SAVE_FLAGS LDFLAGS="${LDFLAGS} -L/opt/vc/lib" CPPFLAGS="${CPPFLAGS} -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux" AC_CHECK_HEADERS(interface/mmal/mmal.h, [ AC_CHECK_LIB(bcm_host, vc_tv_unregister_callback_full, [ - VLC_ADD_PLUGIN([mmal_vout]) - VLC_ADD_LDFLAGS([mmal_vout],[ -L/opt/vc/lib ]) - VLC_ADD_CFLAGS([mmal_vout],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ]) - VLC_ADD_LIBS([mmal_vout],[ -lbcm_host -lmmal ]) ], [ - AS_IF([test "${enable_mmal_vout}" = "yes"], + have_mmal="yes" + VLC_ADD_PLUGIN([mmal]) + VLC_ADD_LDFLAGS([mmal],[ -L/opt/vc/lib ]) + VLC_ADD_CFLAGS([mmal],[ -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux ]) + VLC_ADD_LIBS([mmal],[ -lbcm_host -lmmal ]) ], [ + AS_IF([test "${enable_mmal}" = "yes"], [ AC_MSG_ERROR([Cannot find bcm library...]) ], [ AC_MSG_WARN([Cannot find bcm library...]) ]) ], []) - ] , [ AS_IF([test "${enable_mmal_vout}" = "yes"], + ] , [ AS_IF([test "${enable_mmal}" = "yes"], [ AC_MSG_ERROR([Cannot find development headers for mmal...]) ], [ AC_MSG_WARN([Cannot find development headers for mmal...]) ]) ]) VLC_RESTORE_FLAGS fi +AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"]) dnl dnl Audio plugins @@ -3509,23 +3535,11 @@ AC_ARG_ENABLE(pulse, [use the PulseAudio client library (default auto)])]) have_pulse="no" AS_IF([test "${enable_pulse}" != "no"], [ - PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.22], [ + PKG_CHECK_MODULES([PULSE], [libpulse >= 1.0], [ have_pulse="yes" ], [ - 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.]) - ]) + AS_IF([test "x${enable_pulse}" != "x"], [ + AC_MSG_ERROR([$PULSE_PKG_ERRORS. PulseAudio 1.0 or later required.]) ]) ]) ]) @@ -3720,10 +3734,17 @@ AC_ARG_ENABLE(qt, [ ]) AS_IF([test "${enable_qt}" != "no"], [ PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [ + PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [ + VLC_ADD_LIBS([qt4],[${QTX11_LIBS}]) + VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11]) + ],[ + AC_MSG_WARN([Not building Qt Interface with X11 helpers.]) + ]) QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)" - AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) - AC_PATH_PROG(RCC, [rcc-qt5 rcc], rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) - AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) + QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)" + AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, [${QT_HOST_PATH} ${QT_PATH}/bin ${CONTRIB_DIR}/bin]) + AC_PATH_PROG(RCC, [rcc-qt5 rcc], rcc, [${QT_HOST_PATH} ${QT_PATH}/bin ${CONTRIB_DIR}/bin]) + AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, [${QT_HOST_PATH} ${QT_PATH}/bin ${CONTRIB_DIR}/bin]) ], [ PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [ AS_IF([test -n "${enable_qt}"],[ @@ -3742,26 +3763,6 @@ AS_IF([test "${enable_qt}" != "no"], [ AS_IF([test "${enable_qt}" != "no"], [ VLC_ADD_PLUGIN([qt4]) ALIASES="${ALIASES} qvlc" - - AC_LANG_PUSH([C++]) - VLC_SAVE_FLAGS - - 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]) - ], [ - AC_MSG_RESULT([no]) - ]) - - VLC_RESTORE_FLAGS - AC_LANG_POP([C++]) - ]) AM_CONDITIONAL(ENABLE_QT4, [test "$enable_qt" != "no"]) @@ -4049,7 +4050,7 @@ dnl AC_ARG_ENABLE(gnutls, [ --enable-gnutls GNU TLS TLS/SSL support (default enabled)]) AS_IF([test "${enable_gnutls}" != "no"], [ - PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.0.20], [ + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.2.0], [ VLC_ADD_PLUGIN([gnutls]) ], [ AS_IF([test -n "${enable_gnutls}"], [ @@ -4242,6 +4243,7 @@ AC_CONFIG_FILES([ modules/video_output/Makefile modules/visualization/Makefile modules/hw/vdpau/Makefile + modules/hw/mmal/Makefile ]) AM_COND_IF([HAVE_WIN32], [ @@ -4276,11 +4278,12 @@ if test -n $SHELL; then SHELL=${CONFIG_SHELL-/bin/sh} fi rm -f compile +compile_top_srcdir=`sed -ne "s/^top_srcdir *= *//p" < Makefile` echo "#! $SHELL rm -f .error\$\$ ERROR=0 export PATH=\"$PATH\" LANG=C -($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| `sed -ne \"s/^top_srcdir *= *//p\" < Makefile`/extras/buildsystem/make.pl +($MAKE V=1 \$@ 2>&1 || touch .error\$\$)| $compile_top_srcdir/extras/buildsystem/make.pl test -f .error\$\$ && ERROR=1 rm -f .error\$\$ exit \$ERROR" >compile