X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=b820683379eaa4b23e51b404a2e491c4d565cf62;hb=1844bebd3a4df913e9bc873d39d5190e4ca14a56;hp=c1ad99faeb90e8061c0ff1e929d2c8d663f1b753;hpb=503feeaf87af2f367617a0f6465ef553b86e1cc3;p=vlc diff --git a/configure.ac b/configure.ac index c1ad99faeb..b820683379 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf settings for vlc -AC_COPYRIGHT([Copyright 2002-2012 VLC authors and VideoLAN]) +AC_COPYRIGHT([Copyright 2002-2013 VLC authors and VideoLAN]) AC_INIT(vlc, 2.1.0-git) VERSION_MAJOR=2 @@ -14,7 +14,7 @@ AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Rincewind" -COPYRIGHT_YEARS="1996-2012" +COPYRIGHT_YEARS="1996-2013" AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) @@ -25,7 +25,7 @@ AC_CANONICAL_HOST AC_PRESERVE_HELP_ORDER AM_INIT_AUTOMAKE(tar-ustar color-tests foreign) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) # Disable with "./configure --disable-silent-rules" or "make V=1" AM_SILENT_RULES([yes]) @@ -143,7 +143,6 @@ case "${host_os}" in ARCH_flag="-arch x86_64" ;; arm*) - ARCH_flag="-arch armv7" ac_cv_c_bigendian="no" ac_cv_c_attribute_packed="no" ;; @@ -205,8 +204,16 @@ case "${host_os}" in *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) - AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows XP SP2 APIs.]) + 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]) 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.]) case "${host_os}" in *mingw32*) @@ -233,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 @@ -436,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 @@ -459,6 +471,16 @@ dnl Check for fnative-struct or mms-bitfields support for mingw32 fi ]) +AC_ARG_ENABLE(winstore_app, + AS_HELP_STRING([--enable-winstore-app], + [Build targetted for Windows Store apps (default disabled)])) + +AS_IF([test "${SYS}" = "mingw32"], [ + AS_IF([test "${enable_winstore_app}" == "yes"], [ + AC_DEFINE(WINAPI_FAMILY_APP, 1, [Define if you want to build for Windows Store apps])]) + ]) + + dnl dnl Buggy glibc prevention. Purposedly not cached. dnl See sourceware.org bugs 5058 and 5443. @@ -492,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 strncasecmp 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.]) ]) @@ -515,11 +537,8 @@ AC_LINK_IFELSE([ dnl C11 static_assert() AC_MSG_CHECKING([for static_assert in assert.h]) -AC_PREPROC_IFELSE([AC_LANG_SOURCE([ -#include -#ifndef static_assert -# error BOOM! -#endif +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [ +static_assert(1, "The impossible happened."); ])], [ AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_STATIC_ASSERT], [1], [Define to 1 if defines static_assert.]) @@ -571,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) @@ -624,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="" @@ -868,7 +897,7 @@ AS_IF([test "${enable_coverage}" != "no"], [ LDFLAGS="-lgcov ${LDFLAGS}" ]) -AS_IF([test "${SYS}" != "mingw32"], [ +AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "os2"], [ VLC_SAVE_FLAGS CFLAGS="${CFLAGS} -fvisibility=hidden" CXXFLAGS="${CXXFLAGS} -fvisibility=hidden" @@ -1513,6 +1542,9 @@ then AS_IF([test "${LUAC}" = "false"], [ AC_MSG_ERROR([Could not find the LUA byte compiler.]) ]) + AS_IF([test -f ${CONTRIB_DIR}/lib/liblua.a -a `echo|${LUAC} -o - -|od -j 8 -N 2 -t x2|head -n 1|cut -d' ' -f2` != 0404], [ + AC_MSG_ERROR([You need 32-bits luac when using using lua from contrib.]) + ]) fi AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"]) @@ -1709,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 @@ -1748,21 +1771,25 @@ AC_ARG_ENABLE(decklink, AC_ARG_WITH(decklink_sdk, [AS_HELP_STRING[--with-decklink-sdk=DIR], [ location of Blackmagic DeckLink SDI SDK])]) +have_decklink=no if test "${enable_decklink}" != "no" then if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}" then - VLC_ADD_CPPFLAGS([decklink],[-I${with_decklink_sdk}/include]) + VLC_ADD_CPPFLAGS([decklink decklinkoutput],[-I${with_decklink_sdk}/include]) fi VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_decklink}" AC_LANG_PUSH(C++) AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [ - VLC_ADD_PLUGIN([decklink]) - ],[AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled)]) + have_decklink=yes + ], [ + AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled) + ]) AC_LANG_POP(C++) VLC_RESTORE_FLAGS fi +AM_CONDITIONAL(HAVE_DECKLINK, [ test "${have_decklink}" != "no" ]) dnl @@ -1873,6 +1900,11 @@ if test "${enable_screen}" != "no"; then fi fi +dnl +dnl VNC/RFB access module +dnl +PKG_ENABLE_MODULES_VLC([LIBVNC], [libvnc], [libvncclient >= 0.9.9], (VNC/rfb client support), [auto]) + dnl dnl Real RTSP plugin dnl @@ -2100,6 +2132,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 @@ -2208,23 +2261,25 @@ 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], - [ - VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" - CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" - AC_CHECK_HEADERS(libavcodec/avcodec.h) - AC_CHECK_HEADERS(libavutil/avutil.h) - VLC_ADD_PLUGIN([avcodec]) - VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) - AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LIBS([avcodec],[-Wl,-Bsymbolic]) - ]) - VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) - VLC_RESTORE_FLAGS - have_avcodec="yes" - ],[ - AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.]) + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ + PKG_CHECK_EXISTS([libavcodec < 56],, [ + AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.]) + ]) + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" + CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" + AC_CHECK_HEADERS(libavcodec/avcodec.h) + AC_CHECK_HEADERS(libavutil/avutil.h) + VLC_ADD_PLUGIN([avcodec]) + VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) + AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ + VLC_ADD_LIBS([avcodec],[-Wl,-Bsymbolic]) + ]) + VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) + VLC_RESTORE_FLAGS + have_avcodec="yes" + ],[ + AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.]) ]) ], [ have_avcodec="no" @@ -2240,7 +2295,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}" @@ -2579,11 +2634,6 @@ then fi fi -AC_ARG_WITH(a52-fixed, - [ --with-a52-fixed specify if liba52 has been compiled with fixed point support], - [ - VLC_ADD_CPPFLAGS([a52tofloat32],[-DLIBA52_FIXED]) ]) - dnl dnl DTS Coherent Acoustics decoder plugin dnl @@ -2656,18 +2706,17 @@ dnl PNG decoder module dnl AC_ARG_ENABLE(png, [ --enable-png PNG support (default enabled)]) -if test "${enable_png}" != "no"; then +AS_IF([test "${enable_png}" != "no"], [ AC_CHECK_HEADERS(png.h, [ VLC_SAVE_FLAGS LDFLAGS="${LDFLAGS} -lz $LIBM" AC_CHECK_LIB(png, png_set_rows, [ VLC_ADD_LIBS([png],[-lpng -lz $LIBM]) - VLC_ADD_PLUGIN([png osdmenu osd_parser])], - [],[-lz $LIBM] ) + VLC_ADD_PLUGIN([png]) + ], [], [-lz $LIBM]) VLC_RESTORE_FLAGS ]) -fi -AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_png}" != "no"]) +]) dnl dnl H264 encoder plugin (10-bit lib264) @@ -2885,10 +2934,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)],, [ @@ -2950,13 +2999,18 @@ AS_IF([test "${enable_xcb}" != "no"], [ AC_MSG_WARN([${XCB_RANDR_PKG_ERRORS}. Panoramix filter will not be supported.]) ]) - dnl xcb-utils - PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [ - PKG_CHECK_MODULES(XPROTO, [xproto]) - VLC_ADD_PLUGIN([globalhotkeys]) - VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS]) + PKG_CHECK_MODULES(XPROTO, [xproto], [ + VLC_ADD_PLUGIN([xwd]) + + dnl xcb-utils + PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [ + VLC_ADD_PLUGIN([globalhotkeys]) + VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS]) + ], [ + AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.]) + ]) ], [ - AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.]) + AC_MSG_WARN([${XPROTO_PKG_ERRORS}. Hotkeys and XWD will not work.]) ]) AS_IF([test "${enable_glx}" != "no"], [ @@ -2970,6 +3024,44 @@ AS_IF([test "${enable_xcb}" != "no"], [ ]) AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"]) + +dnl +dnl VDPAU needs X11 and avcodec +dnl +AC_ARG_ENABLE(vdpau, + [AS_HELP_STRING([--enable-vdpau], + [VDPAU hardware decoder support (default auto)])]) +have_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"], [ + AC_MSG_ERROR([VDPAU requires Xlib (X11).]) + ]) + AC_MSG_NOTICE([VDPAU acceleration activated]) + ], [ + AS_IF([test -n "${enable_vdpau}"], [ + AC_MSG_ERROR([${VDPAU_PKG_ERRORS}.]) + ]) + ]) +]) +dnl AM_CONDITIONAL([HAVE_VDPAU], [test "${have_vdpau}" = "yes"]) + +have_avcodec_vdpau="no" +AS_IF([test "${have_vdpau}" = "yes"], [ + PKG_CHECK_EXISTS([libavutil >= 0.52.4 libavcodec >= 54.36.0], [ + have_avcodec_vdpau="yes" + ], [ + AS_IF([test -n "${enable_vdpau}"], [ + AC_MSG_ERROR([libavutil >= 0.52.4 and libavcodec >= 54.36.0 are required for VDPAU decoding.]) + ], [ + AC_MSG_WARN([libavutil >= 0.52.4 and libavcodec >= 54.36.0 are required for VDPAU decoding.]) + ]) + ]) +]) +AM_CONDITIONAL([HAVE_AVCODEC_VDPAU], [test "${have_avcodec_vdpau}" = "yes"]) + + dnl dnl SDL module dnl @@ -3108,7 +3200,6 @@ AC_ARG_ENABLE(ios-vout, if test "${enable_ios_vout}" = "yes" then VLC_ADD_PLUGIN([vout_ios]) - VLC_ADD_CFLAGS([vout_ios], [-DUSE_OPENGL_ES=1]) VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation]) fi @@ -3325,11 +3416,11 @@ AC_ARG_ENABLE(alsa, ]) have_alsa="no" AS_IF([test "${enable_alsa}" != "no"], [ - PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16], [ + PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.24], [ have_alsa="yes" ], [ AS_IF([test "x${enable_alsa}" != "x"], [ - AC_MSG_ERROR([$ALSA_PKG_ERRORS. alsa-lib 1.0.16 or later required.]) + AC_MSG_ERROR([$ALSA_PKG_ERRORS. alsa-lib 1.0.24 or later required.]) ]) ]) ]) @@ -3417,7 +3508,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,-framework,Carbon]) + VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -3621,11 +3712,11 @@ AC_ARG_ENABLE(macosx, [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)]) if test "x${enable_macosx}" != "xno" -a "${SYS}" = "darwin" then - VLC_ADD_LIBS([macosx], [-Wl,-framework,Cocoa -Wl,-framework,OpenGL -Wl,-framework,Carbon -Wl,-framework,CoreServices -Wl,-framework,AGL]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,CoreServices]) 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 @@ -3650,7 +3741,7 @@ AC_ARG_ENABLE(minimal-macosx, [ --enable-minimal-macosx Minimal Mac OS X support (default disabled)]) if test "${enable_minimal_macosx}" = "yes" -a "${SYS}" = "darwin" then - VLC_ADD_LIBS([minimal_macosx], [-Wl,-framework,Cocoa -Wl,-framework,OpenGL -Wl,-framework,Carbon -Wl,-framework,CoreServices -Wl,-framework,AGL]) + VLC_ADD_LIBS([minimal_macosx], [-Wl,-framework,Cocoa]) VLC_ADD_OBJCFLAGS([minimal_macosx], [-fobjc-exceptions] ) VLC_ADD_PLUGIN([minimal_macosx]) fi @@ -3760,6 +3851,7 @@ AS_IF([test "${enable_atmo}" != no], [ ]) ]) + EXTEND_HELP_STRING([Service Discovery plugins:]) dnl dnl Bonjour services discovery @@ -3829,17 +3921,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 @@ -4091,6 +4172,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 ]) ])