dnl Autoconf settings for vlc
dnl $Id$
-
-AC_INIT(vlc,0.8.3-svn)
+
+AC_INIT(vlc,0.8.4-svn)
+VERSION_MAJOR="0"
+VERSION_MINOR="8"
+VERSION_REVISION="4"
+VERSION_EXTRA="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.3-svn)
+AM_INIT_AUTOMAKE(vlc,0.8.4-svn)
AM_CONFIG_HEADER(config.h)
dnl
fi
AC_PROG_MAKE_SET
AC_PROG_INSTALL
+AM_PROG_AS
dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
dnl now otherwise it might be set in an obscure if statement.
dnl
dnl Check for the contrib directory
dnl
-topdir="`pwd`"
+topdir="`dirname $0`"
+if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
+ topdir="`pwd`/$topdir"
+fi
+
if test -d ${topdir}/extras/contrib/lib; then
export PATH=${topdir}/extras/contrib/bin:$PATH
CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
VLC_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows])
VLC_ADD_LDFLAGS([vcdx cddax],[-lwinmm])
- VLC_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard telnet netsync],[-lws2_32])
+ VLC_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard stream_out_rtp vod_rtsp telnet netsync],[-lws2_32])
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="bn ca da de el en_GB es fr hi hu it ja my ne nl no pl ps pt_BR ru sv tet tl zh_TW"
+ALL_LINGUAS="ca da de en_GB es fr it ja nl pt_BR ro ru tr zh_TW"
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS"
-AC_ARG_ENABLE(utf8,
- [ --enable-utf8 unicode utf8 support (default enabled on darwin/beos/win32)])
-if test "${enable_utf8}" = "yes" || (test "${enable_utf8}" != "no" && (test "${SYS}" = "mingw32" || test "${SYS}" = "beos" || test "${SYS}" = "darwin" ) )
-then
- AC_DEFINE(ENABLE_UTF8, 1,
- Define if you want utf8 support)
-fi
-
dnl
dnl Iconv stuff
dnl
+AS_IF([test "$am_cv_func_iconv" != "yes"],
+ [AC_MSG_ERROR([libiconv is needed for VLC to work properly])])
VLC_ADD_CFLAGS([vlc],[${INCICONV}])
VLC_ADD_LDFLAGS([vlc],[${LIBICONV}])
dnl Check for system libs needed
need_libc=false
-AC_CHECK_FUNCS(gettimeofday select strerror 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)
+AC_CHECK_FUNCS(gettimeofday select strerror 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)
dnl Check for usual libc functions
AC_CHECK_FUNCS(strdup strndup atof)
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex],[-lm])
])
+AC_CHECK_LIB(mx,sqrtf,[
+ VLC_ADD_LDFLAGS([x264],[-lmx])
+])
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
dnl Check for dynamic plugins
VLC_ADD_PLUGINS([dummy logger memcpy])
VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf mp4 rawdv nsv real aiff mjpeg demuxdump flac])
VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flacdec])
-VLC_ADD_PLUGINS([deinterlace invert adjust transform distort motionblur])
+VLC_ADD_PLUGINS([deinterlace invert adjust transform distort motionblur rv32])
VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32])
VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
if test "${SYS}" != "mingwce"; then
dnl VLC_ADD_PLUGINS([externrun])
VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record])
- VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq sap shout])
- VLC_ADD_PLUGINS([mosaic wall motiondetect clone crop])
+ VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq sap shout fake])
+ VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop])
VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga])
VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer])
dnl
AC_ARG_WITH(tuning,
[ --with-tuning=ARCH enable special tuning for an architecture
- (default i686 on IA-32 and 750 on PPC)])
+ (default Pentium 2 on IA-32 and 750 on PPC)])
if test -n "${with_tuning}"; then
- if test "${target_cpu}" = "powerpc"; then
- CFLAGS_TUNING="-mtune=${with_tuning}"
- else
- CFLAGS_TUNING="-mcpu=${with_tuning}"
- fi
+ CFLAGS_TUNING="-mtune=${with_tuning}"
else
if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "i486" -o "${target_cpu}" = "i386"; then
- CFLAGS_TUNING="-mcpu=pentiumpro"
+ CFLAGS_TUNING="-mtune=pentium2"
elif test "${target_cpu}" = "x86_64"; then
- CFLAGS_TUNING="-mtune=opteron"
+ CFLAGS_TUNING="-mtune=athlon64"
elif test "${target_cpu}" = "powerpc"; then
CFLAGS_TUNING="-mtune=750";
fi
+
+ dnl NOTE: this can't be cached cleanly
+ AS_IF([test "${CFLAGS_TUNING}"],
+ [CFLAGS_save="${CFLAGS}"
+ CFLAGS="${CFLAGS} ${CFLAGS_TUNING}"
+
+ AC_MSG_CHECKING([whether $CC accepts ${CFLAGS_TUNING}])
+ AC_COMPILE_IFELSE([ ], [tuning="yes"],
+ [CFLAGS_TUNING=""; tuning="no"])
+
+ AC_MSG_RESULT([$tuning])
+ CFLAGS="${CFLAGS_save}"
+ ])
fi
dnl
dnl libsmbclient plugin
dnl
AC_ARG_ENABLE(smb,
- [ --enable-smb smb input module (default enabled)])
+ [ --enable-smb smb input module (default enabled)])
if test "${enable_smb}" != "no"; then
AC_CHECK_HEADERS(libsmbclient.h,
[ VLC_ADD_PLUGINS([access_smb])
VLC_ADD_PLUGINS([pvr])
fi
+dnl Need to test libcdio and libvcdinfo for a number of things. Do it now.
+AC_ARG_ENABLE(libcdio,
+ [ --enable-libcdio CD input and control library support (default enabled)])
+
+have_libcdio=no
+have_libvcdinfo=no
+if test "${enable_libcdio}" != "no"
+then
+ PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.72,
+ have_libcdio=yes
+ AC_DEFINE(HAVE_LIBCDIO, [],
+ [Define if you have libcdio 0.72 or greater installed]),
+ [AC_MSG_WARN(CD Reading and information library not found)])
+
+ PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21,
+ [have_libvcdinfo=yes
+ AC_DEFINE(HAVE_VCDINFO, [],
+ [Define if you have libvcdinfo 0.7.21 or greater installed])],
+ [AC_MSG_WARN(VCD information library not found)])
+fi
+
dnl
dnl VCDX and CDDAX modules
dnl
-AC_ARG_ENABLE(libcdio,
- [ --enable-libcdio CDDA support via libcdio (default enabled)])
+AC_ARG_ENABLE(cddax,
+ [ --enable-cddax audio CD plugin with CD Text and CD paranoia via libcdio (default disabled)])
AC_ARG_ENABLE(libcddb,
- [ --enable-libcddb CDDB support for CDDAX (default enabled)])
-
-AC_ARG_ENABLE(vcdx,
- [ --enable-vcdx VCD support with Navigation (default disabled)])
-
-AC_ARG_ENABLE(cdda,
- [ --enable-cdda CDDA plugin support (default enabled)])
-
-AC_ARG_ENABLE(cddax,
- [ --enable-cddax CDDA plugin with CD Text and possibly CDDB and paranoia support (default disabled)])
+ [ --enable-libcddb CDDB support for libcdio audio CD (default enabled)])
if test "${enable_cddax}" = "yes"
then
- PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.71,
- [
- AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
+ if test "$have_libcdio" = "yes"
+ then
+ AC_DEFINE(HAVE_CDDAX, [], [Define for the audio CD 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])
-
- PKG_CHECK_MODULES(LIBCDIO_PARANOIA, libcdio_paranoia >= 0.72, [
- VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_CDDA_LIBS $LIBCDIO_PARANOIA_LIBS])],
- HAVE_CDDAX=no)
+ VLC_ADD_PLUGINS([cddax])
+ PKG_CHECK_MODULES(LIBCDIO_PARANOIA, libcdio_paranoia >= 0.72, [
+ VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_CDDA_LIBS $LIBCDIO_CDDA_LIBS $LIBCDIO_PARANOIA_LIBS])],
+ AC_MSG_WARN([CD Paranoia support disabled because no libcdio >= 0.72 found]))
+ else
+ AC_MSG_WARN([cddax plugin disabled because ok libcdio library not found or disabled])
+ HAVE_CDDAX=no
+ fi
if test "$enable_libcddb" != "no"; then
PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [
fi
+AC_ARG_ENABLE(vcdx,
+ [ --enable-vcdx VCD with navigation via libvcdinfo (default disabled)])
+
if test "${enable_vcdx}" = "yes"
then
- PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.72,
- [VLC_ADD_LDFLAGS([vcdx],[$LIBCDIO_LIBS])
- VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])],
- [AC_MSG_WARN(libcdio library not found)
- HAVE_VCDX=no])
+ if test "${have_libvcdinfo}" = "yes"
+ then
+ VLC_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
+ VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
+ else
+ AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found or disabled])
+ HAVE_VCDX=no
+ fi
PKG_CHECK_MODULES(LIBCDIO, libiso9660 >= 0.72,
[VLC_ADD_LDFLAGS([vcdx],[$LIBISO9660_LIBS])
VLC_ADD_CFLAGS([vcdx],[$LIBISO9660_CFLAGS])],
- [AC_MSG_WARN(libiso9660 library not found)
+ [AC_MSG_WARN([vcdx plugin disabled because ok libiso9660 library not found])
HAVE_VCDX=no])
- PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21,
- [AC_DEFINE(HAVE_VCDX, [],
+ if test "$have_libvcdinfo" = "yes"
+ then
+ AC_DEFINE(HAVE_VCDX, [],
[Define for the VCD plugin using libcdio/libvcdinfo])
VLC_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS])
VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS])
- VLC_ADD_PLUGINS([vcdx])],
- [AC_MSG_WARN(vcdinfo library not found)
- HAVE_VCDX=no])
+ VLC_ADD_PLUGINS([vcdx])
+ else
+ AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found])
+ HAVE_VCDX=no
+ fi
fi
dnl
-dnl VCD module
+dnl Built-in CD-DA and VCD module
dnl
+AC_ARG_ENABLE(cdda,
+ [ --enable-cdda audio CD via built-in VCD (default enabled)])
+
AC_ARG_ENABLE(vcd,
- [ --enable-vcd VCD support for Linux, FreeBSD, MacOS X and Win32 (default enabled)])
+ [ --enable-vcd built-in VCD (default enabled)])
if test "${enable_vcd}" != "no"
then
fi
fi
-dnl
-dnl Satellite input module
-dnl
-AC_ARG_ENABLE(satellite,
- [ --enable-satellite satellite card support (default disabled)],
- [ if test "${enable_satellite}" = "yes"
- then
- AC_DEFINE(HAVE_SATELLITE, [],
- [Define for the VCD plugin using libcdio/libvcdinfo])
- VLC_ADD_PLUGINS([satellite])
- fi])
-
dnl
dnl DVB-S/DVB-T/DVB-C satellite/teresterial/cable input using v4l2
dnl
dnl
dnl ipv6 plugin - not for QNX yet
dnl
+have_ipv6=no
+AC_CHECK_FUNCS(inet_pton,[have_ipv6=yes],[
+ AC_CHECK_LIB(resolv,inet_pton,
+ [have_ipv6=yes
+ VLC_ADD_LDFLAGS([ipv6],[-lresolv])])
+])
+
+AS_IF([test "${have_ipv6}" == "yes"], [
+ AC_DEFINE(HAVE_INET_PTON, 1, [Define to 1 if you have inet_pton().])])
+
if test "${SYS}" != "nto" &&
test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
then
- have_ipv6=false
- AC_CHECK_FUNCS(inet_pton,[have_ipv6=:],[
- AC_CHECK_LIB(resolv,inet_pton,
- [have_ipv6=:
- VLC_ADD_LDFLAGS([ipv6],[-lresolv])])
- ])
AC_MSG_CHECKING(for sockaddr_in6 in netinet/in.h)
AC_EGREP_HEADER(sockaddr_in6,netinet/in.h,
- [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) have_ipv6=false])
- if ${have_ipv6}; then
- VLC_ADD_PLUGINS([ipv6])
- fi
+ [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); have_ipv6=no])
+ AS_IF([test "${have_ipv6}" != "no"], [
+ VLC_ADD_PLUGINS([ipv6])])
fi
if test "${SYS}" = "mingw32"
then
dnl
dnl ffmpeg decoder/demuxer plugin
dnl
+dnl we try to find ffmpeg using : 1- ffmpeg-config, 2- pkg-config
+dnl 3- default place, 4- given tree
+
AC_ARG_ENABLE(ffmpeg,
[ --enable-ffmpeg ffmpeg codec (default enabled)])
if test "${enable_ffmpeg}" != "no"
then
- FFMPEG_PATH="${PATH}"
- AC_ARG_WITH(ffmpeg-config-path,
- [ --with-ffmpeg-config-path=PATH ffmpeg-config path (default search in \$PATH)],
- [ if test "${with_ffmpeg_config_path}" != "no"
- then
- FFMPEG_PATH="${with_ffmpeg_config_path}:${PATH}"
- fi ])
- AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH})
- if test "${FFMPEG_CONFIG}" != "no"
- then
- AC_CHECK_HEADERS(ffmpeg/avcodec.h)
- AC_CHECK_HEADERS(postproc/postprocess.h)
- VLC_ADD_PLUGINS([ffmpeg])
- if test "${enable_sout}" != "no"; then
- VLC_ADD_PLUGINS([stream_out_switcher])
- fi
- VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`])
- VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`])
+dnl Look for a ffmpeg-config (we are on debian )
+
+ FFMPEG_PATH="${PATH}"
+ AC_ARG_WITH(ffmpeg-config-path,
+ [ --with-ffmpeg-config-path=PATH ffmpeg-config path (default search in \$PATH)],
+ [ if test "${with_ffmpeg_config_path}" != "no"
+ then
+ FFMPEG_PATH="${with_ffmpeg_config_path}"
+ fi ])
+ AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH})
+ if test "${FFMPEG_CONFIG}" != "no"
+ then
+ AC_CHECK_HEADERS(ffmpeg/avcodec.h)
+ AC_CHECK_HEADERS(postproc/postprocess.h)
+ VLC_ADD_PLUGINS([ffmpeg])
+ if test "${enable_sout}" != "no"; then
+ VLC_ADD_PLUGINS([stream_out_switcher])
+ fi
+ VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`])
+ VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`])
+
else
- AC_ARG_WITH(ffmpeg-mp3lame,
- [ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support],
- [
- VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
-
- AC_ARG_WITH(ffmpeg-faac,
- [ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support],
- [
- VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
-
- AC_ARG_WITH(ffmpeg-dts,
- [ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support],
- [
- VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
-
- AC_ARG_WITH(ffmpeg-zlib,
- [ --with-ffmpeg-zlib specify 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])
+dnl Trying with pkg-config
+ PKG_CHECK_MODULES(FFMPEG,libavcodec libavformat,
+ [
+ AC_CHECK_HEADERS(ffmpeg/avcodec.h)
+ AC_CHECK_HEADERS(postproc/postprocess.h)
+ VLC_ADD_BUILTINS([ffmpeg])
+ if test "${enable_sout}" != "no"; then
+ VLC_ADD_BUILTINS([stream_out_switcher])
+ fi
+ VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}])
+ VLC_ADD_LDFLAGS([ffmpeg],[${FFMPEG_LIBS}])
+ ],[
+
dnl
dnl test for !(--with-ffmpeg-tree)
dnl
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
+
+ AC_CHECK_LIB(avutil, av_add_i, [
+ VLC_ADD_LDFLAGS([ffmpeg],[-lavutil])
+ LDAVUTIL="-lavutil"])
+
AC_CHECK_LIB(avcodec, avcodec_init, [
VLC_ADD_BUILTINS([ffmpeg])
VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec])
if test "${enable_sout}" != "no"; then
VLC_ADD_BUILTINS([stream_out_switcher])
fi],
- [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ])
+ [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL])
AC_CHECK_LIB(avformat, av_open_input_stream, [
AC_DEFINE(HAVE_LIBAVFORMAT, 1,
[Define if you have ffmpeg's libavformat.])
VLC_ADD_BUILTINS([ffmpeg])
if test "${enable_sout}" != "no"; then
- VLC_ADD_BUILTINS([stream_out_switcher])
+ VLC_ADD_BUILTINS([stream_out_switcher])
+ fi
+
+ if test -f "${real_ffmpeg_tree}/libavutil/libavutil.a"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavutil ${real_ffmpeg_tree}/libavutil/libavutil.a])
+ VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavutil])
fi
+
VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a])
VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavcodec])
VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavformat])
fi
fi
+ ])
+
+ AC_ARG_WITH(ffmpeg-mp3lame,
+ [ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support],
+ [
+ VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
+
+ AC_ARG_WITH(ffmpeg-faac,
+ [ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support],
+ [
+ VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
+
+ AC_ARG_WITH(ffmpeg-dts,
+ [ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support],
+ [
+ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
+
+ AC_ARG_WITH(ffmpeg-zlib,
+ [ --with-ffmpeg-zlib specify 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
AC_CHECK_LIB(png, png_set_rows, [
VLC_ADD_LDFLAGS([png],[-lpng -lz])
VLC_ADD_PLUGINS([png])
+ VLC_ADD_PLUGINS([osdmenu])
AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
[],[-lz])
LDFLAGS="${LDFLAGS_save}"
AC_PATH_PROG(SDL12_CONFIG, sdl12-config, no, ${SDL_PATH})
SDL_CONFIG="${SDL12_CONFIG}"
SDL_HEADER="SDL12/SDL.h"
+ SDL_IMAGE="SDL12/SDL_image.h"
if test "${SDL_CONFIG}" = "no"
then
AC_PATH_PROG(SDL11_CONFIG, sdl11-config, no, ${SDL_PATH})
SDL_CONFIG=${SDL11_CONFIG}
SDL_HEADER="SDL11/SDL.h"
+ SDL_IMAGE="SDL11/SDL_image.h"
fi
if test "${SDL_CONFIG}" = "no"
then
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, ${SDL_PATH})
SDL_HEADER="SDL/SDL.h"
+ SDL_IMAGE="SDL/SDL_image.h"
fi
# check for cross-compiling
SDL_PREFIX=
fi
if test "${SDL_CONFIG}" != "no"
then
- VLC_ADD_PLUGINS([vout_sdl aout_sdl])
- VLC_ADD_CFLAGS([vout_sdl aout_sdl],[`${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`])
- VLC_ADD_LDFLAGS([vout_sdl aout_sdl],[`${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`])
+ # SDL on Darwin is heavily patched and can only run SDL_image
+ if test "${SYS}" != "darwin"; then
+ VLC_ADD_PLUGINS([vout_sdl aout_sdl])
+ fi
+ VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`])
+ VLC_ADD_LDFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`])
CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_vout_sdl}"
AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE,
<${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h),
Please install it and try again. Alternatively you can also configure with
--disable-sdl.])
])])
+ AC_CHECK_HEADERS(${SDL_IMAGE}, [AC_DEFINE_UNQUOTED(SDL_IMAGE_INCLUDE_FILE,
+ <${SDL_IMAGE}>, Indicate the path of SDL_image.h)
+ VLC_ADD_PLUGINS([sdl_image])
+ VLC_ADD_LDFLAGS([sdl_image], [-lSDL_image])],
+ [ AC_CHECK_HEADERS(SDL_image.h, AC_DEFINE(SDL_IMAGE_INCLUDE_FILE, <SDL_image.h>,
+ As a last resort we also test for SDL_image.h presence),
+ [ AC_MSG_WARN([The development package for SDL_image is not installed.
+You should install it alongside your SDL package.])
+ ])])
CPPFLAGS="${CPPFLAGS_save}"
if expr 1.1.5 \> `${SDL_CONFIG} --version` >/dev/null
then
AC_LANG_POP([C++])
fi
+dnl
+dnl CyberLink for C++ UPnP stack
+dnl
+AC_ARG_ENABLE(cyberlink,
+ [ --enable-cyberlink CyberLink for C++ UPnP stack (default disabled)])
+if test "${CXX}" != "" -a "${enable_cyberlink}" = "yes" || (test "${enable_cyberlink}" != "no"); then
+ AC_ARG_WITH(cyberlink-tree,
+ [ --with-cyberlink-tree=PATH CyberLink for C++ tree for static linking])
+
+ dnl
+ dnl test for --with-cyberlink-tree
+ dnl
+ if test ! -z "${with_cyberlink_tree}" -a "${CXX}" != ""; then
+ AC_LANG_PUSH(C++)
+ real_cyberlink_tree="`cd ${with_cyberlink_tree} 2>/dev/null && pwd`"
+ if test -z "${real_cyberlink_tree}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_cyberlink_tree}])
+ fi
+ CXXFLAGS_save="${CXXFLAGS}"
+ CXXFLAGS_cyberlink="-I${real_cyberlink_tree}/include"
+ CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_cyberlink}"
+ AC_CHECK_HEADERS([cybergarage/upnp/MediaServer.h],
+ [ VLC_ADD_CXXFLAGS([upnp], [${CXXFLAGS_cyberlink}])
+ VLC_ADD_PLUGINS([upnp])
+ ],[
+ AC_MSG_ERROR([cannot find CyberLink for C++ headers])
+ ])
+ AC_MSG_CHECKING(for libclink.a in ${with_cyberlink_tree})
+ if test -f "${real_cyberlink_tree}/lib/unix/libclink.a"
+ then
+ AC_MSG_RESULT(${real_cyberlink_tree}/lib/unix/libclink.a)
+ VLC_ADD_LDFLAGS([upnp], [${real_cyberlink_tree}/lib/unix/libclink.a -lexpat])
+ else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}])
+ fi
+ CXXFLAGS="${CXXFLAGS_save}"
+ AC_LANG_POP([C++])
+ fi
+fi
+
dnl
dnl Interface plugins
dnl
dnl fi
dnl
-dnl wxWindows module
+dnl wxWidgets module
dnl
-AC_ARG_ENABLE(wxwindows,
- [ --enable-wxwindows wxWindows support (default enabled)])
-if test "${enable_wxwindows}" != "no"
+AC_ARG_ENABLE(wxwidgets,
+ [ --enable-wxwidgets wxWidgets support (default enabled)])
+if test "${enable_wxwindows}"
+then
+ AC_MSG_WARN(--{en|dis}able-wxwindows is deprecated. Use --{en|dis}able-wxwidgets instead.)
+fi
+
+if test "${enable_wxwindows}" = "no"
then
- WXWINDOWS_PATH="${PATH}"
+ enable_wxwidgets="no"
+fi
+if test "${enable_wxwidgets}" != "no"
+then
+ WXWIDGETS_PATH="${PATH}"
AC_ARG_WITH(wx-config-path,
[ --with-wx-config-path=PATH wx-config path (default search in \$PATH)],
[ if test "${with_wx_config_path}" != "no"
then
- WXWINDOWS_PATH="${with_wx_config_path}:${PATH}"
+ WXWIDGETS_PATH="${with_wx_config_path}:${PATH}"
fi ])
- WXWINDOWS_NAME="wx-config"
+ WXWIDGETS_NAME="wx-config"
AC_ARG_WITH(wx-config,
[ --with-wx-config=NAME wx-config name (default is wx-config)],
[ if test "${with_wx_config}" != "no"
then
- WXWINDOWS_NAME="${with_wx_config}"
+ WXWIDGETS_NAME="${with_wx_config}"
fi ])
# look for wx-config
- AC_PATH_PROG(WX_CONFIG, ${WXWINDOWS_NAME}, no, ${WXWINDOWS_PATH})
+ AC_PATH_PROG(WX_CONFIG, ${WXWIDGETS_NAME}, no, ${WXWIDGETS_PATH})
if test "${WX_CONFIG}" != "no" -a "${CXX}" != ""
then
if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
then
- AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwindows.])
+ AC_MSG_ERROR([Your development package for wxWidgets is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwidgets.])
fi
AC_LANG_PUSH(C++)
# Turn this error:
AC_TRY_COMPILE([],,ac_cv_cxx_fpermissive=yes,
ac_cv_cxx_fpermissive=no)])
if test "${ac_cv_cxx_fpermissive}" = "yes"; then
- VLC_ADD_CXXFLAGS([wxwindows],-fpermissive)
+ VLC_ADD_CXXFLAGS([wxwidgets],-fpermissive)
+ fi
+ VLC_ADD_LDFLAGS([wxwidgets],[`${WX_CONFIG} --libs`])
+ VLC_ADD_CXXFLAGS([wxwidgets],[`${WX_CONFIG} --cxxflags`])
+ if test "$have_libcdio" = "yes"
+ then
+ VLC_ADD_LDFLAGS([wxwidgets],[$LIBCDIO_LIBS])
+ VLC_ADD_CXXFLAGS([wxwidgets],[$LIBCDIO_CFLAGS])
+ else
+ AC_MSG_WARN([Probe disc disabled because ok libcdio library not found])
+ fi
+
+ if test "$have_libvcdinfo" = "yes"
+ then
+ VLC_ADD_LDFLAGS([wxwidgets],[$VCDINFO_LIBS])
+ VLC_ADD_CXXFLAGS([wxwidgets],[$VCDINFO_CFLAGS])
+ else
+ AC_MSG_WARN([VCD information on Probe disc disabled because ok libvcdinfo not found])
fi
- VLC_ADD_CXXFLAGS([wxwindows],[`${WX_CONFIG} --cxxflags`])
- VLC_ADD_LDFLAGS([wxwindows],[`${WX_CONFIG} --libs`])
+
# now look for the wxprec.h header
- CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_wxwindows}"
+ CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_wxwidgets}"
ac_cv_wx_headers=yes
AC_CHECK_HEADERS(wx/wxprec.h, , [
ac_cv_wx_headers=no
- echo "Cannot find wxWindows development headers."
+ echo "Cannot find wxWidgets development headers."
])
if test "${ac_cv_wx_headers}" = "yes"
then
- VLC_ADD_PLUGINS([wxwindows])
+ VLC_ADD_PLUGINS([wxwidgets])
ALIASES="${ALIASES} wxvlc"
fi
CPPFLAGS="${CPPFLAGS_save}"
then
if test "${WX_CONFIG}" = "no"
then
- AC_MSG_ERROR([The skins2 module depends on the wxWindows development package. Without it you won't be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the wxWindows development package or alternatively you can also configure with: --disable-wxwindows --disable-skins2.])
+ AC_MSG_ERROR([The skins2 module depends on the wxWidgets development package. Without it you won't be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the wxWidgets development package or alternatively you can also configure with: --disable-wxwidgets --disable-skins2.])
fi
fi
AC_DEFINE(WORDS_BIGENDIAN, 1, big endian system)
fi
+dnl
+dnl DLL loader copied from MPlayer copied from somewhere else (WINE ?)
+dnl
+loader=false
+AC_ARG_ENABLE(loader,
+ [ --enable-loader build DLL loader for ELF i386 platforms (default disabled)])
+AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
+AS_IF([test "${enable_loader}" = "yes"],
+ [ VLC_ADD_PLUGINS([dmo quicktime])
+ VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/loader])
+ VLC_ADD_LDFLAGS([dmo],[../../../loader/libloader.a])
+ VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/loader])
+ VLC_ADD_LDFLAGS([quicktime],[../../loader/libloader.a])
+ ])
+
dnl
dnl Microsoft ActiveX support
dnl
dnl Stuff used by the program
dnl
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
-AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2005 VideoLAN", [Copyright string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2005 the VideoLAN team", [Copyright string])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
+AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number])
+AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number])
+AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,"${VERSION_REVISION}", [version minor number])
+AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,"${VERSION_EXTRA}", [version minor number])
-VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
-AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
-AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
+dnl Old definitions for version-dependant plugins
+dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
+dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
+dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
+
+dnl New definitions with value matching 0.8.2 release
+AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__0_8_2", [String suffix for module functions])
+AC_DEFINE_UNQUOTED(MODULE_SYMBOL, 0_8_2, [Symbol suffix for module functions])
+
+dnl Version number for ActiveX INF
+VERSION32="`echo -n ${VERSION} | sed -e 's/@<:@a-z\-@:>@//g' | sed -e 'y/./,/'`"
+VERSION32="`echo -n ${VERSION32}',0'`"
+AC_SUBST(VERSION32)
DATA_PATH="${ac_tool_prefix}/share/vlc"
AC_SUBST(DATA_PATH)
AC_CONFIG_FILES([
Makefile
activex/Makefile
+ activex/axvlc.inf
debian/Makefile
doc/Makefile
intl/Makefile
ipkg/Makefile
lib/Makefile
+ loader/Makefile
modules/Makefile
mozilla/Makefile
m4/Makefile
modules/access/dvb/Makefile
modules/access/mms/Makefile
modules/access/pvr/Makefile
- modules/access/satellite/Makefile
modules/access/v4l/Makefile
modules/access/cdda/Makefile
modules/access/vcd/Makefile
modules/gui/qnx/Makefile
modules/gui/qt/Makefile
modules/gui/skins2/Makefile
- modules/gui/wxwindows/Makefile
+ modules/gui/wxwidgets/Makefile
modules/gui/wince/Makefile
modules/misc/Makefile
modules/misc/dummy/Makefile
${SHELL} ./config.status --file=vlc-config
chmod 0755 vlc-config
+dnl echo "Enabled builtin modules :"
+dnl for a in `./vlc-config --target builtin` ; do echo $a; done | sed -e 's,modules\/\(.*\)\/lib\(.*\)\.a,\2 (\1),'
+
+dnl echo "Enabled plugin modules :"
+dnl for a in `./vlc-config --target plugin` ; do echo $a; done | sed -e 's,modules\/\(.*\)\/lib\(.*\)_plugin,\2 (\1),'
+
printf "
vlc configuration
--------------------