X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=9c1df43d8590e14092c7c6ce68d7f780f4bdad19;hb=8235c2c5c5f16ad56d0bdcaf93af1e338595148e;hp=e11801dbffb9f7b0998df0c6d19f94972d8cc9c3;hpb=26eb85c088d249df8b6e4d7ac92abddf8288d53d;p=vlc diff --git a/configure.ac b/configure.ac index e11801dbff..9c1df43d85 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.2-svn) 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.2-svn) AM_CONFIG_HEADER(config.h) dnl @@ -28,7 +28,10 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CPP AC_PROG_CXX -AC_PROG_CXXCPP +eval "${CXX} --version" >/dev/null 2>&1 || CXX="" +if test "${CXX}" != ""; then + AC_PROG_CXXCPP +fi AC_PROG_MAKE_SET AC_PROG_INSTALL @@ -53,7 +56,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 @@ -123,7 +125,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]) @@ -175,6 +177,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 @@ -192,7 +195,7 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") dnl dnl Gettext stuff dnl -ALL_LINGUAS="de en_GB es fr hu it ja nl no pl pt_BR ru sv" +ALL_LINGUAS="da de en_GB es fr hu it ja nl no pl pt_BR ru sv el" AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then @@ -217,6 +220,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 @@ -251,7 +260,7 @@ then fi dnl Check for fvtable-thunks support for mingw32 -if test "${SYS}" = "mingw32" +if test "${SYS}" = "mingw32" -a "${CXX}" != "" then AC_LANG_PUSH(C++) AC_CACHE_CHECK([if \$CXX accepts -fvtable-thunks], @@ -273,9 +282,9 @@ VLC_LIBRARY_SUFFIX case "${SYS}" in mingw32|cygwin) - VLC_ADD_CFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}]) - VLC_ADD_CXXFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}]) - VLC_ADD_OBJCFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}]) + VLC_ADD_CFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special}]) + VLC_ADD_CXXFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}]) + VLC_ADD_OBJCFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special}]) ;; *) VLC_ADD_CFLAGS([pic plugin mozilla],[-fpic -fPIC]) @@ -291,10 +300,10 @@ CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcd dnl Check for system libs needed need_libc=false -AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf) +AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon) dnl Check for usual libc functions -AC_CHECK_FUNCS(strdup strndup atof lseek) +AC_CHECK_FUNCS(strdup strndup atof) AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)]) AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)]) AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)]) @@ -438,13 +447,13 @@ 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 goom],[-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 freetype],[-lm]) ]) AC_CHECK_LIB(m,sqrt,[ - VLC_ADD_LDFLAGS([headphone_channel_mixer normvol],[-lm]) + VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex],[-lm]) ]) fi # end "${SYS}" != "mingw32" @@ -669,6 +678,14 @@ 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_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? NEED_GTK_MAIN=no NEED_GNOME_MAIN=no @@ -689,17 +706,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 @@ -941,19 +947,20 @@ test "${enable_cprof}" != "yes" && enable_cprof="no" dnl 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([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([dummy rc telnet logger gestures memcpy hotkeys netsync showintf]) +VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg demuxdump]) +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 motiondetect]) +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_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([rawvideo]) -VLC_ADD_PLUGINS([wav araw subtitle adpcm a52sys dtssys au]) +VLC_ADD_PLUGINS([image]) +VLC_ADD_PLUGINS([id3 playlist export sgimb m3u xtag]) +VLC_ADD_PLUGINS([rawvideo blend scale time marq logo]) +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]) @@ -973,8 +980,7 @@ dnl if test "${SYS}" != "mingw32"; then VLC_ADD_PLUGINS([screensaver]) else - VLC_ADD_PLUGINS([ntservice]) - VLC_ADD_PLUGINS([dmo]) + VLC_ADD_PLUGINS([ntservice smb dmo]) VLC_ADD_LDFLAGS([dmo],[-lole32]) fi @@ -1066,12 +1072,13 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], [vec_ld(0, (unsigned char *)0);], [ac_cv_c_altivec="-faltivec"], [# Linux/PPC test (no flags) - CFLAGS="${CFLAGS_save} ${CFLAGS_idctaltivec} -Werror" + 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=""], + [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 @@ -1085,7 +1092,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 @@ -1176,13 +1185,40 @@ 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 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 + AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support) fi +dnl +dnl HTTP daemon +dnl +AC_ARG_ENABLE(httpd, + [ --enable-httpd HTTP daemon (default enabled)]) +if test "${enable_httpd}" != "no" +then + AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support) +fi + +dnl +dnl VideoLAN manager +dnl +AC_ARG_ENABLE(vlm, + [ --enable-vlm VideoLAN manager (default enabled)]) +if test "${enable_vlm}" != "no" +then + 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 @@ -1190,7 +1226,6 @@ dnl AC_ARG_WITH(,[Input plugins:]) -dnl dnl live.com input dnl AC_ARG_ENABLE(livedotcom, @@ -1202,7 +1237,7 @@ if test "${enable_livedotcom}" = "yes"; then dnl dnl test for --with-livedotcom-tree dnl - if test -z "${with_livedotcom_tree}"; then + if test -z "${with_livedotcom_tree}" -a "${CXX}" != ""; then AC_LANG_PUSH(C++) CPPFLAGS_save="${CPPFLAGS}" CPPFLAGS_livedotcom="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment" @@ -1271,7 +1306,7 @@ AC_ARG_ENABLE(dvdread, if test "${enable_dvdread}" != "no" then AC_ARG_WITH(dvdread, - [ --with-dvdread=PATH libdvdread headers and libraries]) + [ --with-dvdread=PATH libdvdread headers and libraries]) AC_ARG_WITH(dvdread-tree, [ --with-dvdread-tree=PATH libdvdread tree for static linking]) @@ -1339,6 +1374,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)], @@ -1371,6 +1411,20 @@ then fi fi +dnl +dnl libsmbclient plugin +dnl +AC_ARG_ENABLE(smb, + [ --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_LDFLAGS([access_smb],[-lsmbclient]) ], + [ if test -n "${enable_smb}"; then + AC_MSG_ERROR([cannot find libsmbclient headers]) + fi ]) +fi + dnl dnl libdvbpsi ts demux/mux dnl @@ -1388,7 +1442,7 @@ then then AC_CHECK_HEADERS(dvbpsi/dr.h, [ VLC_ADD_PLUGINS([mux_ts ts]) - VLC_ADD_LDFLAGS([mux_ts ts],[-ldvbpsi]) ], + VLC_ADD_LDFLAGS([mux_ts ts dvb],[-ldvbpsi]) ], [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], [#if defined( HAVE_STDINT_H ) # include @@ -1413,8 +1467,8 @@ then dnl Use a custom libdvbpsi AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a) VLC_ADD_BUILTINS([mux_ts ts]) - VLC_ADD_CPPFLAGS([mux_ts ts],[-I${real_dvbpsi_tree}/src]) - VLC_ADD_LDFLAGS([mux_ts ts],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi]) + VLC_ADD_CPPFLAGS([mux_ts ts dvb],[-I${real_dvbpsi_tree}/src]) + VLC_ADD_LDFLAGS([mux_ts ts dvb],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi]) else dnl The given libdvbpsi wasn't built AC_MSG_RESULT(no) @@ -1438,8 +1492,8 @@ then CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" AC_CHECK_HEADERS([dvbpsi/dr.h],[ VLC_ADD_PLUGINS([mux_ts ts]) - VLC_ADD_CPPFLAGS([mux_ts ts],[${CPPFLAGS_test}]) - VLC_ADD_LDFLAGS([mux_ts ts],[${LDFLAGS_test} -ldvbpsi]) + VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}]) + VLC_ADD_LDFLAGS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi]) ],[ if test -n "${enable_dvbpsi}" @@ -1483,59 +1537,69 @@ 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 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 -dnl if test "${enable_vcdx}" != "no" -dnl then -dnl PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20, -dnl [enable_vcd="no" -dnl AC_DEFINE(HAVE_VCDX, [], -dnl [Define for the VCD plugin using libcdio/libvcdinfo]) -dnl VLC_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS]) -dnl VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS]) -dnl VLC_ADD_PLUGINS([vcdx])], -dnl [AC_MSG_WARN(vcdinfo library not found) -dnl HAVE_VCDX=no]) -dnl fi -dnl fi +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)]) + +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)]) + +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]) + 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) + + if test "$enable_libcddb" != "no"; then + PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [ + 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 + +fi + +if test "${enable_vcdx}" = "yes" +then + PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.71, + [VLC_ADD_LDFLAGS([vcdx],[$LIBCDIO_LIBS]) + VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])], + [AC_MSG_WARN(libcdio library not found) + HAVE_VCDX=no]) + + PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21, + [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]) +fi dnl dnl VCD module @@ -1620,7 +1684,7 @@ dnl dnl Screen capture module dnl AC_ARG_ENABLE(screen, - [ --enable-screen Screen capture support (default enabled)]) + [ --enable-screen Screen capture support (default enabled)]) if test "${enable_screen}" != "no"; then if test "${SYS}" = "darwin"; then AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ @@ -1689,23 +1753,49 @@ dnl matroska demux plugin dnl AC_ARG_ENABLE(mkv, [ --enable-mkv Matroska demux support (default enabled)]) -if test "${enable_mkv}" != "no"; then +if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then AC_LANG_PUSH(C++) AC_CHECK_HEADERS(ebml/EbmlVersion.h, [ - AC_CHECK_HEADERS(matroska/KaxVersion.h, [ - AC_CHECK_HEADERS(matroska/KaxAttachments.h) - VLC_ADD_CXXFLAGS([mkv],[]) - AC_CHECK_LIB(ebml_pic, main, [ - # We have ebml_pic, that's good, we can build an mkv.so plugin ! - VLC_ADD_PLUGINS([mkv]) - VLC_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic]) - ], [ - AC_CHECK_LIB(ebml, main, [ - # We only have libebml, make mkv.a a builtin - VLC_ADD_BUILTINS([mkv]) - VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml]) + AC_MSG_CHECKING(for libebml version >= 0.7.3) + AC_EGREP_CPP(yes, + [#include + #ifdef LIBEBML_VERSION + #if LIBEBML_VERSION >= 0x000703 + yes + #endif + #endif], + [AC_MSG_RESULT([yes]) + AC_CHECK_HEADERS(matroska/KaxVersion.h, [ + AC_MSG_CHECKING(for libmatroska version >= 0.7.5) + AC_EGREP_CPP(yes, + [#include + #ifdef LIBMATROSKA_VERSION + #if LIBMATROSKA_VERSION >= 0x000705 + yes + #endif + #endif], + [AC_MSG_RESULT([yes]) + AC_CHECK_HEADERS(matroska/KaxAttachments.h) + VLC_ADD_CXXFLAGS([mkv],[]) + AC_CHECK_LIB(ebml_pic, main, [ + # We have ebml_pic, that's good, we can build an mkv.so plugin ! + VLC_ADD_PLUGINS([mkv]) + VLC_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic]) + ], [ + AC_CHECK_LIB(ebml, main, [ + # We only have libebml, make mkv.a a builtin + VLC_ADD_BUILTINS([mkv]) + VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml]) + ]) + ]) + ], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.]) + ]) ]) - ]) + ], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Your libebml is too old: you may get a more recent one from http://dl.matroska.org/downloads/libebml/. Alternatively you can use --disable-mkv to disable the matroska plugin.]) ]) ]) AC_LANG_POP(C++) @@ -1815,27 +1905,30 @@ then then AC_CHECK_HEADERS(ffmpeg/avcodec.h) AC_CHECK_HEADERS(postproc/postprocess.h) - VLC_ADD_PLUGINS([ffmpeg stream_out_transcode]) - VLC_ADD_CFLAGS([ffmpeg stream_out_transcode],[`${FFMPEG_CONFIG} --cflags`]) + VLC_ADD_PLUGINS([ffmpeg]) + VLC_ADD_CFLAGS([ffmpeg],[`${FFMPEG_CONFIG} --cflags`]) VLC_ADD_LDFLAGS([ffmpeg],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`]) - VLC_ADD_LDFLAGS([stream_out_transcode],[`${FFMPEG_CONFIG} --libs avcodec`]) else AC_ARG_WITH(ffmpeg-mp3lame, - [ --with-ffmpeg-mp3lame if ffmpeg has been compiled with mp3lame support], + [ --with-ffmpeg-mp3lame specify 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], + [ --with-ffmpeg-faac specify 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-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]) @@ -1848,16 +1941,13 @@ then 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],[]) ], + 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]) ]) + VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz]) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" fi @@ -1885,20 +1975,86 @@ then 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]) + + if fgrep -s "CONFIG_ZLIB=yes" "${real_ffmpeg_tree}/config.mak"; then + if test "${with_ffmpeg_zlib}" != "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lz]) + fi + fi + if fgrep -s "CONFIG_MP3LAME=yes" "${real_ffmpeg_tree}/config.mak"; then + if test "${with_ffmpeg_mp3lame}" != "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) + fi + fi + if fgrep -s "CONFIG_FAAC=yes" "${real_ffmpeg_tree}/config.mak"; then + if test "${with_ffmpeg_faac}" != "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) + fi + fi + if fgrep -s "CONFIG_DTS=yes" "${real_ffmpeg_tree}/config.mak"; then + if test "${with_ffmpeg_dts}" != "yes"; then + VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) + fi + fi + if fgrep -s "CONFIG_VORBIS=yes" "${real_ffmpeg_tree}/config.mak"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lvorbis -lvorbisenc]) + fi + if fgrep -s "CONFIG_FAAD=yes" "${real_ffmpeg_tree}/config.mak"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lfaad]) + fi + if fgrep -s "CONFIG_XVID=yes" "${real_ffmpeg_tree}/config.mak"; then + VLC_ADD_LDFLAGS([ffmpeg],[-lxvidcore]) + fi + + VLC_ADD_BUILTINS([ffmpeg]) + VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec ${real_ffmpeg_tree}/libavcodec/libavcodec.a]) + VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavcodec]) 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_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat ${real_ffmpeg_tree}/libavformat/libavformat.a]) VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavformat]) fi + fi + fi +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]) +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 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/libavcodecaltivec.a"; then + dnl The given libavcodecaltivec wasn't built + AC_MSG_RESULT(no) + 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/libavcodecaltivec.a"; then + dnl The given libavcodecaltivec wasn't built with --enable-pp + AC_MSG_RESULT(no) + 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/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([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavformat -lavformataltivec -lz]) + VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavformat]) fi fi fi @@ -1951,59 +2107,50 @@ then fi fi - -dnl dnl -dnl dnl xvid decoder plugin -dnl dnl -dnl AC_ARG_ENABLE(xvid, -dnl [ --enable-xvid xvid codec (default disabled)]) -dnl if test "${enable_xvid}" = "yes" -dnl then -dnl AC_ARG_WITH(xvid, -dnl [ --with-xvid=PATH path to xvid installation],[],[]) -dnl if test "${with_xvid}" != "no" -a -n "${with_xvid}" -dnl then -dnl VLC_ADD_CPPFLAGS([xvid],[-I${with_xvid}/include]) -dnl VLC_ADD_LDFLAGS([xvid],[-L${with_xvid}/lib]) -dnl fi -dnl -dnl AC_ARG_WITH(xvid-tree, -dnl [ --with-xvid-tree=PATH xvid tree for static linking]) -dnl if test -n "${with_xvid_tree}" -dnl then -dnl AC_MSG_CHECKING(for libxvidcore.a in ${with_xvid_tree}) -dnl real_xvid_tree="`cd ${with_xvid_tree} 2>/dev/null && pwd`" -dnl if test -z "${real_xvid_tree}" -dnl then -dnl dnl The given directory can't be found -dnl AC_MSG_RESULT(no) -dnl AC_MSG_ERROR([cannot cd to ${with_xvid_tree}]) -dnl fi -dnl if test -f "${real_xvid_tree}/build/generic/libxvidcore.a" -dnl then -dnl dnl Use a custom xvid -dnl AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a) -dnl VLC_ADD_BUILTINS([xvid]) -dnl VLC_ADD_LDFLAGS([xvid],[-L${real_xvid_tree}/build/generic -lxvidcore]) -dnl VLC_ADD_CPPFLAGS([xvid],[-I${real_xvid_tree}/src]) -dnl else -dnl dnl The given libxvidcore wasn't built -dnl AC_MSG_RESULT(no) -dnl AC_MSG_ERROR([cannot find ${real_xvid_tree}/build/generic/libxvidcore.a, make sure you compiled libxvidcore in ${with_xvid_tree}]) -dnl fi -dnl else -dnl CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xvid}" -dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xvid}" -dnl AC_CHECK_HEADERS(xvid.h, , -dnl [ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ]) -dnl AC_CHECK_LIB(xvidcore, xvid_init, [ -dnl VLC_ADD_PLUGINS([xvid]) -dnl VLC_ADD_LDFLAGS([xvid],[-lxvidcore]) ], -dnl [ AC_MSG_ERROR([Cannot find libxvidcore library...]) ]) -dnl LDFLAGS="${LDFLAGS_save}" -dnl CPPFLAGS="${CPPFLAGS_save}" -dnl fi -dnl 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 QuickTime plugin @@ -2027,18 +2174,18 @@ dnl dnl MP4 module dnl AC_CHECK_HEADERS(zlib.h, [ - VLC_ADD_LDFLAGS([mp4 skins skins2 sap],[-lz]) + VLC_ADD_LDFLAGS([mp4 skins2 sap mkv],[-lz]) ] ) AC_CHECK_HEADERS(sysfs/libsysfs.h, [ - VLC_ADD_LDFLAGS([mp4],[-lsysfs]) + VLC_ADD_LDFLAGS([mp4 mkv],[-lsysfs]) ] ) dnl -dnl skins module +dnl skins2 module dnl AC_CHECK_HEADERS(libtar.h, [ - VLC_ADD_LDFLAGS([skins skins2],[-ltar]) + VLC_ADD_LDFLAGS([skins2],[-ltar]) ] ) @@ -2138,16 +2285,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 @@ -2157,32 +2309,24 @@ 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}" fi fi -dnl dnl -dnl dnl DV plugin -dnl dnl -dnl AC_ARG_ENABLE(dv, -dnl [ --enable-dv DV decoder support (deprecated in favor of ffmpeg) (default disabled)]) -dnl if test "${enable_dv}" = "yes" -dnl then -dnl AC_CHECK_HEADERS(libdv/dv.h, [ -dnl VLC_ADD_PLUGINS([dv]) -dnl VLC_ADD_LDFLAGS([dv],[-ldv]) -dnl ],[]) -dnl fi - dnl dnl Flac plugin dnl @@ -2284,19 +2428,15 @@ AC_ARG_ENABLE(speex, [ --enable-speex Speex decoder support (default enabled)]) if test "${enable_speex}" != "no" then - AC_CHECK_HEADERS(speex.h, [ - AC_MSG_CHECKING(for libspeex version > 1.1.0) - AC_EGREP_CPP(yes, - [#include - #ifdef SPEEX_SET_SUBMODE_ENCODING - yes - #endif], - [ AC_MSG_RESULT([yes]) - VLC_ADD_PLUGINS([speex]) - VLC_ADD_LDFLAGS([speex],[-lspeex]) ], + AC_CHECK_HEADERS(speex/speex.h, [ + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_toolame}" + AC_CHECK_LIB(speex, speex_decode_int, [ + VLC_ADD_PLUGINS([speex]) + VLC_ADD_LDFLAGS([speex],[-lspeex]) ], [ AC_MSG_RESULT([no]) AC_MSG_WARN([Your libspeex is too old, please get the development - version.]) ] ) + version.]) ],[]) + LDFLAGS="${LDFLAGS_save}" ],[]) fi @@ -2344,18 +2484,95 @@ then fi theora_libs="-ltheora -logg" VLC_ADD_LDFLAGS([theora],[${theora_libs}]) ],[ - AC_MSG_ERROR([libtheora doesn't appear to be installed on you system. + AC_MSG_ERROR([libtheora doesn't appear to be installed on your system. You also need to check that you have a libogg posterior to the 1.0 release.])], [-logg]) ]) fi dnl -dnl subsdec support +dnl dirac decoder plugin +dnl +AC_ARG_ENABLE(dirac, +[ --enable-dirac experimental dirac codec (default disabled)]) +if test "${enable_dirac}" = "yes"; then + AC_CHECK_HEADERS(libdirac_decoder/dirac_parser.h, [ + AC_CHECK_LIB(dirac_decoder, dirac_decoder_init, [ + VLC_ADD_PLUGINS([dirac]) + VLC_ADD_LDFLAGS([dirac],[-ldirac_decoder -ldirac_encoder -lstdc++]) ],[ + AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.])], + [-lstdc++]) + ]) +fi + +dnl +dnl PNG decoder module dnl -VLC_ADD_LDFLAGS([subsdec],[${LIBICONV}]) -VLC_ADD_CPPFLAGS([subsdec],[${INCICONV}]) -VLC_ADD_PLUGINS([subsdec]) +AC_ARG_ENABLE(png, + [ --enable-png PNG support (default enabled)]) +if test "${enable_png}" != "no"; then +AC_CHECK_HEADERS(png.h, [ + LDFLAGS="${LDFLAGS_save} -lz" + AC_CHECK_LIB(png, png_set_rows, [ + VLC_ADD_LDFLAGS([png],[-lpng -lz]) + VLC_ADD_PLUGINS([png]) + AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])], + [],[-lz]) + LDFLAGS="${LDFLAGS_save}" + ]) +fi + +dnl +dnl H264 encoder plugin (using libx264) +dnl +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 @@ -2368,24 +2585,6 @@ then fi -dnl -dnl Video Filters -dnl - -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]) - VLC_ADD_LDFLAGS([svcdsub],[-lpng -lz]) - 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 dnl @@ -2512,20 +2711,26 @@ if test "${enable_xvideo}" != "no" && fi dnl -dnl GLX module -dnl (enabled by default except on win32) +dnl OpenGL module +dnl (enabled by default except on beos) dnl AC_ARG_ENABLE(opengl, - [ --enable-opengl OpenGL support (default enabled)]) + [ --enable-opengl OpenGL support (default enabled)]) if test "${enable_opengl}" != "no" && test "${SYS}" != "beos"; then - AC_CHECK_HEADERS(GL/gl.h, [ + 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]) - if test "${SYS}" != "mingw32"; then - VLC_ADD_LDFLAGS([opengl],[-L${x_libraries} -lGL -lGLU]) - else - VLC_ADD_LDFLAGS([opengl],[-lopengl32]) - fi - ]) + VLC_ADD_LDFLAGS([opengl],[-framework OpenGL]) + fi fi dnl @@ -2616,8 +2821,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" @@ -2647,6 +2852,47 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice fi fi +dnl +dnl libxml2 module +dnl +AC_ARG_ENABLE(libxml2, + [ --enable-libxml2 libxml2 support (default enabled)]) +if test "${enable_libxml2}" != "no" +then + XML2_PATH="${PATH}" + AC_ARG_WITH(xml2-config-path, + [ --with-xml2-config-path=PATH xml2-config path (default search in \$PATH)], + [ if test "${with_xml2_config_path}" != "no"; then + XML2_PATH="${with_xml2_config_path}:${PATH}" + fi ]) + AC_PATH_PROG(XML2_CONFIG, xml2-config, no, ${XML2_PATH}) + if test "${XML2_CONFIG}" != "no"; then + VLC_ADD_CPPFLAGS([xml],[`${XML2_CONFIG} --cflags`]) + VLC_ADD_LDFLAGS([xml],[`${XML2_CONFIG} --libs`]) + dnl depends on the xmlTextReader extension + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xml}" + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xml}" + AC_CHECK_LIB(xml2,xmlTextReaderConstName,[ + AC_EGREP_HEADER(xmlTextReaderConstName,libxml/xmlreader.h,[ + VLC_ADD_PLUGINS([xml]) ],[ + AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version]) + if test "${enable_xml2}" = "yes"; then + AC_MSG_ERROR([libxml2 missing the xmlTextReader extension]) + fi]) + ],[ + AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version]) + if test "${enable_xml2}" = "yes"; then + AC_MSG_ERROR([libxml2 missing the xmlTextReader extension]) + fi]) + LDFLAGS="${LDFLAGS_save}" + CPPFLAGS="${CPPFLAGS_save}" + else + if test "${enable_xml2}" = "yes"; then + AC_MSG_ERROR([Could not find libxml2]) + fi + fi +fi + dnl dnl SVG module dnl @@ -2718,7 +2964,7 @@ dnl Roku HD1000 Video output module dnl AC_ARG_ENABLE(hd1000v, [ --enable-hd1000v HD1000 Video Output module (default enabled on HD1000)]) -if test "${enable_hd1000v}" != "no" && +if test "${enable_hd1000v}" != "no" -a "${CXX}" != "" && (test "${SYS}" != "mingw32" || test "${enable_hd1000v}" = "yes") then AC_LANG_PUSH([C++]) @@ -2932,6 +3178,22 @@ AC_ARG_ENABLE(esd, fi fi]) +dnl +dnl Portaudio module +dnl +AC_ARG_ENABLE(portaudio, + [ --enable-portaudio Portaudio library support (default disabled)], + [if test "${enable_portaudio}" = "yes" + then + VLC_ADD_PLUGINS([portaudio]) + VLC_ADD_CXXFLAGS([portaudio],[]) + if test "${SYS}" = "mingw32"; then + VLC_ADD_LDFLAGS([portaudio],[-lportaudio -lwinmm -lole32]) + else + VLC_ADD_LDFLAGS([portaudio],[-lportaudio]) + fi + fi]) + dnl dnl aRts module dnl @@ -2952,8 +3214,8 @@ dnl dnl ALSA module dnl AC_ARG_ENABLE(alsa, - [ --enable-alsa ALSA sound support for Linux (default disabled)], - [if test "${enable_alsa}" = "yes" + [ --enable-alsa ALSA sound support for Linux (default enabled)], + [if test "${enable_alsa}" != "no" then AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") if test "${have_alsa}" = "true" @@ -2966,7 +3228,9 @@ AC_ARG_ENABLE(alsa, VLC_ADD_PLUGINS([alsa]) VLC_ADD_LDFLAGS([alsa],[-lasound -lm -ldl]) else - AC_MSG_ERROR([Could not find ALSA development headers]) + if test "${enable_alsa}" = "yes"; then + AC_MSG_ERROR([Could not find ALSA development headers]) + fi fi fi]) @@ -3007,7 +3271,7 @@ dnl Roku HD1000 audio dnl AC_ARG_ENABLE(hd1000a, [ --enable-hd1000a HD1000 audio module (default enabled on HD1000)]) -if test "${enable_hd1000a}" != "no" && +if test "${enable_hd1000a}" != "no" -a "${CXX}" != "" && (test "${SYS}" != "mingw32" || test "${enable_hd1000a}" = "yes") then AC_LANG_PUSH([C++]) @@ -3026,30 +3290,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 @@ -3073,44 +3314,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, - [ --with-xml2-config-path=PATH xml2-config path (default search in \$PATH)], - [ if test "${with_xml2_config_path}" != "no"; then - XML2_PATH="${with_xml2_config_path}:${PATH}" - fi ]) - AC_PATH_PROG(XML2_CONFIG, xml2-config, no, ${XML2_PATH}) - if test "${XML2_CONFIG}" != "no"; then - VLC_ADD_CPPFLAGS([skins2],[`${XML2_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([skins2],[`${XML2_CONFIG} --libs`]) - dnl skins2 depends on the xmlTextReader extension - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_skins2}" - AC_CHECK_LIB(xml2,xmlTextReaderConstName,[],[ - skins2_missing_lib="yes" - AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version; maybe you are missing libpng.]) - if test "${enable_skins2}" = "yes"; then - AC_MSG_ERROR([libxml2 missing the xmlTextReader extension (required for skins2)]) - fi]) - LDFLAGS="${LDFLAGS_save}" - else - skins2_missing_lib="yes" - if test "${enable_skins2}" = "yes"; then - AC_MSG_ERROR([Could not find libxml2 (required for skins2)]) - fi - fi - if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"); then VLC_ADD_PLUGINS([skins2]) ALIASES="${ALIASES} svlc" @@ -3281,13 +3484,24 @@ then fi ]) # look for wx-config AC_PATH_PROG(WX_CONFIG, wx-config, no, ${WXWINDOWS_PATH}) - if test "${WX_CONFIG}" != "no" + 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.]) fi AC_LANG_PUSH(C++) + # Turn this error: + # playlist.cpp:1351: error: ISO C++ forbids cast to non-reference type + # into a warning. However better would be to fix playlist.cpp + AC_CACHE_CHECK([if \$CXX accepts -fpermissive], + [ac_cv_cxx_fpermissive], + [CXXFLAGS="${CXXFLAGS_save} -fpermissive" + 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) + fi VLC_ADD_CXXFLAGS([wxwindows],[`${WX_CONFIG} --cxxflags`]) VLC_ADD_LDFLAGS([wxwindows],[`${WX_CONFIG} --libs`]) # now look for the wxprec.h header @@ -3307,6 +3521,17 @@ then fi fi +dnl +dnl Simple test for skins2 dependency +dnl +if test "${enable_skins2}" != "no" +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.]) + fi +fi + dnl dnl dnl dnl Qt module dnl dnl @@ -3531,12 +3756,14 @@ then fi else AC_CHECK_HEADERS(goom/goom.h, [ + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_goom}" AC_CHECK_LIB(goom2, goom_init, [ VLC_ADD_PLUGINS([goom]) VLC_ADD_LDFLAGS([goom],[-lgoom2]) ],[ AC_MSG_ERROR([Could not find goom on your system: you may get it from http://www.ios-software.com/.]) ]) + LDFLAGS="${LDFLAGS_save}" ]) fi fi @@ -3578,6 +3805,20 @@ then fi fi +dnl +dnl DAAP access plugin and services discovery +dnl +AC_ARG_ENABLE(daap, + [ --enable-daap DAAP shares services discovery support (default enabled)]) +if test "$enable_daap" != "no" +then + PKG_CHECK_MODULES(DAAP, opendaap >= 0.3.0, + [ VLC_ADD_PLUGINS([daap]) + VLC_ADD_LDFLAGS([daap],[$DAAP_LIBS]) + VLC_ADD_CFLAGS([daap],[$DAAP_CFLAGS])]:, + [AC_MSG_WARN(DAAP library not found)]) +fi + dnl dnl Lirc plugin dnl @@ -3597,12 +3838,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 @@ -3631,6 +3869,45 @@ AM_CONDITIONAL(ENABLE_CORBA, test "$enablecorba" = "true") 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 @@ -3638,7 +3915,7 @@ dnl We give the user the opportunity to specify dnl --with-words=big or --with-words=little ; otherwise, try to guess dnl AC_ARG_WITH(words, - [ --with-words=endianness set endianness (big or little)]) + [ --with-words=endianness set endianness (big or little)]) case "${with_words}" in big) ac_cv_c_bigendian=yes @@ -3690,6 +3967,33 @@ then AC_DEFINE(WORDS_BIGENDIAN, 1, big endian system) fi +dnl +dnl Microsoft ActiveX support +dnl +activex=false +AC_ARG_ENABLE(activex, + [ --enable-activex build a vlc-based ActiveX control (default enabled on Win32)]) +if test "${enable_activex}" != "no" +then + if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" + then + AC_CHECK_PROG(MIDL, midl, :) + AC_CHECK_HEADERS(ole2.h olectl.h, + [ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions]) + VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid]) + AC_CHECK_HEADERS(objsafe.h, + VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]) + ) + activex=: + ], + [ AC_MSG_ERROR([required OLE headers are missing from your system]) ] + ) + fi +fi +AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)]) +AM_CONDITIONAL(HAS_MIDL_COMPILER, test -n "${MIDL}") +AM_CONDITIONAL(BUILD_ACTIVEX,${activex}) + dnl dnl Mozilla plugin dnl @@ -3867,7 +4171,7 @@ 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-2004 VideoLAN", [Copyright string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2005 VideoLAN", [Copyright string]) AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line]) VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`" @@ -3920,7 +4224,7 @@ VLC_OUTPUT_VLC_CONFIG_IN AC_CONFIG_FILES([ Makefile - autotools/Makefile + activex/Makefile debian/Makefile doc/Makefile intl/Makefile @@ -3957,8 +4261,6 @@ AC_CONFIG_FILES([ modules/codec/cmml/Makefile modules/codec/dmo/Makefile modules/codec/ffmpeg/Makefile - modules/codec/ffmpeg/postprocessing/Makefile - modules/codec/ogt/Makefile modules/codec/spudec/Makefile modules/control/Makefile modules/control/corba/Makefile @@ -3978,22 +4280,25 @@ 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/gui/wince/Makefile modules/misc/Makefile modules/misc/dummy/Makefile modules/misc/memcpy/Makefile modules/misc/network/Makefile modules/misc/testsuite/Makefile modules/misc/playlist/Makefile + modules/misc/xml/Makefile 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 modules/video_filter/Makefile + modules/video_filter/swscale/Makefile modules/video_output/Makefile modules/video_output/directx/Makefile modules/video_output/qte/Makefile @@ -4003,11 +4308,14 @@ AC_CONFIG_FILES([ modules/visualization/galaktos/Makefile ]) -AC_CONFIG_FILES([vlc-config], [chmod 0755 vlc-config]) - dnl Generate makefiles AC_OUTPUT +# Cannot use AC_CONFIG_FILES([vlc-config]) as is automatically built, +# not provided with the source +${SHELL} ./config.status --file=vlc-config +chmod 0755 vlc-config + printf " vlc configuration --------------------