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
AC_CHECK_TOOL(WINDRES, windres, :)
case "${host_os}" in
+ *wince* | *mingwce* | *mingw32ce* | *pe*)
+ SYS=mingwce
+ ;;
*mingw32*)
SYS=mingw32
;;
#endif],
SYS=mingw32, SYS=cygwin)
;;
- *wince* | *mingwce* | *pe*)
- SYS=mingwce
- ;;
esac
if test "${SYS}" = "mingw32"; 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_rtmp 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*)
dnl
dnl Gettext stuff
dnl
-AM_GNU_GETTEXT_VERSION(0.17)
+AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external])
VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}])
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 croppadd])
+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 access_rtmp])
[ --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])
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"],[
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"
])
])
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
VLC_ADD_LIBS([ncurses],[-lncursesw])
ALIASES="${ALIASES} nvlc"
AC_DEFINE([HAVE_NCURSESW], 1, [Define to 1 if you have libncursesw.])
- AC_CHECK_LIB(tinfo, tgetent, VLC_ADD_LIBS([ncurses],[-ltinfo]))
+ 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])
- AC_CHECK_LIB(tinfo, tgetent, VLC_ADD_LIBS([ncurses],[-ltinfo]))],
+ 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])])]
)]
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