X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=82751556d5edd744a0aedc6a07867dbe329f04b9;hb=a498397a03636faa27ed276ba861629ac81389ee;hp=1541ba30d0a2d5472699224dd126b04775600997;hpb=d4e913a695bb5ae17fbb34c416d388ddcc35afe7;p=vlc diff --git a/configure.ac b/configure.ac index 1541ba30d0..82751556d5 100644 --- a/configure.ac +++ b/configure.ac @@ -238,10 +238,6 @@ case "${host_os}" in then echo "" echo "Building with Mac OS X defaults:" - with_macosx_version_min="10.5" - echo " Assuming --with-macosx-version-min=10.5" - with_macosx_sdk="/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk" - echo " Assuming --with-macosx-sdk=/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk" build_dir=`pwd` echo " Assuming --prefix=${build_dir}/vlc_install_dir" ac_default_prefix="${build_dir}/vlc_install_dir" @@ -282,6 +278,15 @@ case "${host_os}" in CXX="${CXX} -isysroot ${with_macosx_sdk}" OBJC="${OBJC} -isysroot ${with_macosx_sdk}" LD="${LD} -syslibroot ${with_macosx_sdk}" + else + echo " No desired SDK version given, falling back to 10.5" + CPP="${CPP} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + CC="${CC} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.5.sdk" + LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.5.sdk" + with_macosx_version_min="10.5" + echo " Assuming --with-macosx-version-min=10.5" fi AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above]) @@ -330,7 +335,7 @@ case "${host_os}" in VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([win32text],[-lgdi32]) VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-lwinmm]) - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap oldhttp stream_out_standard stream_out_select stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32]) VLC_ADD_LIBS([filesystem], [-lshlwapi]) dnl dnl DEP and ASLR options @@ -361,7 +366,7 @@ case "${host_os}" in fi if test "${SYS}" = "mingwce"; then # add ws2 for closesocket, select, recv - VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2]) + VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_select stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2]) VLC_ADD_LIBS([libvlccore],[-lmmtimer]) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) ac_default_prefix="`pwd`/_wince" @@ -380,17 +385,22 @@ case "${host_os}" in symbian*) SYS=symbian ;; + *os2*) + SYS=os2 + LDFLAGS_save="${LDFLAGS_save} -Zomf -Zbin-files -Zargs-wild"; LDFLAGS="${LDFLAGS_save}" + ;; *) SYS="${host_os}" ;; esac -AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") -AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"]) -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_DARWIN, test "${SYS}" = "darwin") +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") -AM_CONDITIONAL(USE_PEFLAGS, [test "${enable_peflags}" = "yes"]) +AM_CONDITIONAL(USE_PEFLAGS, test "${enable_peflags}" = "yes") dnl dnl Sadly autoconf doesn't think about testing foo.exe when ask to test @@ -446,14 +456,14 @@ VLC_ADD_LIBS([libvlccore],[${LTLIBICONV}]) dnl Check for broken versions of mingw-runtime compatability library AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ AC_MSG_CHECKING(for broken mingw-runtime) - AC_PREPROC_IFELSE([ + AC_PREPROC_IFELSE([AC_LANG_SOURCE([ #include <_mingw.h> #if (__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15) #ifndef __MINGW64_VERSION_MAJOR # error Attempting to use mingw-runtime with broken vsnprintf support #endif #endif - ], [ + ])], [ AC_MSG_RESULT([ok]) ], [ AC_MSG_RESULT([present]) @@ -517,13 +527,13 @@ dnl See sourceware.org bugs 5058 and 5443. dnl Ubuntu alone has 20 bug numbers for this... dnl AC_MSG_CHECKING(for buggy GNU/libc versions) -AC_PREPROC_IFELSE([ +AC_PREPROC_IFELSE([AC_LANG_SOURCE([ #include #if defined (__GLIBC__) && (__GLIBC__ == 2) \ && (__GLIBC_MINOR__ >= 5) && (__GLIBC_MINOR__ <= 7) # error GNU/libc with dcgettext killer bug! #endif -], [ +])], [ AC_MSG_RESULT([not present]) ], [ AC_MSG_RESULT([found]) @@ -547,8 +557,8 @@ dnl Check for system libs needed need_libc=false dnl Check for usual libc functions -AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp uselocale]) -AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) +AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale]) +AC_REPLACE_FUNCS([asprintf atof atoll dirfd getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) @@ -557,7 +567,7 @@ AC_CHECK_FUNCS(fdatasync,, AC_FUNC_STRCOLL dnl Check for non-standard system calls -AC_CHECK_FUNCS([accept4 dup3 eventfd vmsplice sched_getaffinity]) +AC_CHECK_FUNCS([accept4 pipe2 eventfd vmsplice sched_getaffinity]) AH_BOTTOM([#include ]) @@ -1127,7 +1137,7 @@ dnl dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - VLC_ADD_PLUGIN([dynamicoverlay]) + VLC_ADD_PLUGIN([dynamicoverlay access_shm]) elif test "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([access_smb dmo globalhotkeys]) VLC_ADD_LIBS([dmo],[-lole32 -luuid]) @@ -1481,8 +1491,10 @@ if test -n "${with_tuning}"; then CFLAGS_TUNING="-mtune=${with_tuning}" fi else - if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then + 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 @@ -1498,7 +1510,7 @@ AS_IF([test "${CFLAGS_TUNING}"], CFLAGS="${CFLAGS} ${CFLAGS_TUNING}" AC_MSG_CHECKING([whether $CC accepts ${CFLAGS_TUNING}]) - AC_COMPILE_IFELSE([ ], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [tuning="yes"], [CFLAGS_TUNING=""; tuning="no" AS_IF([test "${with_tuning}"], @@ -1908,24 +1920,6 @@ then fi fi -dnl -dnl Windows DirectShow BDA access module -dnl -AC_ARG_ENABLE(bda, - AS_HELP_STRING([--enable-bda],[Win32 DirectShow BDA support (default - enabled on Win32)])) -if test "${enable_bda}" != "no" -then - if test "${SYS}" = "mingw32" - then - AC_CHECK_HEADERS(dshow.h, - [ VLC_ADD_PLUGIN([bda]) - VLC_ADD_CXXFLAGS([bda],[]) - VLC_ADD_LIBS([bda],[-lstrmiids -lole32 -loleaut32 -luuid]) ]) - fi -fi - - dnl dnl Blu-ray Disc Support with libbluray dnl @@ -1934,7 +1928,7 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2 ], (libbluray fo dnl dnl OpenCV wrapper and example filters dnl -PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example], [opencv], (OpenCV (computer vision) filter), [off]) +PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (OpenCV (computer vision) filter), [off]) dnl @@ -1964,113 +1958,6 @@ if test "${enable_sftp}" = "yes"; then ]) fi -dnl -dnl libdvbpsi ts demux/mux -dnl -AC_ARG_ENABLE(dvbpsi, - [ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)]) -have_dvbpsi=no -if test "${enable_dvbpsi}" != "no" -then - AC_ARG_WITH(dvbpsi, - [ --with-dvbpsi=PATH libdvbpsi headers and libraries]) - AC_ARG_WITH(dvbpsi, - [ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking]) - case "${with_dvbpsi}" in - ""|yes) - if test -z "${with_dvbpsi_tree}" - then - AC_CHECK_HEADERS(dvbpsi/dr.h, - [ VLC_ADD_PLUGIN([ts]) - if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGIN([mux_ts]) - fi - VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi]) - have_dvbpsi=yes], - [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], - [#if defined( HAVE_STDINT_H ) -# include -#elif defined( HAVE_INTTYPES_H ) -# include -#endif -#include -#include -#include -#include ]) - else - AC_MSG_CHECKING(for libdvbpsi.a in ${with_dvbpsi_tree}) - real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`" - if test -z "${real_dvbpsi_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_dvbpsi_tree}]) - fi - if test -f "${real_dvbpsi_tree}/src/.libs/libdvbpsi.a" - then - dnl Use a custom libdvbpsi - AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a) - VLC_ADD_PLUGIN([ts]) - if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGIN([mux_ts]) - fi - VLC_ADD_CPPFLAGS([mux_ts ts dvb],[-I${real_dvbpsi_tree}/src]) - VLC_ADD_LIBS([mux_ts ts dvb],[${real_dvbpsi_tree}/src/.libs/libdvbpsi.a]) - have_dvbpsi=yes - else - dnl The given libdvbpsi wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a, make sure you compiled libdvbpsi in ${with_dvbpsi_tree}]) - fi - fi - ;; - no) - dnl Compile without dvbpsi - ;; - *) - AC_MSG_CHECKING(for dvbpsi headers in ${with_dvbpsi}) - if test -z "${with_dvbpsi}" - then - LDFLAGS_test="" - CPPFLAGS_test="" - else - LDFLAGS_test="-L${with_dvbpsi}/lib" - CPPFLAGS_test="-I${with_dvbpsi}/include" - fi - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" - AC_CHECK_HEADERS([dvbpsi/dr.h],[ - VLC_ADD_PLUGIN([ts]) - if test "${enable_sout}" != "no"; then - AC_CHECK_LIB(dvbpsi, dvbpsi_SDTServiceAddDescriptor, - [VLC_ADD_PLUGIN([mux_ts])], [], [${LDFLAGS_test} -ldvbpsi]) - fi - VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}]) - VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi]) - have_dvbpsi=yes - ],[ - if test -n "${enable_dvbpsi}" - then - AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.6]) - fi - ], - [#if defined( HAVE_STDINT_H ) -# include -#elif defined( HAVE_INTTYPES_H ) -# include -#endif -#include -#include -#include -#include ]) - CPPFLAGS="${CPPFLAGS_save}" - ;; - esac - AC_CHECK_LIB(dvbpsi, dvbpsi_GenSDTSections, [ - AC_DEFINE(HAVE_DVBPSI_SDT, 1, [Define if you have dvbpsi_GenSDTSections.]) - ], [], [${LIBS_ts}]) - -fi - dnl dnl Video4Linux2 plugin dnl @@ -2115,29 +2002,6 @@ AC_ARG_ENABLE(pvr, if test "${enable_pvr}" = "yes" then VLC_ADD_PLUGIN([pvr]) - AC_ARG_WITH(videodev2, - [ --with-videodev2=FILE Location of videodev2.h file (default /usr/include/linux/videodev2.h)],[],[]) - if test "${with_videodev2}" != "no" -a -n "${with_videodev2}" - then - AC_DEFINE_UNQUOTED(VIDEODEV2_H_FILE, "${with_videodev2}", [Location of videodev2.h]) - fi - - AC_CACHE_CHECK([for new linux/videodev2.h], - [ac_cv_new_linux_videodev2_h], - [AC_TRY_COMPILE([ - #include - # ifdef VIDEODEV2_H_FILE - # include VIDEODEV2_H_FILE - # else - # include - # endif - ], - [struct v4l2_ext_controls ctrls; ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG; ], - ac_cv_new_linux_videodev2_h=yes, - ac_cv_new_linux_videodev2_h=no)]) - if test "${ac_cv_new_linux_videodev2_h}" != "no"; then - AC_DEFINE(HAVE_NEW_LINUX_VIDEODEV2_H, 1, [Define if new linux/videodev2.h present]) - fi fi dnl @@ -2249,29 +2113,16 @@ then fi dnl -dnl DVB-S/DVB-T/DVB-C satellite/teresterial/cable input using v4l2 +dnl libdvbpsi check for ts mux/demux dnl -AC_ARG_ENABLE(dvb, - [ --enable-dvb DVB-S/T/C card support (default enabled)]) - -if test "${enable_dvb}" != "no" -then - AS_IF([test "${have_dvbpsi}" = "yes" ],[ - AC_ARG_WITH(dvb, - [ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[]) - if test "${with_dvb}" != "no" -a -n "${with_dvb}" - then - VLC_ADD_CFLAGS([dvb],[-I${with_dvb}/include]) - fi - CPPFLAGS="${CPPFLAGS_save} -I${with_dvb}/include" - AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [ - VLC_ADD_PLUGIN([dvb]) - ],[AC_MSG_WARN(linux-dvb headers not found, dvb disabled)]) - CPPFLAGS="${CPPFLAGS_save}" - ],[ - AC_MSG_WARN([the dvb access module requires libdvbpsi]) - ]) +PKG_WITH_MODULES([DVBPSI], [libdvbpsi], + VLC_ADD_PLUGIN([ts]) + VLC_ADD_LIBS([ts],[-ldvbpsi]) +if test "${enable_sout}" != "no"; then + VLC_ADD_PLUGIN([mux_ts]) + VLC_ADD_LIBS([mux_ts],[-ldvbpsi]) fi +) dnl dnl Screen capture module @@ -2330,7 +2181,27 @@ AS_IF([test "${enable_gme}" != "no"], [ dnl dnl SIDPlay plugin dnl -PKG_ENABLE_MODULES_VLC([SID], [], [libsidplay2], [C64 sid demux support], [auto], [], [-lresid-builder]) +PKG_WITH_MODULES([SID], [libsidplay2], + AC_LANG_PUSH(C++) + oldCPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $SID_CFLAGS" + AC_CHECK_HEADER([sidplay/builders/resid.h], [ + VLC_ADD_PLUGIN([sid]) + VLC_ADD_CFLAGS([sid], [$SID_CFLAGS]) + VLC_ADD_LIBS([sid], [$SID_LIBS] [-lresid-builder]) + ], [ + AS_IF([test "x${enable_sid}" = "xyes"], + [AC_MSG_ERROR(Library libresid-builder needed for sid was not found)], + [AC_MSG_WARN(Library libresid-builder needed for sid was not found)] + ) + ]) + CPPFLAGS="$oldCPPFLAGS" + AC_LANG_POP(C++), + AS_IF([test "x${enable_sid}" = "xyes"], + [AC_MSG_ERROR(Library libsidplay2 needed for sid was not found)], + [AC_MSG_WARN(Library libsidplay2 needed for sid was not found)] + ), + [C64 sid demux support], [auto]) dnl @@ -2381,14 +2252,14 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then AC_CHECK_LIB(ebml_pic, main, [ VLC_ADD_PLUGIN([mkv]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic]) - ], + ],[ AC_CHECK_LIB(ebml, main, [ VLC_ADD_PLUGIN([mkv]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml]) ]) - ) - ], - [AC_MSG_RESULT([no]) + ]) + ], [ + AC_MSG_RESULT([no]) AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.]) ]) ]) @@ -2473,9 +2344,9 @@ dnl dnl CrystalHD codec plugin dnl AC_ARG_ENABLE(crystalhd, - [ --enable-crystalhd crystalhd codec plugin (default disabled)]) -if test "${enable_crystalhd}" == "yes"; then - AC_CHECK_HEADERS(libcrystalhd/libcrystalhd_if.h, [ + [ --enable-crystalhd crystalhd codec plugin (default auto)]) +if test "${enable_crystalhd}" != "no"; then + AC_CHECK_HEADER(libcrystalhd/libcrystalhd_if.h, [ VLC_ADD_PLUGIN([crystalhd]) VLC_ADD_LIBS([crystalhd], [-lcrystalhd]) ],[ @@ -2486,10 +2357,16 @@ if test "${enable_crystalhd}" == "yes"; then VLC_ADD_LIBS([crystalhd], [-lbcmDIL]) ]) ],[ - AC_MSG_ERROR("Could not find CrystalHD development headers") + AS_IF([test x"${enable_crystalhd}" = "xyes"], + [AC_MSG_ERROR("Could not find CrystalHD development headers")], + [AC_MSG_WARN("Could not find CrystalHD development headers")]) + ],[#define __LINUX_USER__ + #include ]) fi - ]) + ],[ + #include + ]) fi dnl @@ -2575,8 +2452,8 @@ AS_IF([test "${enable_avcodec}" != "no"], [ VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}" - AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h) - AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h) + 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"], [ @@ -2692,8 +2569,8 @@ then VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}" CFLAGS="${CFLAGS} ${AVFORMAT_CFLAGS}" - AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h libavformat/avio.h) - AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h) + AC_CHECK_HEADERS(libavformat/avformat.h libavformat/avio.h) + AC_CHECK_HEADERS(libavutil/avutil.h) AS_IF([test "$enable_merge_ffmpeg" = "no"], [ VLC_ADD_PLUGIN([avformat access_avio]) VLC_ADD_LIBS([avformat access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS]) @@ -2725,7 +2602,7 @@ then VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${SWSCALE_CFLAGS}" CFLAGS="${CFLAGS} ${SWSCALE_CFLAGS}" - AC_CHECK_HEADERS(libswscale/swscale.h ffmpeg/swscale.h) + AC_CHECK_HEADERS(libswscale/swscale.h) VLC_ADD_PLUGIN([swscale]) VLC_ADD_LIBS([swscale],[$SWSCALE_LIBS]) VLC_ADD_CFLAGS([swscale],[$SWSCALE_CFLAGS]) @@ -2848,18 +2725,6 @@ if test "${enable_realrtsp}" = "yes"; then VLC_ADD_PLUGIN([access_realrtsp]) fi -dnl -dnl skins2 module -dnl -AC_ARG_ENABLE(libtar, - [ --enable-libtar libtar support for skins2 (default enabled)]) - -AS_IF([test "${enable_libtar}" != "no"],[ - AC_CHECK_HEADERS(libtar.h, [ - VLC_ADD_LIBS([skins2],[-ltar]) - ] ) -]) - dnl dnl A52/AC3 decoder plugin dnl @@ -3115,7 +2980,7 @@ dnl AC_ARG_ENABLE(libass, [ --enable-libass Subtitle support using libass (default enabled)]) AS_IF( [test "${enable_libass}" != "no"], [ - PKG_CHECK_MODULES(LIBASS, libass >= 0.9.6, + PKG_CHECK_MODULES(LIBASS, libass >= 0.9.8, [ VLC_ADD_LIBS([libass],[$LIBASS_LIBS]) VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS]) @@ -3207,7 +3072,6 @@ AC_ARG_ENABLE(xvideo, enable_xvideo="$enable_xcb" ]) -need_xid_provider="no" have_xcb="no" AS_IF([test "${enable_xcb}" != "no"], [ dnl libxcb @@ -3218,11 +3082,6 @@ AS_IF([test "${enable_xcb}" != "no"], [ AS_IF([test "${enable_xvideo}" != "no"], [ PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [ VLC_ADD_PLUGIN([xcb_xv]) - ], [ - PKG_CHECK_MODULES(XCB_XV, [xcb-xv], [ - VLC_ADD_PLUGIN([xcb_xv]) - VLC_ADD_CFLAGS([xcb_xv], [-DXCB_XV_OLD]) - ]) ]) ]) @@ -3236,24 +3095,13 @@ AS_IF([test "${enable_xcb}" != "no"], [ dnl xcb-utils PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [ - have_xcb_keysyms="yes" - ], [ - PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms], [ - have_xcb_keysyms="yes" - VLC_ADD_CFLAGS([globalhotkeys], [-DXCB_KEYSYM_OLD_API]) - ], [ - have_xcb_keysyms="no" - need_xid_provider="yes" - AC_MSG_WARN([libxcb-keysyms not found. Hotkeys will not be supported.]) - ]) - ]) - - AS_IF([test "${have_xcb_keysyms}" = "yes"], [ PKG_CHECK_MODULES(XPROTO, [xproto]) VLC_ADD_PLUGIN([globalhotkeys]) VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}]) VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}]) VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS]) + ], [ + AC_MSG_WARN([libxcb-keysyms (0.3.4 or later) not found. Hotkeys will not work.]) ]) ]) AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"]) @@ -3274,20 +3122,14 @@ AS_IF([test "${enable_glx}" != "no"], [ ]) VLC_ADD_PLUGIN([xcb_glx]) ]) -AC_SUBST([GL_CFLAGS]) -AC_SUBST([GL_LIBS]) dnl -dnl EGL +dnl OpenGL dnl -AC_ARG_ENABLE(egl, - [ --enable-egl EGL support (default disabled)],, [ - enable_egl="no" -]) -AS_IF([test "${enable_egl}" != "no"], [ - PKG_CHECK_MODULES(EGL, [egl]) - VLC_ADD_PLUGIN([egl]) -]) +PKG_ENABLE_MODULES_VLC([GL], [], [gl], [OpenGL support], [auto]) +PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [auto]) +PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [auto]) +PKG_ENABLE_MODULES_VLC([EGL], [], [egl], [EGL support], [auto]) dnl dnl SDL module @@ -3335,8 +3177,7 @@ AC_ARG_ENABLE(fribidi, [ --enable-fribidi fribidi support (default enabled)]) AC_ARG_ENABLE(fontconfig, [ --enable-fontconfig fontconfig support (default enabled)]) -if test "${enable_freetype}" != "no" -then +if test "${enable_freetype}" != "no"; then PKG_CHECK_MODULES(FREETYPE, freetype2,[ VLC_ADD_PLUGIN([freetype]) have_freetype=yes @@ -3345,16 +3186,20 @@ then VLC_ADD_LIBS([freetype],[-liconv -lz]) fi VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}]) - if test "${enable_fontconfig}" != "no" - then - AC_CHECK_HEADERS(fontconfig/fontconfig.h, - [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG]) - VLC_ADD_LIBS([freetype],[-lfontconfig])]) - AC_CHECK_HEADERS(Carbon/Carbon.h, - [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) + + if test "${SYS}" != "mingw32"; then + if test "${enable_fontconfig}" != "no"; then + AC_CHECK_HEADERS(fontconfig/fontconfig.h, + [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG]) + VLC_ADD_LIBS([freetype],[-lfontconfig])]) + AC_CHECK_HEADERS(Carbon/Carbon.h, + [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) + fi + else + VLC_ADD_LIBS([freetype],[-lgdi32]) fi - dnl fribidi support + dnl fribidi support if test "${enable_fribidi}" != "no" then PKG_CHECK_MODULES(FRIBIDI, fribidi, [ @@ -3384,16 +3229,6 @@ dnl SVG module dnl PKG_ENABLE_MODULES_VLC([SVG], [], [librsvg-2.0 >= 2.9.0], [SVG rendering library],[auto]) -dnl -dnl Snapshot vout module (with cache) -dnl -AC_ARG_ENABLE(snapshot, - [ --enable-snapshot snapshot module (default disabled)]) -if test "${enable_snapshot}" = "yes" -then - VLC_ADD_PLUGIN([snapshot]) -fi - dnl dnl iOS vout module dnl @@ -3489,14 +3324,10 @@ fi dnl dnl Linux framebuffer module dnl -AC_ARG_ENABLE(fb, - [ --enable-fb Linux framebuffer support (default enabled on Linux)]) - if test "${enable_fb}" != "no" - then - AC_CHECK_HEADERS(linux/fb.h, [ - VLC_ADD_PLUGIN([fb]) - ]) - fi +AC_CHECK_HEADER([linux/fb.h], [ + VLC_ADD_PLUGIN([fb]) +]) + dnl dnl DirectFB module @@ -3628,11 +3459,11 @@ AC_ARG_ENABLE(alsa, [ --enable-alsa Advanced Linux Sound Architecture (default auto)]) have_alsa="no" AS_IF([test "${enable_alsa}" != "no"], [ - PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.0], [ + PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16], [ have_alsa="yes" ], [ AS_IF([test "x${enable_alsa}" != "x"], [ - AC_MSG_ERROR([alsa-lib not found]) + AC_MSG_ERROR([alsa-lib version 1.0.16 or later not found]) ]) ]) ]) @@ -3678,22 +3509,6 @@ then VLC_ADD_LDFLAGS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation]) fi -dnl -dnl Roku HD1000 audio -dnl -AC_ARG_ENABLE(hd1000a, - [ --enable-hd1000a HD1000 audio module (default enabled on HD1000)]) -if test "${enable_hd1000a}" != "no" -a "${CXX}" != "" && - (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || - test "${enable_hd1000a}" = "yes") -then - AC_LANG_PUSH([C++]) - AC_CHECK_HEADERS(deschutes/libraries/hdmachinex225/PCMAudioPlayer.h, [ - VLC_ADD_PLUGIN([hd1000a]) - AC_CHECK_LIB(HDMachineX225,main,VLC_ADD_LIBS([hd1000a],[-lHDMachineX225])) ]) - AC_LANG_POP([C++]) -fi - dnl dnl JACK modules dnl @@ -3702,8 +3517,8 @@ PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modul dnl dnl UPnP Plugin (Intel SDK) dnl -PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto]) -VLC_ADD_CXXFLAGS([upnp_intel],[${UPNP_CFLAGS}]) +PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPnp SDK],[auto]) +VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}]) dnl dnl Interface plugins @@ -3714,50 +3529,51 @@ EXTEND_HELP_STRING([Interface plugins:]) dnl dnl Skins2 module dnl +AC_ARG_ENABLE(libtar, + [ --enable-libtar libtar support for skins2 (default auto)]) +AS_IF([test "${enable_libtar}" != "no"], [ + AC_CHECK_HEADERS(libtar.h, [ + VLC_ADD_LIBS([skins2],[-ltar]) + ]) +]) + AC_ARG_ENABLE(skins2, [AS_HELP_STRING([--enable-skins2],[Skins2 interface module (default - enabled except on MacOSX and WinCE)])]) -if test "${enable_skins2}" != "no" || - (test "${SYS}" != "darwin" && - test "${SYS}" != "mingwce" && test "${enable_skins2}" == "yes"); then - - dnl test for the required libraries - skins2_missing_lib="no" - + enabled except on MacOSX and WinCE)])],, [ + AS_IF([test "${SYS}" != "darwin" && test "${SYS}" != "mingwce"], [ + enable_skins2="yes" + ], [ + enable_skins2="no" + ]) +]) +AS_IF([test "${enable_skins2}" = "yes"], [ dnl freetype - if test "${have_freetype}" != "yes"; then - skins2_missing_lib="yes" - if test "${enable_skins2}" = "yes"; then - AC_MSG_ERROR([Could not find freetype (required for skins2)]) - fi - fi + AS_IF([test "${have_freetype}" != "yes"], [ + AC_MSG_ERROR([Could not find FreeType (required for skins2)]) + ]) - if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32"); then - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" + 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_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32 -luser32]) - else if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "darwin"); then - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" + ], [test "${SYS}" = "darwin"], [ VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LDFLAGS([skins2],[-Wl,-framework,Carbon]) - else if test "${skins2_missing_lib}" = "no"; then - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" - VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS]) + ], [ + PKG_CHECK_MODULES([XPM], [xpm]) + PKG_CHECK_MODULES([XEXT], [xext]) + VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} ${XEXT_CFLAGS} ${XPM_CFLAGS} -DX11_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) - VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lXpm -lX11]) - need_xid_provider="no" - fi fi fi -fi -AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" || - (test "${SYS}" != "darwin" && - test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")]) + VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} -lX11]) + + ]) + VLC_ADD_PLUGIN([skins2]) + ALIASES="${ALIASES} svlc" +]) +AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) dnl dnl Hildon UI @@ -3776,7 +3592,6 @@ AS_IF([test "${enable_hildon}" = "yes"], [ VLC_ADD_LIBS([hildon],[${HILDON_LIBS} ${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_PLUGIN([hildon]) ALIASES="${ALIASES} mvlc" - need_xid_provider="no" ], [ AS_IF([test "${enable_hildon}" = "yes"],[ AC_MSG_ERROR([Hildon libraries not found]) @@ -3805,15 +3620,14 @@ AS_IF([test "${enable_qt4}" != "no"], [ AC_MSG_CHECKING([whether Qt uses X11]) CPPFLAGS="${CPPFLAGS} ${QT4_CFLAGS}" - AC_PREPROC_IFELSE([ + 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]) - need_xid_provider="no" VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}]) ], [ AC_MSG_RESULT([no]) @@ -3864,6 +3678,8 @@ then VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle]) + VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit -Wl,-framework,BGHUDAppKit]) + VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit]) dnl For bug report VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit]) @@ -3922,7 +3738,6 @@ AC_ARG_ENABLE(macosx-vlc-app, AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" && (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ]) - dnl dnl ncurses module dnl @@ -3980,13 +3795,6 @@ then ]) fi -dnl -dnl Post-interface configuration checks -dnl -AS_IF([test "$need_xid_provider" = "yes"], [ - AC_MSG_ERROR([X11 video outputs need a window provider (Qt4, Skins2, Hildon or xcb-utils), but none were found. Please install xcb-keysyms.]) -]) - dnl dnl Visualisation plugin dnl @@ -4117,11 +3925,8 @@ AS_IF([test "${enable_gnutls}" != "no"], [ dnl pkg-config --libs gnutls omits these VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL}]) ]) - dnl The GnuTLS plugin invokes gcry_control directly. - AS_IF([test "${have_libgcrypt}" = "yes"],[ - VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}]) - VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}]) - ]) + VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}]) + VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}]) VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS]) ], [ AS_IF([test "${enable_gnutls}" = "yes"], [ @@ -4134,24 +3939,22 @@ AS_IF([test "${enable_gnutls}" != "no"], [ dnl dnl RemoteOSD plugin (VNC client as video filter) dnl -AC_ARG_ENABLE(remoteosd, - [ --disable-remoteosd RemoteOSD plugin (default enabled)]) - -AS_IF([test "${enable_remoteosd}" != "no"], [ - AS_IF([test "${have_libgcrypt}" = "yes"],[ - VLC_ADD_PLUGIN([remoteosd]) - VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS}) - VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS}) - ], [ - AC_MSG_ERROR([libgcrypt support required for RemoteOSD plugin]) - ]) +AC_MSG_CHECKING([whether to enable the RemoteOSD plugin]) +AS_IF([test "${have_libgcrypt}" = "yes"],[ + AC_MSG_RESULT(yes) + VLC_ADD_PLUGIN([remoteosd]) + VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS}) + VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS}) +], [ + AC_MSG_RESULT(no) + AC_MSG_WARN([libgcrypt support required for RemoteOSD plugin]) ]) dnl dnl RAOP plugin dnl -AC_MSG_CHECKING([whether to enable RAOP plugin]) +AC_MSG_CHECKING([whether to enable the RAOP plugin]) AS_IF([test "${have_libgcrypt}" = "yes"], [ AC_MSG_RESULT(yes) VLC_ADD_PLUGIN([stream_out_raop]) @@ -4228,11 +4031,7 @@ dnl AC_ARG_ENABLE(media-library, [--enable-media-library media library (default disabled)]) if test "${enable_media_library}" == "yes"; then if test "${enable_sqlite}" != "yes"; then - if test "${enable_media_library}" == "yes"; then - AC_MSG_ERROR([SQLite module is required for the media library]) - else - AC_MSG_WARN([SQLite module is required for the media library]) - fi + AC_MSG_ERROR([SQLite module is required for the media library]) else AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library]) VLC_ADD_CPPFLAGS([qt4],"-DMEDIA_LIBRARY") @@ -4422,9 +4221,7 @@ AC_CONFIG_FILES([ test/Makefile modules/access/Makefile modules/access/bd/Makefile - modules/access/bda/Makefile modules/access/dshow/Makefile - modules/access/dvb/Makefile modules/access/mms/Makefile modules/access/rtp/Makefile modules/access/rtsp/Makefile @@ -4434,10 +4231,6 @@ AC_CONFIG_FILES([ modules/access/zip/Makefile modules/access_output/Makefile modules/audio_filter/Makefile - modules/audio_filter/channel_mixer/Makefile - modules/audio_filter/converter/Makefile - modules/audio_filter/resampler/Makefile - modules/audio_filter/spatializer/Makefile modules/audio_mixer/Makefile modules/audio_output/Makefile modules/codec/Makefile @@ -4466,10 +4259,10 @@ AC_CONFIG_FILES([ modules/gui/macosx_dialog_provider/Makefile modules/gui/qt4/Makefile modules/gui/skins2/Makefile + modules/lua/Makefile modules/meta_engine/Makefile modules/misc/Makefile modules/misc/dummy/Makefile - modules/misc/lua/Makefile modules/misc/notify/Makefile modules/misc/playlist/Makefile modules/misc/osd/Makefile @@ -4550,7 +4343,7 @@ build flavour : " test "${enable_debug}" = "yes" && printf "debug " test "${enable_cprof}" = "yes" && printf "cprof " test "${enable_gprof}" = "yes" && printf "gprof " -test "${enable_optimizations}" = "yes" && printf "optim " +test "${enable_optimizations}" != "no" && printf ${enable_optimizations} echo "" if test "${enable_vlc}" != "no"; then echo "vlc aliases :${ALIASES}"