X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=6b44139d2fe35a7d6f79a9650d7421b77d9f7264;hb=085a335d1cfecab5bf6083e60ee28f007a262454;hp=aef627fb637ebbd1ae54bfe616d63c5c204a263d;hpb=b284beeee8894a86c32eae47cc996e973376e5aa;p=vlc diff --git a/configure.ac b/configure.ac index aef627fb63..6b44139d2f 100644 --- a/configure.ac +++ b/configure.ac @@ -204,6 +204,10 @@ case "${host_os}" in *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) + AC_PATH_PROGS(GENDEF,[${GENDEF} gendef], [false]) + AS_IF([test "${GENDEF}" = "false"], [ + AC_MSG_ERROR([Could not find gendef.]) + ]) AH_TOP([#if defined(WIN32) && !defined(_WIN32_WINNT)]) AH_TOP([# define _WIN32_WINNT 0x0502 /* Windows XP SP2 */]) AH_TOP([#endif]) @@ -236,17 +240,20 @@ case "${host_os}" in DESTDIR="`pwd`/_win32/" dnl - dnl NSIS Installer prefix and WIN64 + dnl NSIS/MSI Installer prefix and WIN64 dnl case "${host}" in amd64*|x86_64*) HAVE_WIN64="1" + WINDOWS_ARCH="x64" PROGRAMFILES="PROGRAMFILES64" ;; *) + WINDOWS_ARCH="x86" PROGRAMFILES="PROGRAMFILES" ;; esac + AC_SUBST(WINDOWS_ARCH) AC_SUBST(PROGRAMFILES) fi @@ -439,10 +446,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 @@ -505,7 +514,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.]) ]) @@ -581,11 +590,21 @@ AC_SEARCH_LIBS([getaddrinfo], [nsl], [ ]) ],, [${SOCKET_LIBS}]) +LIBS="${LIBS} ${SOCKET_LIBS}" +AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#ifdef WIN32 + #include + #else + #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 AS_IF([test -n "$SOCKET_LIBS"], [ - VLC_ADD_LIBS([access_http 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 rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[${SOCKET_LIBS}]) + VLC_ADD_LIBS([access_http 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 rtp oldrc netsync gnutls ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[${SOCKET_LIBS}]) ]) AC_SUBST(SOCKET_LIBS) @@ -634,7 +653,7 @@ AC_CHECK_FUNC(getopt_long,, [ AC_SUBST(GNUGETOPT_LIBS) AC_CHECK_LIB(m,cos,[ - VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm]) LIBM="-lm" ], [ LIBM="" @@ -1722,16 +1741,7 @@ PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0] dnl dnl libsmbclient plugin dnl -AC_ARG_ENABLE(smb, - [AS_HELP_STRING([--disable-smb], [disable SMB/CIFS support (default auto)])]) -if test "${enable_smb}" != "no"; then - AC_CHECK_HEADERS(libsmbclient.h, - [ VLC_ADD_PLUGIN([access_smb]) - VLC_ADD_LIBS([access_smb],[-lsmbclient]) ], - [ if test -n "${enable_smb}"; then - AC_MSG_ERROR([cannot find libsmbclient headers]) - fi ]) -fi +PKG_ENABLE_MODULES_VLC([SMBCLIENT], [access_smb], [smbclient], (SMB/CIFS support), [auto]) dnl @@ -1766,10 +1776,10 @@ if test "${enable_decklink}" != "no" then if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}" then - VLC_ADD_CXXFLAGS([decklink decklinkoutput],[-I${with_decklink_sdk}/include]) + VLC_ADD_CPPFLAGS([decklink decklinkoutput],[-I${with_decklink_sdk}/include]) fi VLC_SAVE_FLAGS - CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_decklink}" + CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_decklink}" AC_LANG_PUSH(C++) AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [ have_decklink=yes @@ -1882,13 +1892,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 @@ -2117,6 +2135,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 @@ -2226,8 +2265,8 @@ 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_EXISTS([libavcodec < 55],, [ - AC_MSG_ERROR([libavcodec versions 55 and later are not supported yet.]) + PKG_CHECK_EXISTS([libavcodec < 56],, [ + AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.]) ]) VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" @@ -2259,7 +2298,7 @@ AS_IF([test "${enable_libva}" = "yes" -a "${have_avcodec}" != "yes" ], [ AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive. Use --enable-avcodec.]) ]) have_avcodec_vaapi="no" -AS_IF([test "${enable_libva}" != "no"], [ +AS_IF([test "${enable_libva}" != "no" -a "${have_avcodec}" == "yes"], [ PKG_CHECK_MODULES(LIBVA, [libva libva-x11], [ VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" @@ -2354,21 +2393,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,10 +2922,10 @@ PKG_CHECK_MODULES([GL], [gl], [ ]) ]) -dnl OpenGL ES 2: depends on EGL 1.1 and is currently unfinished -dnl PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [auto]) -dnl OpenGL ES 1: depends on EGL 1.0 and is currently broken -dnl PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [auto]) +dnl OpenGL ES 2: depends on EGL 1.1 +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], [disabled]) AC_ARG_ENABLE(egl, [ --enable-egl OpenGL support through EGL (default disabled)],, [ @@ -2996,7 +3020,7 @@ AC_ARG_ENABLE(vdpau, [AS_HELP_STRING([--enable-vdpau], [VDPAU hardware decoder support (default auto)])]) have_vdpau="no" -AS_IF([test "${enable_vdpau}" != "no"], [ +AS_IF([test "${enable_vdpau}" != "no" -a "${have_avcodec}" == "yes"], [ PKG_CHECK_MODULES([VDPAU], [vdpau], [ have_vdpau="yes" AS_IF([test "${no_x}" = "yes"], [ @@ -3419,7 +3443,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" ]) ]) @@ -3472,7 +3496,7 @@ if test "x${enable_macosx_audio}" != "xno" && then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, [ VLC_ADD_PLUGIN([auhal]) - VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox]) + VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -3680,7 +3704,7 @@ then VLC_ADD_OBJCFLAGS([macosx], [-fobjc-exceptions] ) VLC_ADD_PLUGIN([macosx]) - VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge]) if test ! -d ${CONTRIB_DIR}/Sparkle.framework then @@ -3875,7 +3899,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}"], [ @@ -3885,17 +3909,6 @@ AS_IF([test "${enable_gnutls}" != "no"], [ ]) -dnl -dnl Nokia MCE plugin (Maemo screen unblanking) -dnl -PKG_CHECK_MODULES([MCE], [dbus-1 mce], [VLC_ADD_PLUGIN([mce])], [true]) - - -AS_IF([test -f "/etc/maemo_version"], [ - AC_DEFINE([HAVE_MAEMO], 1, [Define to 1 if building for the Maemo platform.]) -]) - - dnl dnl Taglib plugin dnl @@ -3949,34 +3962,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 @@ -4125,7 +4110,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 @@ -4147,6 +4131,7 @@ AM_COND_IF([HAVE_WIN32], [ AC_CONFIG_FILES([ extras/package/win32/NSIS/spad.nsi extras/package/win32/NSIS/vlc.win32.nsi + extras/package/win32/msi/config.wxi ]) ])