dnl Autoconf settings for vlc
dnl $Id$
-AC_INIT(vlc,0.8.0-test2)
+AC_INIT(vlc,0.8.1-svn)
CONFIGURE_LINE="$0 $*"
CODENAME="Janus"
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.8.0-test2)
+AM_INIT_AUTOMAKE(vlc,0.8.1-svn)
AM_CONFIG_HEADER(config.h)
dnl
dnl Check for hal
PKG_CHECK_MODULES(HAL, hal >= 0.2.97,
[AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library])
- VLC_ADD_LDFLAGS([vlc],[$HAL_LIBS])
- VLC_ADD_CFLAGS([vlc],[$HAL_CFLAGS])],
+ VLC_ADD_PLUGINS([hal])
+ VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS])
+ VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])],
[AC_MSG_WARN(HAL library not found)])
dnl Build the gtk_main plugins?
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([trivial_channel_mixer simple_channel_mixer headphone_channel_mixer])
+VLC_ADD_PLUGINS([trivial_channel_mixer simple_channel_mixer headphone_channel_mixer normvol])
VLC_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
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([id3 playlist export sgimb])
VLC_ADD_PLUGINS([rawvideo blend scale time marq])
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])
AC_DEFINE(ENABLE_VLM, 1, Define if you want the VideoLAN manager support)
fi
+dnl
+dnl TLS/SSL
+dnl
+AC_ARG_ENABLE(gnutls,
+ [ --enable-gnutls gnutls TLS/SSL support (default disabled)])
+AS_IF([test "${enable_gnutls}" == "yes"], VLC_ADD_PLUGINS([gnutls]))
+
+
dnl
dnl Input plugins
dnl
AC_CHECK_LIB(avformat, av_open_input_stream, [
AC_DEFINE(HAVE_LIBAVFORMAT, 1,
[Define if you have ffmpeg's libavformat.])
- VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ])
+ VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz])
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
fi
AC_ARG_WITH(,[Misc options:])
+dnl
+dnl GnuTLS-based TLS/SSL support
+dnl
+AC_ARG_WITH(libgnutls-prefix,
+ [ --with-libgnutls-prefix=PREFIX set prefix where libgnutls is installed],
+ libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
+
+AS_IF([test x$libgnutls_config_prefix != x],
+ AS_IF([test x${LIBGNUTLS_CONFIG+set} != xset],
+ LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
+ )
+)
+
+if test "x$enable_gnutls" == "xyes"; then
+ AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
+ no_libgnutls=""
+
+ AC_MSG_CHECKING(for libgnutls - version >= 1.0.0)
+ AS_IF([test "$LIBGNUTLS_CONFIG" = "no"],
+ no_libgnutls=yes
+ ,
+ LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
+ LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
+ libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
+ )
+
+ AS_IF([test "x$no_libgnutls" = x],
+ AC_MSG_RESULT(yes)
+ VLC_ADD_CFLAGS([gnutls], [$LIBGNUTLS_CFLAGS])
+ VLC_ADD_LDFLAGS([gnutls], [$LIBGNUTLS_LIBS])
+ AC_DEFINE(HAVE_GNUTLS, 1, Define to 1 if you have libgnutls)
+ ,
+ AC_MSG_RESULT(no)
+ LIBGNUTLS_CFLAGS=""
+ LIBGNUTLS_LIBS=""
+ AC_MSG_ERROR(gnutls TLS/SSL support cannot be compiled)
+ )
+fi
+
dnl
dnl Endianness check, AC_C_BIGENDIAN doesn't work if we are cross-compiling
dnl
modules/mux/Makefile
modules/mux/mpeg/Makefile
modules/packetizer/Makefile
+ modules/services_discovery/Makefile
modules/stream_out/Makefile
modules/stream_out/transrate/Makefile
modules/video_chroma/Makefile