X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=e42127eb702f24a95aaf133a214433ece1d26b21;hb=f3e0178eeed19835d2f8e6131690dea603adfd4d;hp=ac10739140f3e06344d989ce0a6727a9bb661a71;hpb=e46020734e4450d3fb6de6264f3d6cbb7ce8e07c;p=vlc diff --git a/configure.ac b/configure.ac index ac10739140..e42127eb70 100644 --- a/configure.ac +++ b/configure.ac @@ -214,6 +214,8 @@ case "${host_os}" in case "${host_os}" in *mingw32*) SYS=mingw32 + CC="$CC -static-libgcc" + CXX="$CXX -static-libgcc -static-libstdc++" ;; *cygwin*) dnl Check if we are using the mno-cygwin mode in which case we are @@ -442,10 +444,12 @@ dnl Check for broken versions of mingw-runtime compatability library CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1" dnl Check for the need to include the mingwex lib for mingw32 + VLC_SAVE_FLAGS AC_CHECK_LIB(mingwex,opendir, AC_CHECK_LIB(mingw32,opendir,, [VLC_ADD_LIBS([libvlccore],[-lmingwex])]) ) + VLC_RESTORE_FLAGS dnl Check for fnative-struct or mms-bitfields support for mingw32 VLC_SAVE_FLAGS @@ -508,7 +512,7 @@ need_libc=false dnl Check for usual libc functions AC_CHECK_DECLS([nanosleep],,,[#include ]) AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) -AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r inet_pton lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) +AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) @@ -584,6 +588,20 @@ AC_SEARCH_LIBS([getaddrinfo], [nsl], [ ]) ],, [${SOCKET_LIBS}]) +LIBS="${LIBS} ${SOCKET_LIBS}" +AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#ifdef WIN32 + # if _WIN32_WINNT < 0x600 + # error Needs vista+ + # endif + #include + #else + #include + #include + #endif], [ + char dst[[sizeof(struct in_addr)]]; + inet_pton(AF_INET, "127.0.0.1", dst); + ])],[AC_DEFINE([HAVE_INET_PTON],[1],[Define to 1 if you have inet_pton function])],[AC_LIBOBJ([inet_pton])]) AC_CHECK_FUNCS([if_nameindex if_nametoindex]) VLC_RESTORE_FLAGS @@ -1876,13 +1894,21 @@ AC_ARG_ENABLE(screen, [disable screen capture (default enabled)])]) if test "${enable_screen}" != "no"; then if test "${SYS}" = "darwin"; then - AC_CHECK_HEADERS(OpenGL/gl.h, [ - AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ - VLC_ADD_PLUGIN([screen]) - ]) + AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ + VLC_ADD_PLUGIN([screen]) ]) fi fi +AM_CONDITIONAL(HAVE_MAC_SCREEN, [test "${SYS}" = "darwin" -a "x${enable_screen}" != "xno"]) + +dnl +dnl VNC/RFB access module +dnl +PKG_ENABLE_MODULES_VLC([LIBVNC], [libvnc], [libvncclient >= 0.9.9], (VNC/rfb client support), [auto]) + +dnl RDP/Remote Desktop access module +dnl +PKG_ENABLE_MODULES_VLC([LIBFREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) ) dnl dnl Real RTSP plugin @@ -2111,6 +2137,27 @@ then VLC_ADD_PLUGIN([omxil]) fi +dnl +dnl openmax il vout plugin +dnl +AC_ARG_ENABLE(omxil-vout, + [ --enable-omxil-vout openmax il video output module (default disabled)]) +if test "${enable_omxil_vout}" = "yes" +then + VLC_ADD_PLUGIN([omxil_vout]) +fi + +dnl +dnl raspberry pi openmax il configuration +dnl +AC_ARG_ENABLE(rpi-omxil, + [ --enable-rpi-omxil openmax il configured for raspberry pi (default disabled)]) +if test "${enable_rpi_omxil}" = "yes" +then + VLC_ADD_PLUGIN([omxil omxil_vout]) + VLC_ADD_CFLAGS([omxil omxil_vout],[-DRPI_OMX]) +fi + dnl dnl CrystalHD codec plugin dnl @@ -2220,11 +2267,6 @@ 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], [ - AS_IF([test "${enable_sout}" != "no"], [ - PKG_CHECK_EXISTS([libavcodec < 55],, [ - AC_MSG_ERROR([libavcodec version 55 requires --disable-sout.]) - ]) - ]) PKG_CHECK_EXISTS([libavcodec < 56],, [ AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.]) ]) @@ -2353,21 +2395,6 @@ AS_IF([test "${enable_vda}" != "no"], [ ]) AM_CONDITIONAL([HAVE_AVCODEC_VDA], [test "${have_avcodec_vda}" = "yes"]) -dnl -dnl stream_out switcher needs libavcodec -dnl -AC_ARG_ENABLE(switcher, - [ --enable-switcher Stream-out switcher plugin (default disabled)]) -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 $LIBM]) - VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS $AVUTIL_CFLAGS]) - ],[AC_MSG_ERROR([Stream_out switcher depends on avcodec]) - ]) -]) - - dnl dnl avformat demuxer/muxer plugin dnl @@ -2898,9 +2925,9 @@ PKG_CHECK_MODULES([GL], [gl], [ ]) dnl OpenGL ES 2: depends on EGL 1.1 -PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [auto]) +PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [disabled]) dnl OpenGL ES 1: depends on EGL 1.0 -PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [auto]) +PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [disabled]) AC_ARG_ENABLE(egl, [ --enable-egl OpenGL support through EGL (default disabled)],, [ @@ -3083,6 +3110,28 @@ AC_ARG_ENABLE(fribidi, AC_ARG_ENABLE(fontconfig, [ --enable-fontconfig fontconfig support (default auto)]) +AC_ARG_WITH([default-font], + AS_HELP_STRING([--with-default-font=PATH], + [Path to the default font]), + [AC_DEFINE_UNQUOTED([DEFAULT_FONT_FILE], + "$withval", [Default font])]) +AC_ARG_WITH([default-monospace-font], + AS_HELP_STRING([--with-default-monospace-font=PATH], + [Path to the default font]), + [AC_DEFINE_UNQUOTED([DEFAULT_MONOSPACE_FONT_FILE], + "$withval", [Default monospace font])]) + +AC_ARG_WITH([default-font-family], + AS_HELP_STRING([--with-default-font-family=NAME], + [Path to the default font family]), + [AC_DEFINE_UNQUOTED([DEFAULT_FAMILY], + "$withval", [Default font family])]) +AC_ARG_WITH([default-monospace-font-family], + AS_HELP_STRING([--with-default-monospace-font-family=NAME], + [Path to the default font family]), + [AC_DEFINE_UNQUOTED([DEFAULT_MONOSPACE_FAMILY], + "$withval", [Default monospace font family])]) + if test "${enable_freetype}" != "no"; then PKG_CHECK_MODULES(FREETYPE, freetype2, [ have_freetype=yes @@ -3166,6 +3215,18 @@ then VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation]) fi +dnl +dnl iOS ES2 vout module +dnl +AC_ARG_ENABLE(ios-vout2, + [ --enable-ios-vout2 iOS video output module (default disabled)]) +if test "${enable_ios_vout2}" = "yes" +then + VLC_ADD_PLUGIN([vout_ios2]) + VLC_ADD_LIBS([vout_ios2], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit]) +fi + + dnl dnl Windows DirectX module dnl @@ -3418,7 +3479,7 @@ dnl AC_ARG_ENABLE([sndio], [AS_HELP_STRING([--disable-sndio], [support the OpenBSD sndio (default auto)])],, [ - AS_IF([test "$SYS" = "opensd"], [ + AS_IF([test "$SYS" = "openbsd"], [ enable_sndio="yes" ]) ]) @@ -3475,6 +3536,19 @@ then ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi +dnl +dnl iOS CoreAudio plugin +dnl +AC_ARG_ENABLE(ios-audio, + [ --enable-ios-audio Audio module for iOS (default disabled)]) +if test "${enable_ios_audio}" = "yes" +then + AC_CHECK_HEADERS(AudioUnit/AudioUnit.h, + [ VLC_ADD_PLUGIN([audiounit_ios]) + VLC_ADD_LIBS([audiounit_ios],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices]) + ], [ AC_MSG_ERROR([cannot find AudioUnit headers]) ]) +fi + dnl dnl AudioQueue plugin dnl @@ -3532,6 +3606,22 @@ AS_IF([test "$enable_kai" != "no"], [ AC_SUBST(KAI_LIBS) AM_CONDITIONAL([HAVE_KAI], [test "${have_kai}" = "yes"]) +dnl +dnl chromaprint audio track fingerprinter +dnl +m4_pushdef([libchromaprint_version], 0.6.0) +PKG_WITH_MODULES([CHROMAPRINT],[libchromaprint >= libchromaprint_version], + VLC_ADD_PLUGIN([stream_out_chromaprint fingerprinter]) + VLC_ADD_CFLAGS([stream_out_chromaprint],[${CHROMAPRINT_CFLAGS}] [-I./webservices -I../stream_out]) + VLC_ADD_LIBS([stream_out_chromaprint],[${CHROMAPRINT_LIBS}]) + VLC_ADD_LIBS([fingerprinter],[-lm]), + AS_IF([test "${enable_chromaprint}" = "yes"], + [AC_MSG_ERROR(Library [libchromaprint >= libchromaprint_version] needed for [chromaprint] was not found)], + [AC_MSG_WARN(Library [libchromaprint >= libchromaprint_version] needed for [chromaprint] was not found)] + ), + [(Chromaprint based audio fingerprinter)],[auto]) +m4_popdef([libchromaprint_version]) + dnl dnl Interface plugins dnl @@ -3874,7 +3964,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 >= 2.6.6], [ + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.0.20], [ VLC_ADD_PLUGIN([gnutls]) ], [ AS_IF([test -n "${enable_gnutls}"], [ @@ -3937,34 +4027,6 @@ dnl Libnotify notification plugin dnl PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notification], [auto]) -dnl -dnl media library -dnl -AC_ARG_ENABLE(media-library, - [ --enable-media-library media library (default disabled)]) -AS_IF([test "${enable_media_library}" = "yes"], [ - AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library]) - VLC_ADD_CPPFLAGS([qt4],"-DMEDIA_LIBRARY") - VLC_ADD_PLUGIN([media_library]) - -dnl -dnl SQLite -dnl - AS_IF([test "${SYS}" != "darwin"], [ - PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3 >= 3.6.0], [sqlite3], [auto]) - ], [ - AS_IF([test "${enable_sqlite}" != "no"], [ - AC_CHECK_HEADERS(sqlite3.h, [ - VLC_ADD_PLUGIN([sqlite]) - VLC_ADD_LIBS([sqlite], [-lsqlite3]) - ], [ - AC_MSG_ERROR([sqlite3 is required for the media library]) - ]) - ]) - ]) -]) - - dnl dnl Endianness check dnl @@ -4006,20 +4068,7 @@ AC_SUBST(soliddatadir) AM_CONDITIONAL(KDE_SOLID, [test "x${soliddatadir}" != "x"]) dnl -dnl DLL loader copied from MPlayer copied from somewhere else (WINE ?) -dnl -loader=false -AC_ARG_ENABLE(loader, - AS_HELP_STRING([--enable-loader],[build DLL loader for ELF i386 platforms - (default disabled)])) -AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) -AS_IF([test "${enable_loader}" = "yes"], - [ VLC_ADD_PLUGIN([dmo]) - VLC_ADD_CPPFLAGS([dmo quicktime ],[-I\\\$(srcdir)/loader]) - VLC_ADD_LIBS([dmo quicktime ],[libloader.la]) - VLC_ADD_LIBS([dmo quicktime], [-lpthread]) - ]) - +dnl DMO codec AS_IF([test "${SYS}" = "mingw32"], [VLC_ADD_PLUGIN([dmo]) VLC_ADD_LIBS([dmo],[-lole32 -luuid]) ]) EXTEND_HELP_STRING([Components:]) @@ -4113,7 +4162,6 @@ AC_CONFIG_FILES([ modules/lua/Makefile modules/meta_engine/Makefile modules/misc/Makefile - modules/media_library/Makefile modules/mux/Makefile modules/notify/Makefile modules/packetizer/Makefile