X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=8202686263ada3f411ef015d1e30c2d566e60445;hb=818a663ea9987aad38d748b7010c9f0d0de863b5;hp=dbad5350d21853dfd268c363963a433466b921b0;hpb=6d56f8539f00c20aece1d80355edb8875c20b12f;p=vlc diff --git a/configure.ac b/configure.ac index dbad5350d2..8202686263 100644 --- a/configure.ac +++ b/configure.ac @@ -298,7 +298,7 @@ case "${host_os}" in VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([activex mozilla],[-lgdi32]) VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm]) - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl flac ts audioscrobbler lua],[-lws2_32]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua],[-lws2_32]) fi if test "${SYS}" = "mingwce"; then # add ws2 for closesocket, select, recv @@ -332,9 +332,9 @@ case "${host_os}" in LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}" dnl Check for BONE if test -f /boot/beos/system/lib/libbind.so; then - VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl],[-lbind -lsocket]) + VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl_udp],[-lbind -lsocket]) else - VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl],[-lnet]) + VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl_udp],[-lnet]) fi dnl Ugly check for Zeta @@ -392,7 +392,7 @@ lt_cv_deplibs_check_method=pass_all dnl dnl Gettext stuff dnl -AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT_VERSION(0.16.1) AM_GNU_GETTEXT([external]) VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}]) @@ -469,7 +469,7 @@ dnl Check for system libs needed need_libc=false dnl Check for usual libc functions -AC_CHECK_FUNCS([gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy strdup strndup strnlen atof lldiv mmap]) +AC_CHECK_FUNCS([gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy strdup strndup strnlen atof lldiv posix_fadvise posix_madvise]) AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)]) AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)]) AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)]) @@ -477,6 +477,8 @@ AC_FUNC_ALLOCA AH_BOTTOM([#include ]) +AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGINS([access_mmap])]) + AS_IF([test "${SYS}" = "linux"], [ AC_CHECK_FUNCS(tee) ]) @@ -506,7 +508,7 @@ AC_CHECK_FUNCS(connect,,[ AC_CHECK_FUNCS(send,,[ AC_CHECK_LIB(socket,send,[ - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard growl],[-lsocket]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard growl_udp],[-lsocket]) ]) ]) @@ -795,7 +797,10 @@ AC_CHECK_TYPE(ssize_t,, [ AC_DEFINE(ssize_t, int) ]) -AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])]) +dnl don't attemp to use poll on darwin, it can't poll a tty. select will do a better job. +if test "${SYS}" != "darwin"; then + AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])]) +fi dnl Check for dirent need_dirent=false @@ -1680,7 +1685,11 @@ dnl AC_ARG_ENABLE(growl, [ --enable-growl growl notification plugin (default enabled)]) AS_IF([test "${enable_growl}" != "no"], [ - VLC_ADD_PLUGINS([growl]) + VLC_ADD_PLUGINS([growl_udp]) + AC_CHECK_HEADERS(Growl/GrowlDefines.h, [ + VLC_ADD_PLUGINS([growl]) + VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit]) + ]) ] ) @@ -3741,10 +3750,10 @@ if test "${enable_x264}" != "no"; then AC_MSG_RESULT(yes) VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}]) VLC_ADD_LIBS([x264],[-L${real_x264_tree}]) - LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}" - AC_CHECK_LIB(x264, x264_encoder_open, [ - VLC_ADD_BUILTINS([x264]) - VLC_ADD_LIBS([x264],[-lx264]) + PKG_CHECK_MODULES(X264,x264, [ + VLC_ADD_PLUGINS([x264]) + VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) + VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) ],[ AC_MSG_ERROR([the specified tree hasn't been compiled]) ]) @@ -3754,11 +3763,11 @@ if test "${enable_x264}" != "no"; then AC_MSG_ERROR([the specified tree doesn't have x264.h]) fi else - LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}" AC_CHECK_HEADERS(x264.h, [ - AC_CHECK_LIB(x264, x264_encoder_open, [ + PKG_CHECK_MODULES(X264,x264, [ VLC_ADD_PLUGINS([x264]) - VLC_ADD_LIBS([x264],[-lx264]) + VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) + VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) ],[ if test "${enable_x264}" = "yes"; then AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html]) @@ -3823,7 +3832,7 @@ dnl asa/csri subtitle rendering module dnl AC_ARG_ENABLE(csri, [ --enable-csri Subtitle support using CSRI / asa (default disabled)]) -AS_IF( [test "${enable_csri}" != "no"], [ +AS_IF( [test "${enable_csri}" = "yes"], [ PKG_CHECK_MODULES(CSRI, csri >= 0.1.0, [ @@ -3840,7 +3849,7 @@ dnl asa demuxer dnl AC_ARG_ENABLE(asademux, [ --enable-asademux asa subtitle demuxing (default disabled)]) -AS_IF( [test "${enable_asa}" != "no"], [ +AS_IF( [test "${enable_asademux}" = "yes"], [ PKG_CHECK_MODULES(PCRE, libpcre >= 6.5, [ @@ -4645,6 +4654,20 @@ AC_ARG_ENABLE(esd, fi fi]) +dnl +dnl Pulseaudio module +dnl +AC_ARG_ENABLE(pulse, + [ --enable-pulse Pulseaudio support (default enabled)]) + if test "${enable_pulse}" != "no" + then + PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.8, + [ VLC_ADD_PLUGINS([pulse]) + VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}]) + VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS}])], + [AC_MSG_WARN(pulsaudio library not found)]) + fi + dnl dnl Portaudio module dnl @@ -5312,7 +5335,7 @@ AC_ARG_ENABLE(macosx, [ --enable-macosx MacOS X support (default enabled on MacOS X)]) if test "x${enable_macosx}" = "xyes" then - VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation]) +# VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation]) VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,Cocoa]) VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,OpenGL]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon]) @@ -5322,9 +5345,9 @@ then VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QTKit]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit]) VLC_ADD_LDFLAGS([opengllayer], [-Wl,-framework,QuartzCore]) - VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer], [-fobjc-exceptions] ) + VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] ) - VLC_ADD_PLUGINS([access_eyetv]) +# VLC_ADD_PLUGINS([access_eyetv]) VLC_ADD_BUILTINS([macosx minimal_macosx]) ORIGCFLAGS=$CFLAGS @@ -5487,6 +5510,19 @@ then fi fi +dnl +dnl AtmoLight (homebrew AmbiLight) +dnl +if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then + AC_ARG_ENABLE(atmo, +[ --disable-atmo AtmoLight (homebrew philips ambilight) (default enabled)]) + if test "${enable_atmo}" != "no"; then + AC_LANG_PUSH(C++) + VLC_ADD_PLUGINS([atmo]) + AC_LANG_POP(C++) + fi +fi + dnl dnl Bonjour services discovery dnl @@ -6210,6 +6246,7 @@ AC_CONFIG_FILES([ modules/stream_out/transrate/Makefile modules/video_chroma/Makefile modules/video_filter/Makefile + modules/video_filter/atmo/Makefile modules/video_output/Makefile modules/video_output/msw/Makefile modules/video_output/qte/Makefile