X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=58d5122d62eee8e58963735d44d34b35f3e141c9;hb=857663915d77dccb1c262fbe46b5ce8b892552e8;hp=198b23a1538dfd2082e3e5b870674d31249e5400;hpb=0fecd265359604bcfed730b1f8750d6977f0eac8;p=vlc diff --git a/configure.ac b/configure.ac index 198b23a153..58d5122d62 100644 --- a/configure.ac +++ b/configure.ac @@ -556,26 +556,16 @@ 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 open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale pthread_cond_timedwait_monotonic_np pthread_condattr_setclock]) -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_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid lldiv 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.]) ]) dnl mingw64 implements those as static inline, not functions with C linkage -AC_LINK_IFELSE([ - AC_LANG_PROGRAM([#include ], [ - char *c; - if (asprintf(&c, "%s %d", "string", 1) == -1) - c = NULL; - ])],[AC_DEFINE([HAVE_ASPRINTF],[1],[Define to 1 if you have asprintf function])],[AC_LIBOBJ([asprintf])]) -AC_LINK_IFELSE([ - AC_LANG_PROGRAM([#include - #include ], [ - char *c; - va_list ap; - if (vasprintf(&c, "%s %d", ap) == -1) - c = NULL; - ])],[AC_DEFINE([HAVE_VASPRINTF],[1],[Define to 1 if you have asprintf function])],[AC_LIBOBJ([vasprintf])]) +VLC_REPLACE_DECL([asprintf], [#include ]) +VLC_REPLACE_DECL([vasprintf], [#include ]) +VLC_REPLACE_DECL([gmtime_r], [#include ]) +VLC_REPLACE_DECL([localtime_r], [#include ]) dnl C11 static_assert() AC_MSG_CHECKING([for static_assert in assert.h]) @@ -648,10 +638,6 @@ AC_LINK_IFELSE([ ])],[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_rtmp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop stream_out_chromecast oldrc netsync ts remoteosd audiobargraph_a],[${SOCKET_LIBS}]) -]) AC_SUBST(SOCKET_LIBS) dnl Check for socklen_t @@ -699,7 +685,6 @@ AC_CHECK_FUNC(getopt_long,, [ AC_SUBST(GNUGETOPT_LIBS) AC_CHECK_LIB(m,cos,[ - VLC_ADD_LIBS([adjust wave ripple psychedelic gradient x264 goom noise grain scene swscale postproc mpc qt4 audiobargraph_v colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum smooth],[-lm]) LIBM="-lm" ], [ LIBM="" @@ -1748,7 +1733,7 @@ dnl dnl libsmbclient plugin dnl PKG_ENABLE_MODULES_VLC([SMBCLIENT], [smb], [smbclient], (SMB/CIFS support), [auto]) -AS_IF([test "${SYS}" = "mingw32"], [ VLC_ADD_PLUGIN([access_smb]) ]) +AS_IF([test "${SYS}" = "mingw32"], [ VLC_ADD_PLUGIN([smb]) ]) dnl dnl liBDSM access module @@ -1978,7 +1963,7 @@ dnl dnl libdvbpsi check for ts mux/demux dnl have_dvbpsi="no" -PKG_WITH_MODULES([DVBPSI], [libdvbpsi], [have_dvbpsi="yes"]) +PKG_WITH_MODULES([DVBPSI], [libdvbpsi >= 1.0.0], [have_dvbpsi="yes"]) AM_CONDITIONAL(HAVE_DVBPSI, [test "${have_dvbpsi}" = "yes"]) @@ -2034,13 +2019,12 @@ AS_IF([test "${enable_sid}" != "no"], [ dnl dnl ogg demux plugin dnl -PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto]) +PKG_ENABLE_MODULES_VLC([OGG], [mux_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]) dnl Check for libshout PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto]) fi @@ -2523,8 +2507,6 @@ then CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" AC_CHECK_HEADERS(postproc/postprocess.h) VLC_ADD_PLUGIN([postproc]) - VLC_ADD_LIBS([postproc],[$POSTPROC_LIBS $AVUTIL_LIBS]) - VLC_ADD_CFLAGS([postproc],[$POSTPROC_CFLAGS $AVUTIL_CFLAGS]) VLC_RESTORE_FLAGS ],[ AC_MSG_WARN([${POSTPROC_PKG_ERRORS}.]) @@ -3044,9 +3026,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [ AC_MSG_NOTICE([VDPAU decoding acceleration activated]) ], [ AS_IF([test -n "${enable_vdpau}"], [ - AC_MSG_ERROR([libavutil >= 52.4.0 and libavcodec >= 55.26.0 are required for VDPAU decoding.]) + AC_MSG_ERROR([libav libavutil >= 52.4.0 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.]) + AC_MSG_WARN([libav libavutil >= 52.4.0 and libavcodec >= 55.26.0 are required for VDPAU decoding.]) ]) ]) ]) @@ -3163,9 +3145,6 @@ if test "${enable_freetype}" != "no"; then VLC_ADD_CPPFLAGS([skins2],[${FREETYPE_CFLAGS}]) VLC_ADD_LIBS([skins2],[${FREETYPE_LIBS}]) - AC_CHECK_HEADERS(Carbon/Carbon.h, - [VLC_ADD_LIBS([freetype],[-Wl,-framework,Carbon])]) - dnl fontconfig support if test "${SYS}" != "mingw32"; then if test "${enable_fontconfig}" != "no"; then @@ -3252,7 +3231,12 @@ AS_IF([test "${enable_directx}" != "no"], [ #include ]) - dnl Direct3D + dnl Direct3D11 + AC_CHECK_HEADERS(d3d11.h, [ + VLC_ADD_PLUGIN([direct3d11]) + ]) + + dnl Direct3D9 AC_CHECK_HEADERS(d3d9.h, [ VLC_ADD_PLUGIN([direct3d9]) ]) @@ -3593,9 +3577,7 @@ 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]) - VLC_ADD_CFLAGS([stream_out_chromaprint],[${CHROMAPRINT_CFLAGS}] [-I./webservices -I../stream_out]) - VLC_ADD_LIBS([stream_out_chromaprint],[${CHROMAPRINT_LIBS}]), + VLC_ADD_PLUGIN([stream_out_chromaprint]), 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)] @@ -3611,9 +3593,6 @@ AC_ARG_VAR(PROTOC, [protobuf compiler]) AC_PATH_PROGS(PROTOC, protoc, no) PKG_WITH_MODULES([CHROMECAST],[protobuf-lite >= protobuf_lite_version], [ AS_IF([test "x${PROTOC}" != "xno"], [ - VLC_ADD_PLUGIN([stream_out_chromecast]) - VLC_ADD_CXXFLAGS([stream_out_chromecast],[${CHROMECAST_CFLAGS}] [-I./chromecast]) - VLC_ADD_LIBS([stream_out_chromecast],[${CHROMECAST_LIBS}]) build_chromecast="yes" ], [ AC_MSG_ERROR(protoc compiler needed for [chromecast] was not found) @@ -3808,11 +3787,10 @@ dnl ncurses module dnl AC_ARG_ENABLE(ncurses, [AS_HELP_STRING([--disable-ncurses],[ncurses text-based interface (default auto)])]) +have_ncurses="no" AS_IF([test "${enable_ncurses}" != "no"] ,[ PKG_CHECK_MODULES([NCURSES], [ncursesw], [ - VLC_ADD_PLUGIN([ncurses]) - VLC_ADD_CFLAGS([ncurses],[${NCURSES_CFLAGS}]) - VLC_ADD_LIBS([ncurses],[${NCURSES_LIBS} ${LIBPTHREAD}]) + have_ncurses="yes" ALIASES="${ALIASES} nvlc" ], [ AS_IF([test -n "${enable_ncurses}"], [ @@ -3820,21 +3798,22 @@ AS_IF([test "${enable_ncurses}" != "no"] ,[ ]) ]) ]) +AM_CONDITIONAL([HAVE_NCURSES], [test "${have_ncurses}" = "yes"]) dnl dnl Lirc plugin dnl AC_ARG_ENABLE(lirc, [ --enable-lirc lirc support (default disabled)]) -if test "${enable_lirc}" = "yes" -then - AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false") - if test "${have_lirc}" = "true" - then - VLC_ADD_PLUGIN([lirc]) - VLC_ADD_LIBS([lirc],[-llirc_client]) - fi -fi +have_lirc="no" +AS_IF([test "${enable_lirc}" = "yes"], [ + AC_CHECK_HEADER(lirc/lirc_client.h, [ + AC_CHECK_LIB(lirc_client, lirc_init, [ + have_lirc="true" + ]) + ]) +]) +AM_CONDITIONAL([HAVE_LIRC], [test "${have_lirc}" = "yes"]) EXTEND_HELP_STRING([Visualisations and Video filter plugins:]) dnl @@ -3871,8 +3850,6 @@ AS_IF([test "${enable_vsxu}" != "no"], PKG_CHECK_MODULES(VSXU, libvsxu, [ VLC_ADD_PLUGIN([vsxu]) - VLC_ADD_CXXFLAGS([vsxu],[$VSXU_CFLAGS]) - VLC_ADD_LIBS([vsxu],[$VSXU_LIBS]) ],[ AC_MSG_WARN([${VSXU_PKG_ERRORS}.]) ]) @@ -3886,23 +3863,10 @@ AS_HELP_STRING([--disable-atmo],[AtmoLight (homemade Philips Ambilight clone) (default enabled)]),, [enable_atmo="yes"]) AS_IF([test "${enable_atmo}" != no], [ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "linux"], [ - AC_LANG_PUSH(C++) VLC_ADD_PLUGIN([atmo]) - AC_LANG_POP(C++) ]) ]) -dnl -dnl glSpectrum -dnl -AC_ARG_ENABLE(glspectrum, - [ --enable-glspectrum 3D OpenGL spectrum visualization (default auto)]) -if test "${enable_glspectrum}" != "no" && test "${have_gl}" = "yes" -then - VLC_ADD_PLUGIN([glspectrum]) - VLC_ADD_LIBS([glspectrum],[$GL_LIBS]) -fi - EXTEND_HELP_STRING([Service Discovery plugins:]) dnl dnl Bonjour services discovery @@ -4135,19 +4099,12 @@ AC_CONFIG_FILES([ lib/Makefile bin/Makefile test/Makefile - modules/access_output/Makefile - modules/control/Makefile - modules/gui/Makefile modules/gui/ios_dialog_provider/Makefile modules/gui/macosx/Makefile modules/gui/minimal_macosx/Makefile modules/gui/macosx_dialog_provider/Makefile modules/gui/qt4/Makefile modules/gui/skins2/Makefile - modules/mux/Makefile - modules/stream_out/Makefile - modules/video_filter/Makefile - modules/visualization/Makefile modules/hw/mmal/Makefile ])