X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=8eb7361aa35b8f5bd91b686c93687aedc5f051dd;hb=e7eea0d2750d23775fbfb6fbc4fb6d2a8070655d;hp=c95380c4ac879afb737d802253276ded06ab46eb;hpb=64f0cbff552ab1a656299be2c6b4cc30b6c03fae;p=vlc diff --git a/configure.ac b/configure.ac index c95380c4ac..8eb7361aa3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ 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) @@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM 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 @@ -53,7 +53,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(AR, ar, :) AC_CHECK_TOOL(LD, ld, :) -AC_CHECK_TOOL(UPX, upx, "") dnl Sam, if you think I didn't see that... --Meuuh dnl AM_PROG_LIBTOOL @@ -69,8 +68,6 @@ dnl topdir="`pwd`" if test -d ${topdir}/extras/contrib/lib; then export PATH=${topdir}/extras/contrib/bin:$PATH - export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH - export DYLD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$DYLD_LIBRARY_PATH CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include" CPPFLAGS_save="${CPPFLAGS_save} -I${topdir}/extras/contrib/include" CFLAGS="${CFLAGS} -I${topdir}/extras/contrib/include" @@ -87,6 +84,13 @@ if test -d ${topdir}/extras/contrib/lib; then LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib" with_livedotcom_tree=${topdir}/extras/contrib/src/live with_goom_tree=${topdir}/extras/contrib/src/goom + if test ".`uname -s`" = ".Darwin"; then + export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH + export DYLD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$DYLD_LIBRARY_PATH + elif test ".`uname -s`" = ".BeOS"; then + export LIBRARY_PATH=${topdir}/extras/contrib/lib:$LIBRARY_PATH + export BELIBRARIES=${topdir}/extras/contrib/lib:$BELIBRARIES + fi fi dnl @@ -118,7 +122,7 @@ case "${target_os}" in CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}" OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}" - VLC_ADD_LDFLAGS([vlc ffmpeg],[-all_load]) + VLC_ADD_LDFLAGS([vlc ffmpeg ffmpegaltivec],[-all_load]) VLC_ADD_LDFLAGS([mp4], [-framework IOKit -framework CoreFoundation]) VLC_ADD_CFLAGS([libvlc],[-x objective-c]) VLC_ADD_CFLAGS([vlc],[-x objective-c]) @@ -170,6 +174,7 @@ case "${target_os}" in 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 @@ -212,6 +217,12 @@ 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 @@ -433,10 +444,10 @@ AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt}) if test "${SYS}" != "mingw32"; then AC_TYPE_SIGNAL AC_CHECK_LIB(m,cos,[ - VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32],[-lm]) + VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32 x264],[-lm]) ]) AC_CHECK_LIB(m,pow,[ - VLC_ADD_LDFLAGS([ffmpeg stream_out_transcode stream_out_transrate i420_rgb faad equalizer vlc],[-lm]) + VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad toolame equalizer vlc],[-lm]) ]) AC_CHECK_LIB(m,sqrt,[ VLC_ADD_LDFLAGS([headphone_channel_mixer normvol],[-lm]) @@ -664,6 +675,13 @@ if test "${x_libraries}" = "NONE"; then x_libraries="/usr/X11R6/lib" fi +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])], + [AC_MSG_WARN(HAL library not found)]) + dnl Build the gtk_main plugins? NEED_GTK_MAIN=no NEED_GNOME_MAIN=no @@ -684,17 +702,6 @@ if test "${ac_cv_c_ntohl_sys_param_h}" != "no"; then AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if defines ntohl.) fi -dnl Check for inline function size limit -AC_CACHE_CHECK([if \$CC accepts -finline-limit], - [ac_cv_c_inline_limit], - [CFLAGS="${CFLAGS_save} -finline-limit-30000" - AC_TRY_COMPILE([],,ac_cv_c_inline_limit=yes, ac_cv_c_inline_limit=no)]) -if test "${ac_cv_c_inline_limit}" != "no"; then - CFLAGS_save="${CFLAGS_save} -finline-limit-30000"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="${CXXFLAGS_save} -finline-limit-30000"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="${OBJCFLAGS_save} -finline-limit-30000"; OBJCFLAGS="${OBJCFLAGS_save}" -fi - # XXX: do this with an M4 macro? #dnl Check for various -W flags #for flag in "" all unreachable-code conversion sign-compare disabled-optimization @@ -938,17 +945,17 @@ dnl default modules 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]) +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 headphone_channel_mixer]) 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([rawvideo]) -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]) @@ -1060,13 +1067,14 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], AC_TRY_COMPILE([], [vec_ld(0, (unsigned char *)0);], [ac_cv_c_altivec="-faltivec"], - [# Linux/PPC test + [# Linux/PPC test (no flags) CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -maltivec -mabi=altivec" AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H #include #endif], [vec_ld(0, (unsigned char *)0);], - [ac_cv_c_altivec="-maltivec -mabi=altivec"], + [ac_cv_c_altivec="" + ac_cv_c_altivec_abi="-maltivec -mabi=altivec"], [# Linux/PPC test (old GCC versions) CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -fvec" AC_TRY_COMPILE([#ifdef HAVE_ALTIVEC_H @@ -1080,7 +1088,9 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], CFLAGS="${CFLAGS_save}"]) if test "${ac_cv_c_altivec}" != "no"; then AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.) - VLC_ADD_CFLAGS([vlc idctaltivec motionaltivec memcpyaltivec deinterlace i420_yuy2_altivec],[${ac_cv_c_altivec}]) + VLC_ADD_CFLAGS([vlc],[${ac_cv_c_altivec}]) + VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}]) + VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}]) ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -1171,9 +1181,9 @@ then 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_duplicate stream_out_gather]) -# VLC_ADD_PLUGINS([stream_out_transrate stream_out_display]) + 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]) dnl Ogg and vorbis are handled in their respective section fi @@ -1271,7 +1281,7 @@ then [ --with-dvdread-tree=PATH libdvdread tree for static linking]) dnl Temporary hack (yeah, sure ;) - if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin"; then + if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then VLC_ADD_LDFLAGS([dvdread],[-ldvdcss]) fi @@ -1334,6 +1344,11 @@ AC_ARG_ENABLE(dvdnav, [ --enable-dvdnav dvdnav input module (default enabled)]) if test "${enable_dvdnav}" != "no" then + dnl Same hack than dvdread + if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then + VLC_ADD_LDFLAGS([dvdnav],[-ldvdcss]) + fi + DVDNAV_PATH="${PATH}" AC_ARG_WITH(dvdnav-config-path, [ --with-dvdnav-config-path=PATH dvdnav-config path (default search in \$PATH)], @@ -1478,46 +1493,46 @@ then 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, @@ -1530,7 +1545,7 @@ dnl VLC_ADD_PLUGINS([vcdx])], dnl [AC_MSG_WARN(vcdinfo library not found) dnl HAVE_VCDX=no]) dnl fi -dnl fi +fi dnl dnl VCD module @@ -1611,6 +1626,35 @@ then CPPFLAGS="${CPPFLAGS_save}" fi +dnl +dnl Screen capture module +dnl +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],[-framework ApplicationServices]) + ]) + elif test "${SYS}" = "mingw32"; then + VLC_ADD_PLUGINS([screen]) + VLC_ADD_LDFLAGS([screen],[-lgdi32]) + elif test "${SYS}" = "beos"; then + VLC_ADD_PLUGINS([screen]) + VLC_ADD_CXXFLAGS([screen],[]) + VLC_ADD_LDFLAGS([screen],[-lbe]) + else + CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" + AC_CHECK_HEADERS(X11/Xlib.h, [ + VLC_ADD_PLUGINS([screen]) + VLC_ADD_LDFLAGS([screen],[-L${x_libraries} -lX11 -lXext]) + VLC_ADD_CPPFLAGS([screen],[-I${x_includes}]) + ]) + CPPFLAGS="${CPPFLAGS_save}" + fi +fi + dnl dnl ipv6 plugin - not for QNX yet dnl @@ -1769,85 +1813,138 @@ AC_ARG_ENABLE(ffmpeg, [ --enable-ffmpeg ffmpeg codec (default enabled)]) if test "${enable_ffmpeg}" != "no" then - AC_ARG_WITH(ffmpeg-mp3lame, - [ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support], - [ - dnl XXX: we don't link with -lavcodec a 2nd time because the OS X - dnl linker would miserably barf on multiple definitions. - VLC_ADD_LDFLAGS([stream_out_transcode],[]) - VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ]) - - AC_ARG_WITH(ffmpeg-faac, - [ --with-ffmpeg-faac if ffmpeg has been compiled with faac support], - [ - dnl XXX: we don't link with -lavcodec a 2nd time because the OS X - dnl linker would miserably barf on multiple definitions. - VLC_ADD_LDFLAGS([stream_out_transcode],[]) - VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ]) - - AC_ARG_WITH(ffmpeg-tree, - [ --with-ffmpeg-tree=PATH ffmpeg tree for static linking]) + 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]) + VLC_ADD_CFLAGS([ffmpeg],[`${FFMPEG_CONFIG} --cflags`]) + VLC_ADD_LDFLAGS([ffmpeg],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`]) + else + AC_ARG_WITH(ffmpeg-mp3lame, + [ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support], + [ + VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ]) + + AC_ARG_WITH(ffmpeg-faac, + [ --with-ffmpeg-faac if ffmpeg has been compiled with faac support], + [ + 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]) + + dnl + dnl test for !(--with-ffmpeg-tree) + dnl + if test "${with_ffmpeg_tree}" = "no" -o -z "${with_ffmpeg_tree}"; then + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}" + 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(avcodec, avcodec_init, [ + VLC_ADD_BUILTINS([ffmpeg]) + VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec])], + [ 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_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]) ]) + LDFLAGS="${LDFLAGS_save}" + CPPFLAGS="${CPPFLAGS_save}" + fi - dnl - dnl test for !(--with-ffmpeg-tree) - dnl - if test "${with_ffmpeg_tree}" = "no" -o -z "${with_ffmpeg_tree}"; then - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}" - 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(avcodec, avcodec_init, [ - VLC_ADD_BUILTINS([ffmpeg stream_out_transcode]) - VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec]) - dnl XXX: we don't link with -lavcodec a 2nd time because the OS X - dnl linker would miserably barf on multiple definitions. - VLC_ADD_LDFLAGS([stream_out_transcode],[]) ], - [ 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_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]) ]) - LDFLAGS="${LDFLAGS_save}" - CPPFLAGS="${CPPFLAGS_save}" + dnl + dnl test for --with-ffmpeg-tree + dnl + if test "${with_ffmpeg_tree}" != "no" -a -n "${with_ffmpeg_tree}"; then + AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree}) + real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`" + if test -z "${real_ffmpeg_tree}"; then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_ffmpeg_tree}]) + fi + if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then + dnl The given libavcodec wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}]) + fi + if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then + dnl The given libavcodec wasn't built with --enable-pp + AC_MSG_RESULT(no) + AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp]) + fi + dnl Use a custom libffmpeg + AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) + VLC_ADD_BUILTINS([ffmpeg]) + VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec -lavcodec]) + VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat]) + + if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then + AC_DEFINE(HAVE_LIBAVFORMAT, 1, [Define if you have ffmpeg's libavformat.]) + VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat -lavformat -lz]) + VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavformat]) + fi + fi fi +fi - dnl - dnl test for --with-ffmpeg-tree - dnl +dnl +dnl ffmpeg decoder/demuxer plugin +dnl +AC_ARG_ENABLE(ffmpegaltivec, +[ --enable-ffmpegaltivec ffmpegaltivec codec (DO NOT USE)]) +if test "${enable_ffmpegaltivec}" == "yes" +then if test "${with_ffmpeg_tree}" != "no" -a -n "${with_ffmpeg_tree}"; then - AC_MSG_CHECKING(for libavcodec.a in ${with_ffmpeg_tree}) + AC_MSG_CHECKING(for libavcodecaltivec.a in ${with_ffmpeg_tree}) real_ffmpeg_tree="`cd ${with_ffmpeg_tree} 2>/dev/null && pwd`" if test -z "${real_ffmpeg_tree}"; then dnl The given directory can't be found AC_MSG_RESULT(no) AC_MSG_ERROR([cannot cd to ${with_ffmpeg_tree}]) fi - if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then - dnl The given libavcodec wasn't built + if ! test -f "${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a"; then + dnl The given libavcodecaltivec wasn't built AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}]) + 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/libavcodec.a"; then - dnl The given libavcodec wasn't built with --enable-pp + if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a"; then + dnl The given libavcodecaltivec wasn't built with --enable-pp AC_MSG_RESULT(no) - AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodec.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-pp]) fi dnl Use a custom libffmpeg - AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) - VLC_ADD_BUILTINS([ffmpeg stream_out_transcode]) - VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec -lavcodec]) - VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat]) + AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a) + VLC_ADD_BUILTINS([ffmpegaltivec]) + VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavcodec -lavcodecaltivec]) + VLC_ADD_CPPFLAGS([ffmpeg],[-DNO_ALTIVEC_IN_FFMPEG]) + VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat]) if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then AC_DEFINE(HAVE_LIBAVFORMAT, 1, [Define if you have ffmpeg's libavformat.]) - VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat -lavformat -lz]) - VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavformat]) + VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavformat -lavformataltivec -lz]) + VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavformat]) fi - - dnl XXX: we don't link with -lavcodec a 2nd time because the OS X - dnl linker would miserably barf on multiple definitions. - VLC_ADD_LDFLAGS([stream_out_transcode],[-L${real_ffmpeg_tree}/libavcodec]) - VLC_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat]) fi fi @@ -1899,6 +1996,50 @@ then fi fi +dnl +dnl toolame encoder plugin +dnl +AC_ARG_ENABLE(toolame, +[ --enable-toolame toolame codec (default disabled)]) +if test "${enable_toolame}" = "yes" +then + AC_ARG_WITH(toolame-tree, + [ --with-toolame-tree=PATH toolame tree for static linking]) + if test -n "${with_toolame_tree}" + then + AC_MSG_CHECKING(for libtoolame.a in ${with_toolame_tree}) + real_toolame_tree="`cd ${with_toolame_tree} 2>/dev/null && pwd`" + if test -z "${real_toolame_tree}" + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_toolame_tree}]) + fi + if test -f "${real_toolame_tree}/libtoolame/libtoolame.a" + then + dnl Use a custom toolame + AC_MSG_RESULT(${real_toolame_tree}/libtoolame/libtoolame.a) + VLC_ADD_BUILTINS([toolame]) + VLC_ADD_LDFLAGS([toolame],[${real_faad_tree}/libtoolame/libtoolame.a]) + VLC_ADD_CPPFLAGS([toolame],[-I${real_toolame_tree}/libtoolame]) + else + dnl The given libtoolame wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_toolame_tree}/libtoolame/libtoolame.a, make sure you compiled libtoolame in ${with_toolame_tree}]) + fi + else + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_toolame}" + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_toolame}" + AC_CHECK_HEADERS(toolame.h, , + [ AC_MSG_ERROR([Cannot find development header for libtoolame...]) ]) + AC_CHECK_LIB(toolame, toolame_init, [ + VLC_ADD_PLUGINS([toolame]) + VLC_ADD_LDFLAGS([toolame],[-ltoolame]) ], + [ AC_MSG_ERROR([Cannot find libtoolame library...]) ]) + LDFLAGS="${LDFLAGS_save}" + CPPFLAGS="${CPPFLAGS_save}" + fi +fi dnl dnl dnl dnl xvid decoder plugin @@ -1975,7 +2116,7 @@ dnl dnl MP4 module dnl AC_CHECK_HEADERS(zlib.h, [ - VLC_ADD_LDFLAGS([mp4 skins skins2 sap],[-lz]) + VLC_ADD_LDFLAGS([mp4 skins2 sap],[-lz]) ] ) AC_CHECK_HEADERS(sysfs/libsysfs.h, [ @@ -1983,10 +2124,10 @@ AC_CHECK_HEADERS(sysfs/libsysfs.h, [ ] ) dnl -dnl skins module +dnl skins2 module dnl AC_CHECK_HEADERS(libtar.h, [ - VLC_ADD_LDFLAGS([skins skins2],[-ltar]) + VLC_ADD_LDFLAGS([skins2],[-ltar]) ] ) @@ -2086,16 +2227,21 @@ if test "${enable_dts}" != "no"; then VLC_ADD_CPPFLAGS([dtstofloat32],[-I${real_dts_tree}/include]) VLC_ADD_LDFLAGS([dtstofloat32],[-L${real_dts_tree}/libdts]) LDFLAGS="${LDFLAGS_save} ${LDFLAGS_dtstofloat32}" - AC_CHECK_LIB(dts, dts_free, [ - VLC_ADD_BUILTINS([dtstofloat32]) - VLC_ADD_LDFLAGS([dtstofloat32],[-ldts]) + AC_CHECK_LIB(dts_pic, dts_free, [ + VLC_ADD_PLUGINS([dtstofloat32]) + VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic]) ],[ - if test -f ${real_dts_tree}/libdts/libdts.a - then - AC_MSG_ERROR([make sure you have at least libdts-0.0.2]) - else - AC_MSG_ERROR([the specified tree hasn't been compiled]) - fi + AC_CHECK_LIB(dts, dts_free, [ + VLC_ADD_BUILTINS([dtstofloat32]) + VLC_ADD_LDFLAGS([dtstofloat32],[-ldts]) + ],[ + if test -f ${real_dts_tree}/libdts/libdts.a + then + AC_MSG_ERROR([make sure you have at least libdts-0.0.2]) + else + AC_MSG_ERROR([the specified tree hasn't been compiled]) + fi + ]) ]) LDFLAGS="${LDFLAGS_save}" else @@ -2105,13 +2251,18 @@ if test "${enable_dts}" != "no"; then else LDFLAGS="${LDFLAGS_save} ${LDFLAGS_dtstofloat32}" AC_CHECK_HEADERS(dts.h, [ - AC_CHECK_LIB(dts, dts_free, [ + AC_CHECK_LIB(dts_pic, dts_free, [ VLC_ADD_PLUGINS([dtstofloat32]) - VLC_ADD_LDFLAGS([dtstofloat32],[-ldts]) + VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic]) ],[ - if test "${enable_dts}" = "yes"; then - AC_MSG_ERROR([Could not find libdts on your system: you may get it from http://www.videolan.org/dtsdec.html]) - fi + AC_CHECK_LIB(dts, dts_free, [ + VLC_ADD_BUILTINS([dtstofloat32]) + VLC_ADD_LDFLAGS([dtstofloat32],[-ldts]) + ],[ + if test "${enable_dts}" = "yes"; then + AC_MSG_ERROR([Could not find libdts on your system: you may get it from http://www.videolan.org/dtsdec.html]) + fi + ]) ]) ]) LDFLAGS="${LDFLAGS_save}" @@ -2299,11 +2450,56 @@ You also need to check that you have a libogg posterior to the 1.0 release.])], fi dnl -dnl subsdec support +dnl H264 encoder plugin (using libx264) dnl -VLC_ADD_LDFLAGS([subsdec],[${LIBICONV}]) -VLC_ADD_CPPFLAGS([subsdec],[${INCICONV}]) -VLC_ADD_PLUGINS([subsdec]) +AC_ARG_ENABLE(x264, + [ --enable-x264 H264 encoding support with libx264 (default enabled)]) +if test "${enable_x264}" != "no"; then + AC_ARG_WITH(x264-tree, + [ --with-x264-tree=PATH x264 tree for static linking ],[],[]) + if test "${with_x264_tree}" != "no" -a -n "${with_x264_tree}" + then + real_x264_tree="`cd ${with_x264_tree} 2>/dev/null && pwd`" + if test -z "${real_x264_tree}" + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([${with_x264_tree} directory doesn't exist]) + fi + dnl Use a custom libx264 + AC_MSG_CHECKING(for x264.h in ${real_x264_tree}) + if test -f ${real_x264_tree}/x264.h + then + AC_MSG_RESULT(yes) + VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}]) + VLC_ADD_LDFLAGS([x264],[-L${real_x264_tree}]) + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}" + AC_CHECK_LIB(x264, x264_encoder_open, [ + VLC_ADD_BUILTINS([x264]) + VLC_ADD_LDFLAGS([x264],[-lx264]) + ],[ + AC_MSG_ERROR([the specified tree hasn't been compiled]) + ]) + LDFLAGS="${LDFLAGS_save}" + else + AC_MSG_RESULT(no) + AC_MSG_ERROR([the specified tree doesn't have x264.h]) + fi + else + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}" + AC_CHECK_HEADERS(x264.h, [ + AC_CHECK_LIB(x264, x264_encoder_open, [ + VLC_ADD_PLUGINS([x264]) + VLC_ADD_LDFLAGS([x264],[-lx264]) + ],[ + 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 dnl dnl CMML plugin @@ -2324,6 +2520,7 @@ dnl dnl png dnl AC_CHECK_HEADERS(png.h, [ + LDFLAGS="${LDFLAGS_save} -lz" AC_CHECK_LIB(png, png_set_rows, [ VLC_ADD_LDFLAGS([logo],[-lpng -lz]) VLC_ADD_PLUGINS([logo]) @@ -2331,6 +2528,7 @@ AC_CHECK_HEADERS(png.h, [ VLC_ADD_LDFLAGS([cvdsub],[-lpng -lz -lm]) AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])]) ]) + LDFLAGS="${LDFLAGS_save}" dnl dnl Video plugins @@ -2409,6 +2607,24 @@ if test "${enable_xvideo}" != "no" && CPPFLAGS="${CPPFLAGS_save}") fi +dnl +dnl GLX module +dnl (enabled by default except on win32) +dnl +AC_ARG_ENABLE(glx, + [ --enable-glx X11 OpenGL (GLX) support (default enabled)]) +if test "${enable_glx}" != "no" && + (test "${SYS}" != "mingw32" || test "${enable_glx}" = "yes"); then + CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" + AC_CHECK_HEADERS(X11/Xlib.h, [ + AC_CHECK_HEADERS(GL/glx.h, [ + VLC_ADD_PLUGINS([glx]) + VLC_ADD_LDFLAGS([glx],[-L${x_libraries} -lX11 -lXext -lGL -lGLU]) + VLC_ADD_CPPFLAGS([glx],[-I${x_includes}]) + ]) ]) + CPPFLAGS="${CPPFLAGS_save}" +fi + dnl dnl Check for the Xinerama extension dnl @@ -2421,11 +2637,13 @@ if test "${enable_xvideo}" != "no" && AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[ VLC_ADD_LDFLAGS([xvideo],[-lXinerama_pic]) VLC_ADD_LDFLAGS([x11],[-lXinerama_pic]) + VLC_ADD_LDFLAGS([glx],[-lXinerama_pic]) ac_cv_have_xinerama="yes" ],[ AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[ VLC_ADD_LDFLAGS([xvideo],[-lXinerama]) VLC_ADD_LDFLAGS([x11],[-lXinerama]) + VLC_ADD_LDFLAGS([glx],[-lXinerama]) ac_cv_have_xinerama="yes" ]) ]) @@ -2437,6 +2655,29 @@ if test "${enable_xvideo}" != "no" && CPPFLAGS="${CPPFLAGS_save}" fi +dnl +dnl OpenGL module +dnl (enabled by default except on beos) +dnl +AC_ARG_ENABLE(opengl, + [ --enable-opengl OpenGL support (default enabled)]) +if test "${enable_opengl}" != "no" && test "${SYS}" != "beos"; then + if test "${SYS}" != "darwin"; then + AC_CHECK_HEADERS(GL/gl.h, [ + VLC_ADD_PLUGINS([opengl]) + if test "${SYS}" != "mingw32"; then + VLC_ADD_LDFLAGS([opengl],[-L${x_libraries} -lGL -lGLU]) + else + VLC_ADD_LDFLAGS([opengl],[-lopengl32]) + fi + ]) + else + dnl OS X special case (no GL/gl.h but OpenGL/gl.h) + VLC_ADD_PLUGINS([opengl]) + VLC_ADD_LDFLAGS([opengl],[-framework OpenGL]) + fi +fi + dnl dnl SDL module dnl @@ -2525,8 +2766,8 @@ then 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" @@ -2662,7 +2903,12 @@ then then AC_CHECK_HEADERS(ddraw.h, [ VLC_ADD_PLUGINS([vout_directx aout_directx]) - VLC_ADD_LDFLAGS([vout_directx],[-lgdi32]) ]) + VLC_ADD_LDFLAGS([vout_directx],[-lgdi32]) + dnl to be moved when dependance is removed + AC_CHECK_HEADERS(GL/gl.h, [ + VLC_ADD_PLUGINS([glwin32]) + VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32]) + ]) ]) else AC_MSG_CHECKING(for directX headers in ${with_directx}) if test -f ${with_directx}/ddraw.h @@ -2749,18 +2995,6 @@ then fi ]) fi -dnl -dnl GLX module -dnl -AC_ARG_ENABLE(glx, - [ --enable-glx X11 OpenGL (GLX) support (default disabled)]) -if test "${enable_glx}" = "yes" -then - VLC_ADD_PLUGINS([glx]) - VLC_ADD_LDFLAGS([glx],[-lGL -lGLU]) -fi - - dnl dnl AA plugin dnl @@ -2942,30 +3176,7 @@ AC_ARG_WITH(,[Interface plugins:]) dnl special case for BeOS if test "${SYS}" = "beos" then - VLC_ADD_PLUGINS([beos]) -fi - -dnl -dnl Skins module -dnl -AC_ARG_ENABLE(skins, - [ --enable-skins Skins interface module (default enabled on Win32)]) -if test "${enable_skins}" != "no"; then - if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then - - VLC_ADD_PLUGINS([skins]) - ALIASES="${ALIASES} svlc" - VLC_ADD_CPPFLAGS([skins],[-U_OFF_T_ -U_off_t -Imodules/gui/skins]) - VLC_ADD_CXXFLAGS([skins],[-O2 -fno-rtti]) - VLC_ADD_LDFLAGS([skins],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32]) - - else if test "${enable_skins}" = "yes"; then - VLC_ADD_PLUGINS([skins]) - ALIASES="${ALIASES} svlc" - VLC_ADD_CPPFLAGS([skins],[-Imodules/gui/skins -I${x_includes} -I/usr/include/freetype2 -DX11_SKINS]) - VLC_ADD_CXXFLAGS([skins],[-O2 -fno-rtti]) - VLC_ADD_LDFLAGS([skins],[-L${x_libraries} -lImlib2 -lXext -lX11 -lfreetype -lpng -lz ]) - fi fi + VLC_ADD_BUILTINS([beos]) fi dnl @@ -2981,7 +3192,7 @@ if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS} 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 @@ -2989,17 +3200,6 @@ if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS} 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, @@ -3394,8 +3594,14 @@ AC_ARG_ENABLE(galaktos, [ --enable-galaktos OpenGL visualisation plugin (default disabled)]) if test "${enable_galaktos}" = "yes" then + AC_CHECK_HEADERS(GL/gl.h, [ VLC_ADD_PLUGINS([galaktos]) - VLC_ADD_LDFLAGS([galaktos],[-lGL -lGLU]) + if test "${SYS}" != "mingw32"; then + VLC_ADD_LDFLAGS([galaktos],[-L${x_libraries} -lGL -lGLU]) + else + VLC_ADD_LDFLAGS([galaktos],[-lopengl32]) + fi + ]) fi dnl @@ -3507,12 +3713,9 @@ dnl dnl Joystick plugin dnl AC_ARG_ENABLE(joystick, - [ --enable-joystick joystick control (default disabled)]) -if test "${enable_joystick}" = "yes" -then - AC_CHECK_HEADER( linux/joystick.h, - [VLC_ADD_PLUGINS([joystick])] - ) + [ --enable-joystick joystick control (default enabled)]) +if test "${enable_joystick}" = "yes"; then + AC_CHECK_HEADER(linux/joystick.h, [VLC_ADD_PLUGINS([joystick])]) fi dnl @@ -3830,7 +4033,6 @@ VLC_OUTPUT_VLC_CONFIG_IN AC_CONFIG_FILES([ Makefile - autotools/Makefile debian/Makefile doc/Makefile intl/Makefile @@ -3855,6 +4057,7 @@ AC_CONFIG_FILES([ modules/access/cdda/Makefile modules/access/vcd/Makefile modules/access/vcdx/Makefile + modules/access/screen/Makefile modules/access_output/Makefile modules/audio_filter/Makefile modules/audio_filter/channel_mixer/Makefile @@ -3887,7 +4090,6 @@ AC_CONFIG_FILES([ modules/gui/macosx/Makefile modules/gui/qnx/Makefile modules/gui/qt/Makefile - modules/gui/skins/Makefile modules/gui/skins2/Makefile modules/gui/wxwindows/Makefile modules/misc/Makefile @@ -3903,6 +4105,7 @@ AC_CONFIG_FILES([ 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