X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=81f327c29ded14b07616577ab4fbff7ec1d81b9e;hb=e2bc2640b7206726c14bb7c145df1e9e72f49289;hp=dbad5350d21853dfd268c363963a433466b921b0;hpb=6d56f8539f00c20aece1d80355edb8875c20b12f;p=vlc diff --git a/configure.ac b/configure.ac index dbad5350d2..81f327c29d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,16 +1,16 @@ dnl Autoconf settings for vlc -AC_INIT(vlc,0.9.0-svn) +AC_INIT(vlc,0.9.0-git) VERSION_MAJOR="0" VERSION_MINOR="9" VERSION_REVISION="0" -VERSION_EXTRA="svn" +VERSION_EXTRA="git" CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Grishenko" COPYRIGHT_YEARS="1996-2008" -AC_PREREQ(2.59) dnl this really should be 2.59c +AC_PREREQ(2.59c) AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) AC_CANONICAL_BUILD @@ -275,6 +275,9 @@ case "${host_os}" in AC_CHECK_TOOL(WINDRES, windres, :) case "${host_os}" in + *wince* | *mingwce* | *mingw32ce* | *pe*) + SYS=mingwce + ;; *mingw32*) SYS=mingw32 ;; @@ -287,9 +290,6 @@ case "${host_os}" in #endif], SYS=mingw32, SYS=cygwin) ;; - *wince* | *mingwce* | *pe*) - SYS=mingwce - ;; esac if test "${SYS}" = "mingw32"; then @@ -298,13 +298,14 @@ 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_rtmp 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 VLC_ADD_CPPFLAGS([libvlc vlc],[-Dmain(a,b)=maince(a,b)]) VLC_ADD_LDFLAGS([libvlc vlc],[-e WinMainCRTStartup]) - VLC_ADD_LIBS([libvlc access_http access_mms access_udp access_tcp access_ftp access_output_udp sap http netsync],[-lws2]) + VLC_ADD_LIBS([libvlc access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp sap http netsync audioscrobbler growl rtp stream_out_rtp],[-lws2]) + VLC_ADD_LIBS([libvlc],[-lmmtimer]) fi ;; *nto*) @@ -332,9 +333,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 +393,7 @@ lt_cv_deplibs_check_method=pass_all dnl dnl Gettext stuff dnl -AM_GNU_GETTEXT_VERSION(0.15) +AM_GNU_GETTEXT_VERSION([0.17]) AM_GNU_GETTEXT([external]) VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}]) @@ -469,7 +470,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 +478,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 +509,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 access_rtmp sap access_output_udp stream_out_standard growl_udp],[-lsocket]) ]) ]) @@ -795,7 +798,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 @@ -1057,6 +1063,10 @@ if test "${ac_cv_c_omit_frame_pointer}" != "no"; then fi dnl Check for -fvisibility=hidden +dnl Don't test on mingw32, because it is going to work with just a warning +dnl even if it doesn't support it +if test "${SYS}" != "mingw32" +then AC_CACHE_CHECK([if \$CC accepts -fvisibility=hidden], [ac_cv_c_visibility_hidden], [CFLAGS="${CFLAGS_save} -fvisibility=hidden" @@ -1064,6 +1074,7 @@ AC_CACHE_CHECK([if \$CC accepts -fvisibility=hidden], if test "${ac_cv_c_visibility_hidden}" != "no"; then VLC_ADD_CFLAGS([libvlc plugin],[-fvisibility=hidden]) fi +fi AM_CONDITIONAL(HAVE_COMPILER_EXPORT, [test "$SYS" = "mingw32" -o "${ac_cv_c_visibility_hidden}" != "no"]) @@ -1189,15 +1200,15 @@ dnl VLC_ADD_PLUGINS([dummy logger memcpy]) VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 demux_cdg cdg ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta]) VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf t140 dvbsub cc mpeg_audio lpcm a52 dts cinepak flac]) -VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving]) +VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving croppadd dynamicoverlay blendbench]) VLC_ADD_PLUGINS([converter_fixed mono]) VLC_ADD_PLUGINS([trivial_resampler ugly_resampler]) VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer]) VLC_ADD_PLUGINS([playlist export nsc xtag]) -VLC_ADD_PLUGINS([i420_rgb grey_yuv rawvideo blend scale image logo magnify puzzle colorthres]) +VLC_ADD_PLUGINS([i420_rgb grey_yuv rawvideo blend scale image vmem logo magnify puzzle colorthres]) VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv smf]) VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp]) -VLC_ADD_PLUGINS([access_http access_mms access_ftp]) +VLC_ADD_PLUGINS([access_http access_mms access_ftp access_rtmp]) VLC_ADD_PLUGINS([access_filter_bandwidth]) VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) @@ -1627,22 +1638,22 @@ then AC_MSG_WARN([lua5.1 not found, trying lua >= 5.1 instead]) PKG_CHECK_MODULES(LUA, lua >= 5.1, [ have_lua=yes ], - [ + [ have_lua=yes - AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], - [], + AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], + [], [ have_lua=no ] ) - AC_CHECK_LIB( lua5.1 , luaL_newstate, + AC_CHECK_LIB( lua5.1 , luaL_newstate, [LUA_LIBS="-llua5.1"], - AC_CHECK_LIB( lua51 , luaL_newstate, + AC_CHECK_LIB( lua51 , luaL_newstate, [LUA_LIBS="-llua51"], - AC_CHECK_LIB( lua , luaL_newstate, - [LUA_LIBS="-llua"], - [ have_lua=no + AC_CHECK_LIB( lua , luaL_newstate, + [LUA_LIBS="-llua"], + [ have_lua=no AC_MSG_WARN([lua >= 5.1 not found!]) ]) - ) - ) + ) + ) ]) ]) if test "x${have_lua}" = "xyes" ; then @@ -1652,6 +1663,7 @@ then VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS]) fi fi +AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"]) dnl dnl HTTP daemon @@ -1663,6 +1675,7 @@ then VLC_ADD_PLUGINS([http]) AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support) fi +AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"]) dnl dnl VideoLAN manager @@ -1680,7 +1693,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]) + ]) ] ) @@ -2568,9 +2585,11 @@ AC_ARG_ENABLE(screen, [ --enable-screen Screen capture support (default enabled)]) if test "${enable_screen}" != "no"; then if test "${SYS}" = "darwin"; then - AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ - VLC_ADD_PLUGINS([screen]) - VLC_ADD_LDFLAGS([screen],[-Wl,-framework,ApplicationServices]) + AC_CHECK_HEADERS(OpenGL/gl.h, [ + AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ + VLC_ADD_PLUGINS([screen]) + VLC_ADD_LDFLAGS([screen],[-Wl,-framework,OpenGL,-framework,ApplicationServices]) + ]) ]) elif test "${SYS}" = "mingw32"; then VLC_ADD_PLUGINS([screen]) @@ -2995,9 +3014,9 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a]) VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}]) else - dnl The given libavcodec wasn't built with --enable-pp + dnl The given libavcodec wasn't built with --enable-postproc AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find libpostproc.a in ${real_ffmpeg_tree}/[libavcodec/]libpostproc/. Make sure you configured ffmpeg with --enable-pp]) + AC_MSG_ERROR([cannot find libpostproc.a in ${real_ffmpeg_tree}/[libavcodec/]libpostproc/. Make sure you configured ffmpeg with --enable-postproc]) fi fi dnl Use a custom libffmpeg @@ -3008,11 +3027,28 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo PKG_CONFIG_LIBDIR_save="$PKG_CONFIG_LIBDIR" export PKG_CONFIG_PATH="" export PKG_CONFIG_LIBDIR="${real_ffmpeg_tree}" + VLC_SAVE_FLAGS - PKG_CHECK_MODULES( [FFMPEG],[libavcodec libavformat libpostproc], [ + PKG_CHECK_MODULES( [FFMPEG],[libavformat libavcodec libpostproc], [ VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS}) VLC_ADD_LIBS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})] - ,[]) + AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.]) + ) + AS_IF([ test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"],[ + AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.]) + PKG_CHECK_MODULES( [SWSCALE],[libswscale], [ + VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}]) + VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[${SWSCALE_CFLAGS}])]) + ]) + CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS} ${SWSCALE_CFLAGS}" + CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS} ${SWSCALE_CFLAGS}" + + AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) + AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h) + AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h]) + + VLC_RESTORE_FLAGS AS_IF([test -n "${PKG_CONFIG_PATH_save}"],[ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH_save}" ],[ @@ -3029,17 +3065,7 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo VLC_ADD_BUILTINS([stream_out_switcher]) fi - if test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"; then - AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.]) - VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libswscale ${real_ffmpeg_tree}/libswscale/libswscale.a]) - VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libswscale]) - fi - if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then - AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.]) - VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat -lavformat -lz]) - VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavformat]) - fi else @@ -3049,9 +3075,9 @@ dnl Trying with pkg-config VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}" CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}" - AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) - AC_CHECK_HEADERS(ffmpeg/avformat.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avformat.h.])] ) - AC_CHECK_HEADERS(ffmpeg/avutil.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avutil.h.])] ) + AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) + AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h) dnl newer ffmpeg have a separate libpostproc PKG_CHECK_MODULES(POSTPROC, libpostproc,[ VLC_ADD_CFLAGS([ffmpeg],[${POSTPROC_CFLAGS}]) @@ -3059,7 +3085,7 @@ dnl Trying with pkg-config ],[ true ]) CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}" CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" - AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) + AC_CHECK_HEADERS(postproc/postprocess.h) if test "${SYS}" = "darwin"; then VLC_ADD_BUILTINS([ffmpeg]) else @@ -3079,9 +3105,8 @@ dnl Trying with pkg-config PKG_CHECK_MODULES(SWSCALE,[libswscale],[ VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}]) VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}]) -dnl AC_CHECK_HEADERS(ffmpeg/swscale.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/swscale.h.])]) AC_CHECK_LIB(swscale, sws_getContext, - [AC_CHECK_HEADERS([ffmpeg/avutil.h, ffmpeg/swscale.h])],[],[-lavutil -lm]) + [AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h])],[],[-lavutil -lm]) ],[ true ]) VLC_RESTORE_FLAGS ],[ @@ -3091,10 +3116,10 @@ dnl AC_CHECK_HEADERS(ffmpeg/swscale.h, [], [AC_MSG_ERROR([Missing header file dnl CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}" LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg} ${LIBS_ffmpeg}" - AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) - AC_CHECK_HEADERS(ffmpeg/avformat.h) - AC_CHECK_HEADERS(ffmpeg/avutil.h) - AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) + AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) + AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h) + AC_CHECK_HEADERS(postproc/postprocess.h) AC_CHECK_LIB(avutil, av_crc_init, [ VLC_ADD_LIBS([ffmpeg],[-lavutil]) @@ -3110,7 +3135,7 @@ dnl AC_CHECK_HEADERS(ffmpeg/swscale.h, [], [AC_MSG_ERROR([Missing header file AC_CHECK_LIB(postproc, pp_postprocess, [ VLC_ADD_LIBS([ffmpeg],[-lpostproc])], - AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-pp.]), + AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-postproc.]), [$LDAVUTIL]) AC_CHECK_LIB(avformat, av_open_input_stream, [ @@ -3119,7 +3144,7 @@ dnl AC_CHECK_HEADERS(ffmpeg/swscale.h, [], [AC_MSG_ERROR([Missing header file CPPFLAGS="${CPPFLAGS_save}" AC_CHECK_LIB(swscale, sws_getContext, [ - AC_CHECK_HEADERS(ffmpeg/swscale.h) + AC_CHECK_HEADERS(ffmpeg/swscale.h libswscale/swscale.h) VLC_ADD_LIBS([ffmpeg],[-lswscale]) ], [], [-lavcodec $LDAVUTIL]) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" @@ -3148,9 +3173,9 @@ then AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a, make sure you compiled libavcodecaltivec in ${with_ffmpeg_tree}]) fi if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a"; then - dnl The given libavcodecaltivec wasn't built with --enable-pp + dnl The given libavcodecaltivec wasn't built with --enable-postproc AC_MSG_RESULT(no) - AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp]) + AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-postproc]) fi dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a) @@ -3713,9 +3738,10 @@ AC_CHECK_HEADERS(png.h, [ VLC_ADD_PLUGINS([osdmenu osd_parser]) AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])], [],[-lz]) - LDFLAGS="${LDFLAGS_save}" + LDFLAGS="${LDFLAGS_save}" ]) fi +AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_png}" != "no"]) dnl dnl H264 encoder plugin (using libx264) @@ -3741,10 +3767,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,17 +3780,15 @@ 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]) fi ]) - ]) LDFLAGS="${LDFLAGS_save}" fi fi @@ -3795,7 +3819,7 @@ dnl AC_ARG_ENABLE(zvbi, [ --enable-zvbi VBI (inc. Teletext) decoding support with libzvbi (default enabled)]) AC_ARG_ENABLE(telx, - [ --enable-telx, Teletext decoding module (conflicting with zvbi) (default disabled)]) + [ --enable-telx Teletext decoding module (conflicting with zvbi) (default disabled)]) AS_IF( [test "${enable_zvbi}" != "no"],[ AS_IF( [test "${enable_telx}" = "yes"],[ @@ -3823,7 +3847,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 +3864,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, [ @@ -3971,7 +3995,7 @@ fi dnl dnl XVMC module -dnl (enabled by default except on win32) +dnl (disabled by default except on win32) dnl AC_ARG_ENABLE(xvmc, [ --enable-xvmc XVMC support (default disabled)]) @@ -3981,7 +4005,7 @@ if test "${enable_xvmc}" = "yes" && CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}" AC_CHECK_HEADERS(X11/extensions/vldXvMC.h, [ VLC_ADD_PLUGINS([xvmc]) - VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) + VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXvMCW -lXv -lXinerama]) VLC_ADD_CPPFLAGS([xvmc],[${X_CFLAGS}]) ]) CPPFLAGS="${CPPFLAGS_save}" @@ -4030,12 +4054,14 @@ dnl VLC_ADD_LIBS([xvideo],[-lXxf86vm_pic]) VLC_ADD_LIBS([x11],[-lXxf86vm_pic]) VLC_ADD_LIBS([glx],[-lXxf86vm_pic]) + VLC_ADD_LIBS([xvmc],[-lXxf86vm_pic]) ac_cv_have_xf86vidmode="yes" ],[ AC_CHECK_LIB(Xxf86vm, XF86VidModeGetViewPort,[ VLC_ADD_LIBS([xvideo],[-lXxf86vm]) VLC_ADD_LIBS([x11],[-lXxf86vm]) VLC_ADD_LIBS([glx],[-lXxf86vm]) + VLC_ADD_LIBS([xvmc],[-lXxf86vm]) ac_cv_have_xf86vidmode="yes" ]) ]) @@ -4178,9 +4204,9 @@ AC_ARG_ENABLE(fribidi, [ --enable-fribidi fribidi support (default enabled)]) if test "${enable_freetype}" != "no" then - PKG_CHECK_MODULES(FREETYPE, freetype2,[ + PKG_CHECK_MODULES(FREETYPE, freetype2,[ VLC_ADD_PLUGINS([freetype]) - have_freetype=yes + have_freetype=yes VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}]) VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}]) if test "${SYS}" = "mingw32"; then @@ -4645,6 +4671,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 @@ -4911,7 +4951,7 @@ if test "${enable_skins2}" = "yes" || VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11]) fi fi fi fi - +AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) dnl dnl dnl dnl Gtk+ module @@ -5000,6 +5040,7 @@ then NEED_GTK2_MAIN=yes fi fi +AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"]) dnl dnl dnl dnl Gnome module @@ -5176,9 +5217,9 @@ AS_IF([test "${enable_qt4}" != "no" && AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) ], AS_IF([test "${enable_qt4}" = "yes"],[ - AC_MSG_ERROR(QT4 library not found) + AC_MSG_ERROR(QT4 library not found) ],[ - AC_MSG_WARN(QT4 library not found) + AC_MSG_WARN(QT4 library not found) ]) ) ]) @@ -5187,17 +5228,21 @@ AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true") dnl dnl WinCE GUI module dnl -if test "${SYS}" = "mingwce"; then - VLC_ADD_BUILTINS([wince]) - VLC_ADD_CXXFLAGS([wince],[]) - VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell]) - dnl Gross hack - VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) -elif test "${SYS}" = "mingw32"; then - VLC_ADD_CXXFLAGS([wince],[]) - VLC_ADD_LIBS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) - dnl Gross hack - VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) +AC_ARG_ENABLE(wince, + [ --enable-wince Windows CE interface (default enabled with MinGW)]) +if test "${enable_wince}" != "no"; then + if test "${SYS}" = "mingwce"; then + VLC_ADD_BUILTINS([wince]) + VLC_ADD_CXXFLAGS([wince],[]) + VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell]) + dnl Gross hack + VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) + elif test "${SYS}" = "mingw32"; then + VLC_ADD_CXXFLAGS([wince],[]) + VLC_ADD_LIBS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) + dnl Gross hack + VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) + fi fi dnl @@ -5312,7 +5357,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 +5367,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 @@ -5358,11 +5403,26 @@ AC_ARG_ENABLE(ncurses, VLC_ADD_LIBS([ncurses],[-lncursesw]) ALIASES="${ALIASES} nvlc" AC_DEFINE([HAVE_NCURSESW], 1, [Define to 1 if you have libncursesw.]) + AC_CHECK_LIB(ncursesw, tgetent, [], + AC_CHECK_LIB(tinfow, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfow])], + [AC_CHECK_LIB(tinfo, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfo])], + [AS_IF([test "x${enable_ncurses}" != "x"], + [AC_MSG_ERROR([tgetent not found in ncursesw tinfow tinfo] + )])]) + ] + ) + ) ], [AC_CHECK_LIB( ncurses, mvprintw, [VLC_ADD_PLUGINS([ncurses]) ALIASES="${ALIASES} nvlc" - VLC_ADD_LIBS([ncurses],[-lncurses])], + VLC_ADD_LIBS([ncurses],[-lncurses]) + AC_CHECK_LIB(ncurses, tgetent, [], + [AC_CHECK_LIB(tinfo, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfo])], + [AS_IF([test "x${enable_ncurses}" != "x"], + [AC_MSG_ERROR([tgetent not found in ncurses tinfo])])] + )] + )], [AS_IF([test "x${enable_ncurses}" != "x"], [ AC_MSG_ERROR([libncurses not found])])] )] @@ -5487,6 +5547,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 @@ -5674,6 +5747,15 @@ AS_IF([test "${enable_loader}" = "yes"], VLC_ADD_LIBS([realaudio],[../../libs/loader/libloader.la]) ]) +AC_ARG_WITH(,[Components:]) + +dnl +dnl the VLC binary +dnl +AC_ARG_ENABLE(vlc, + [ --enable-vlc build the VLC media player (default enabled)]) +AM_CONDITIONAL(BUILD_VLC, [test "${enable_vlc}" != "no"]) + dnl dnl Microsoft ActiveX support dnl @@ -5926,11 +6008,17 @@ dnl Mediacontrol Python bindings dnl AC_ARG_ENABLE(python-bindings, [ --enable-python-bindings Enable Python bindings (default disabled)]) -dnl TODO: look for python dev headers -AS_IF([test "${enable_python_bindings}" = "yes"], - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} python" - ) +if test "${enable_python_bindings}" = "yes"; then + AC_PATH_PROG(PYTHON_CONFIG, python-config, no) + CFLAGS="${CFLAGS_save} `${PYTHON_CONFIG} --cflags`" + AC_CHECK_HEADER([Python.h], + PLUGINS_BINDINGS="${PLUGINS_BINDINGS} python", + AC_MSG_ERROR([You have to install python-dev to build the bindings]), + [] + ) + CFLAGS="${CFLAGS_save}" +fi AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"]) dnl @@ -5940,17 +6028,16 @@ AC_ARG_ENABLE(java-bindings, [ --enable-java-bindings Enable Java bindings (default disabled)]) if test "${enable_java_bindings}" = "yes" then - AS_IF([test "x${JAVA_HOME}" == "x"], - [AC_MSG_ERROR([Please set the JAVA_HOME variable to your JDK environment])]) - AC_PROG_JAVAC - AC_PROG_JAVA - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} java" - if test "${JAVAC}" == "javac${EXEEXT}" - then - JAVAC="javac${EXEEXT} -cp ./ " - fi + echo "" + echo "****** WARNING **** WARNING ***** WARNING *************" + echo "*** To compile the java bindings go to the " + echo "*** bindings/java folder and run mvn install. " + echo "*** You need maven2 installed. " + echo "*** This configuration will continue, so you will be " + echo "*** able to compile VideoLAN as usual. " + echo "*******************************************************" + echo "" fi -AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"]) dnl dnl test plugins @@ -6045,7 +6132,6 @@ AS_IF([test "${enable_shared}" = "no"], [ AS_IF([test "${plugin_support}" != "no"], [ AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins) ]) - AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"]) dnl Temporary(?) hack for plugins/builtins transition @@ -6129,8 +6215,6 @@ AC_CONFIG_FILES([ projects/activex/Makefile projects/activex/axvlc.inf bindings/Makefile - bindings/java/Makefile - bindings/java/src/Makefile bindings/python/Makefile doc/Makefile extras/package/ipkg/Makefile @@ -6142,6 +6226,7 @@ AC_CONFIG_FILES([ po/Makefile.in share/Makefile src/Makefile + test/Makefile ]) AC_CONFIG_FILES([ @@ -6152,6 +6237,7 @@ AC_CONFIG_FILES([ modules/access/mms/Makefile modules/access/cdda/Makefile modules/access/rtsp/Makefile + modules/access/rtmp/Makefile modules/access/v4l2/Makefile modules/access/vcd/Makefile modules/access/vcdx/Makefile @@ -6210,6 +6296,8 @@ AC_CONFIG_FILES([ modules/stream_out/transrate/Makefile modules/video_chroma/Makefile modules/video_filter/Makefile + modules/video_filter/atmo/Makefile + modules/video_filter/dynamicoverlay/Makefile modules/video_output/Makefile modules/video_output/msw/Makefile modules/video_output/qte/Makefile @@ -6236,15 +6324,20 @@ dnl for a in `./vlc-config --target plugin` ; do echo $a; done | sed -e 's,modul dnl Shortcut to nice compile message rm -f compile echo '#! /bin/sh' >compile - -echo "PATH=$PATH LANG=C make \$@ 2>&1| \\" >> compile -echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >> compile +echo rm -f .error\$\$ >>compile +echo ERROR=0 >>compile +echo export PATH=$PATH LANG=C >>compile +echo "(make \$@ 2>&1 || touch .error\$\$)| \\" >>compile +echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >>compile +echo test -f .error\$\$ \&\& ERROR=1 >>compile +echo rm -f .error\$\$ >>compile +echo exit \$ERROR >>compile chmod a+x compile printf " -vlc configuration +libvlc configuration -------------------- -vlc version : ${VERSION} +version : ${VERSION} system : ${SYS} architecture : ${ARCH} build flavour : " @@ -6253,9 +6346,13 @@ test "${enable_cprof}" = "yes" && printf "cprof " test "${enable_gprof}" = "yes" && printf "gprof " test "${enable_optimizations}" = "yes" && printf "optim " test "${enable_release}" = "yes" && printf "release " || printf "devel " -echo " -vlc aliases :${ALIASES} -plugins/bindings :${PLUGINS_BINDINGS} +echo "" +if test "${enable_vlc}" != "no"; then +echo "vlc aliases :${ALIASES}" +else +echo "build vlc executable : no" +fi +echo "plugins/bindings :${PLUGINS_BINDINGS} You can check which modules have been enabled with \`./vlc-config --list plugin'.