dnl Autoconf settings for vlc
dnl $Id$
-AC_INIT(vlc,0.7.3-svn)
+AC_INIT(vlc,0.8.0-test1)
CONFIGURE_LINE="$0 $*"
-CODENAME="Bond"
+CODENAME="Janus"
AC_PREREQ(2.50)
AC_CONFIG_SRCDIR(src/libvlc.c)
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.7.3-svn)
+AM_INIT_AUTOMAKE(vlc,0.8.0-test1)
AM_CONFIG_HEADER(config.h)
dnl
VLC_ADD_CXXFLAGS([beos],[])
VLC_ADD_LDFLAGS([vlc beos],[-lbe])
VLC_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
+ VLC_ADD_LDFLAGS([access_file access_mms access_output_udp telnet netsync sap ipv4 vlc],[-lnet])
dnl Ugly check for Zeta
if test -f /boot/beos/system/lib/libzeta.so; then
Define if you want utf8 support)
fi
+dnl
+dnl Iconv stuff
+dnl
+VLC_ADD_CFLAGS([vlc],[${INCICONV}])
+VLC_ADD_LDFLAGS([vlc],[${LIBICONV}])
+
dnl Check for the need to include the mingwex lib for mingw32
if test "${SYS}" = "mingw32"
then
dnl
VLC_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync])
VLC_ADD_PLUGINS([mpgv mpga m4v h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg demuxdump])
-VLC_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak])
+VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak])
VLC_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
VLC_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32 audio_format])
VLC_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler])
VLC_ADD_PLUGINS([aout_file equalizer])
VLC_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
VLC_ADD_PLUGINS([m3u id3 playlist export sgimb])
-VLC_ADD_PLUGINS([rawvideo blend])
-VLC_ADD_PLUGINS([wav araw subtitle adpcm a52sys dtssys au])
+VLC_ADD_PLUGINS([rawvideo blend scale])
+VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au])
VLC_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
VLC_ADD_PLUGINS([access_ftp access_directory sap http])
VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio])
VLC_ADD_PLUGINS([packetizer_copy])
- VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp])
+ VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp stream_out_description vod_rtsp])
VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode])
# VLC_ADD_PLUGINS([stream_out_transrate])
VLC_ADD_PLUGINS([pvr])
fi
-dnl dnl
-dnl dnl VCDX and CDDAX modules
-dnl dnl
-dnl AC_ARG_ENABLE(libcdio,
-dnl [ --enable-libcdio CDDA support via libcdio (default enabled)])
-dnl
-dnl AC_ARG_ENABLE(libcddb,
-dnl [ --enable-libcddb CDDB support for CDDAX (default enabled)])
-dnl
+dnl
+dnl VCDX and CDDAX modules
+dnl
+AC_ARG_ENABLE(libcdio,
+ [ --enable-libcdio CDDA support via libcdio (default enabled)])
+
+AC_ARG_ENABLE(libcddb,
+ [ --enable-libcddb CDDB support for CDDAX (default enabled)])
+
dnl AC_ARG_ENABLE(vcdx,
dnl [ --enable-vcdx VCD support with Navigation (default enabled)])
-dnl
-dnl AC_ARG_ENABLE(cdda,
-dnl [ --enable-cdda CDDA plugin support (default enabled)])
-dnl
-dnl AC_ARG_ENABLE(cddax,
-dnl [ --enable-cddax CDDAX plugin support (default enabled)])
-dnl
-dnl if test "${enable_cddax}" != "no"
-dnl then
-dnl PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.65,
-dnl [enable_cddax="no"
-dnl AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
-dnl VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
-dnl VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
-dnl VLC_ADD_PLUGINS([cddax])],
-dnl [AC_MSG_WARN(libcdio library not found)
-dnl HAVE_CDDAX=no])
-dnl
-dnl if test "$enable_libcddb" != "no"; then
-dnl PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [
-dnl HAVE_LIBCDDB=yes
-dnl AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
-dnl VLC_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS])
-dnl VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
-dnl ],
-dnl [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled)
-dnl HAVE_LIBCDDB=no])
-dnl fi
-dnl
+
+AC_ARG_ENABLE(cdda,
+ [ --enable-cdda CDDA plugin support (default enabled)])
+
+AC_ARG_ENABLE(cddax,
+ [ --enable-cddax CDDAX plugin support (default enabled)])
+
+if test "${enable_cddax}" != "no"
+then
+ PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.70,
+ [enable_cddax="no"
+ AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
+ VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
+ VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
+ VLC_ADD_PLUGINS([cddax])],
+ [AC_MSG_WARN(libcdio library not found)
+ HAVE_CDDAX=no])
+
+ if test "$enable_libcddb" != "no"; then
+ PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [
+ HAVE_LIBCDDB=yes
+ AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
+ VLC_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS])
+ VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
+ ],
+ [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled)
+ HAVE_LIBCDDB=no])
+ fi
+
dnl if test "${enable_vcdx}" != "no"
dnl then
dnl PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20,
dnl [AC_MSG_WARN(vcdinfo library not found)
dnl HAVE_VCDX=no])
dnl fi
-dnl fi
+fi
dnl
dnl VCD module
[
VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
+ AC_ARG_WITH(ffmpeg-dts,
+ [ --with-ffmpeg-dts if ffmpeg has been compiled with dts support],
+ [
+ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
+
+ AC_ARG_WITH(ffmpeg-zlib,
+ [ --with-ffmpeg-zlib if ffmpeg has been compiled with zlib support],
+ [
+ VLC_ADD_LDFLAGS([ffmpeg],[-lz]) ])
+
AC_ARG_WITH(ffmpeg-tree,
[ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
fi
fi
-dnl
-dnl subsdec support
-dnl
-VLC_ADD_LDFLAGS([subsdec],[${LIBICONV}])
-VLC_ADD_CPPFLAGS([subsdec],[${INCICONV}])
-VLC_ADD_PLUGINS([subsdec])
-
dnl
dnl CMML plugin
dnl
if test "${FREETYPE_CONFIG}" != "no"
then
VLC_ADD_PLUGINS([freetype])
- VLC_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags` ${INCICONV}])
- VLC_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs` ${LIBICONV}])
+ VLC_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
+ VLC_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`])
AC_CHECK_HEADERS(Carbon/Carbon.h,
[VLC_ADD_LDFLAGS([freetype],[-framework Carbon])])
elif test "${enable_freetype}" = "yes"
dnl freetype
if test "${FREETYPE_CONFIG}" != "no"; then
VLC_ADD_CPPFLAGS([skins2],[`${FREETYPE_CONFIG} --cflags`])
- VLC_ADD_LDFLAGS([skins2],[`${FREETYPE_CONFIG} --libs`])
+ VLC_ADD_LDFLAGS([skins2],[`${FREETYPE_CONFIG} --libs` -lpng])
else
skins2_missing_lib="yes"
if test "${enable_skins2}" = "yes"; then
fi
fi
- dnl iconv
- if test "$am_cv_func_iconv" = "yes"; then
- VLC_ADD_CPPFLAGS([skins2],[${INCICONV}])
- VLC_ADD_LDFLAGS([skins2],[${LIBICONV} -lpng])
- else
- skins2_missing_lib="yes"
- if test "${enable_skins2}" = "yes"; then
- AC_MSG_ERROR([Could not find iconv (required for skins2)])
- fi
- fi
-
dnl libxml2
XML2_PATH="${PATH}"
AC_ARG_WITH(xml2-config-path,
modules/stream_out/transrate/Makefile
modules/video_chroma/Makefile
modules/video_filter/Makefile
+ modules/video_filter/swscale/Makefile
modules/video_output/Makefile
modules/video_output/directx/Makefile
modules/video_output/qte/Makefile
projects / vlc / blobdiff