X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=5fd1b1afb104272e9ea6eb71db5aa21378a2176a;hb=928fb8a5b9157851667570ff4ca203520a140484;hp=fd1fecc13290b13860a5baab5b66ed92ab76087a;hpb=07743d45ea60d9674cf30205303230ecd1f58220;p=vlc diff --git a/configure.ac b/configure.ac index fd1fecc132..5fd1b1afb1 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) CONFIGURE_LINE="$0 $*" -CODENAME="Bond" +CODENAME="Janus" AC_PREREQ(2.50) AC_CONFIG_SRCDIR(src/libvlc.c) @@ -13,13 +13,13 @@ 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) AM_CONFIG_HEADER(config.h) dnl dnl Save *FLAGS dnl -AX_SAVE_FLAGS +VLC_SAVE_FLAGS dnl dnl Check for tools @@ -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,13 +84,19 @@ 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 dnl Set default values dnl LDFLAGS_vlc="${LDFLAGS}" -LIBEXT=".so" dnl dnl Check the operating system @@ -108,7 +111,7 @@ case "${target_os}" in bsdi*) SYS=bsdi CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}" - AX_ADD_LDFLAGS([dvd dvdcss vcd cdda vcdx cddax],[-ldvd]) + VLC_ADD_LDFLAGS([dvd dvdcss vcd cdda vcdx cddax],[-ldvd]) ;; *bsd*) SYS="${target_os}" @@ -119,14 +122,14 @@ 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}" - AX_ADD_LDFLAGS([vlc ffmpeg],[-all_load]) - AX_ADD_LDFLAGS([mp4], [-framework IOKit -framework CoreFoundation]) - AX_ADD_LDFLAGS([vlc],[-Wl,-multiply_defined,suppress]) - LIBEXT=".dylib" + 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]) + VLC_ADD_LDFLAGS([vlc],[-Wl,-multiply_defined,suppress]) ;; *mingw32* | *cygwin*) AC_CHECK_TOOL(WINDRES, windres, :) - LIBEXT=".dll" case "${target_os}" in *mingw32*) @@ -146,14 +149,14 @@ case "${target_os}" in if test "${SYS}" = "mingw32"; then # add ws2_32 for closesocket, select, recv CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}" - AX_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows]) - AX_ADD_LDFLAGS([vcdx cddax],[-lwinmm]) - AX_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([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]) fi ;; *nto*) SYS=nto - AX_ADD_LDFLAGS([x11 xvideo],[-lsocket]) + VLC_ADD_LDFLAGS([x11 xvideo],[-lsocket]) ;; solaris*) SYS=solaris @@ -163,19 +166,19 @@ case "${target_os}" in ;; hpux*) SYS=hpux - LIBEXT=".sl" ;; beos) SYS=beos CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}" - AX_ADD_CXXFLAGS([beos],[]) - AX_ADD_LDFLAGS([vlc beos],[-lbe]) - AX_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame]) + 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 - AX_ADD_LDFLAGS([beos],[-lzeta]) + VLC_ADD_LDFLAGS([beos],[-lzeta]) fi ;; *) @@ -198,7 +201,7 @@ if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then else AC_CHECK_FUNCS(textdomain,,[ AC_CHECK_LIB(intl,textdomain, - AX_ADD_LDFLAGS([vlc],[${LIBINTL}]),, + VLC_ADD_LDFLAGS([vlc],[${LIBINTL}]),, ${LIBINTL} ) ]) @@ -214,15 +217,18 @@ then Define if you want utf8 support) fi -AC_MSG_CHECKING(for suffix of libraries) -AC_MSG_RESULT(${LIBEXT}) +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 AC_CHECK_LIB(mingwex,opendir, - AC_CHECK_LIB(mingw32,opendir,AX_ADD_LDFLAGS([vlc],[]), - [AX_ADD_LDFLAGS([vlc gtk],[-lmingwex])]) + AC_CHECK_LIB(mingw32,opendir,VLC_ADD_LDFLAGS([vlc],[]), + [VLC_ADD_LDFLAGS([vlc gtk],[-lmingwex])]) ) fi @@ -267,18 +273,21 @@ AC_LANG_PUSH(C++) AC_LANG_POP(C++) fi -dnl Flags for plugin compilation +dnl Plugin compilation stuff + +VLC_LIBRARY_SUFFIX + case "${SYS}" in mingw32|cygwin) - AX_ADD_CFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}]) - AX_ADD_CXXFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}]) - AX_ADD_OBJCFLAGS([pic plugin mozilla],[${CFLAGS_mingw32_special}]) + 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}]) ;; *) - AX_ADD_CFLAGS([pic plugin mozilla],[-fpic -fPIC]) - AX_ADD_CXXFLAGS([pic plugin mozilla],[-fpic -fPIC]) - AX_ADD_OBJCFLAGS([pic plugin mozilla],[-fpic -fPIC]) - AX_ADD_LDFLAGS([plugin mozilla],[-fpic -fPIC]) + VLC_ADD_CFLAGS([pic plugin mozilla],[-fpic -fPIC]) + VLC_ADD_CXXFLAGS([pic plugin mozilla],[-fpic -fPIC]) + VLC_ADD_OBJCFLAGS([pic plugin mozilla],[-fpic -fPIC]) + VLC_ADD_LDFLAGS([plugin mozilla],[-fpic -fPIC]) ;; esac @@ -288,7 +297,7 @@ 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 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 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) @@ -314,22 +323,22 @@ fi AC_CHECK_FUNCS(connect,,[ AC_CHECK_LIB(socket,connect,[ - AX_ADD_LDFLAGS([vlc ipv4 cddax],-lsocket) + VLC_ADD_LDFLAGS([vlc ipv4 cddax],-lsocket) ]) ]) AC_CHECK_FUNCS(send,,[ AC_CHECK_LIB(socket,send,[ - AX_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard],[-lsocket]) + VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard],[-lsocket]) ]) ]) AC_CHECK_FUNCS(gethostbyname,,[ AC_CHECK_LIB(nsl,gethostbyname,[ - AX_ADD_LDFLAGS([cddax ipv4 vlc],[-lnsl]) + VLC_ADD_LDFLAGS([cddax ipv4 vlc],[-lnsl]) ],[ AC_CHECK_LIB(bind,gethostbyname,[ - AX_ADD_LDFLAGS([ipv4 access_mms],[-lbind]) + VLC_ADD_LDFLAGS([ipv4 access_mms],[-lbind]) ]) ]) ]) @@ -346,6 +355,52 @@ if test "${ac_cv_type_socklen_t}" != "no"; then AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define if defines socklen_t.]) fi +dnl Check for struct sockaddr_storage +AH_TEMPLATE(sockaddr_storage, [Define to `sockaddr' if does not define.]) +AH_TEMPLATE(ss_family, [Define to `sa_family' if does not define.]) +AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage, + [AC_TRY_COMPILE( + [#include + #if defined( UNDER_CE ) + # include + #elif defined( WIN32 ) + # include + #else + # include + #endif], [struct sockaddr_storage addr;], + ac_cv_struct_sockaddr_storage=yes, + ac_cv_struct_sockaddr_storage=no)]) +if test $ac_cv_struct_sockaddr_storage = no; then + AC_DEFINE(sockaddr_storage, sockaddr) + AC_DEFINE(ss_family, sa_family) +fi + +dnl getnameinfo, which implies {get,free}addrinfo, but not gai_strerror, +dnl -lws2_32 required with Mingw32, -lresolv NOT needed on Solaris. +dnl AC_SEARCH_LIBS won't work with Mingw32 +AH_TEMPLATE(HAVE_GETNAMEINFO, + [Define to 1 if you have the `getnameinfo' function.]) +ac_func_getnameinfo_save_LIBS=$LIBS +AS_IF([test "${SYS}" = "mingw32"], + [LIBS="-lws2_32 $LIBS"]) + AC_CACHE_CHECK([for getnameinfo], ac_cv_func_getnameinfo, +[AC_LINK_IFELSE([AC_LANG_PROGRAM([ +[#include +#if defined( UNDER_CE ) +# include +#elif defined( WIN32 ) +# include +#else +# include +# include +#endif] +], [[getnameinfo(0,0,0,0,0,0,0);]])], +ac_cv_func_getnameinfo=yes, +ac_cv_func_getnameinfo=no)]) +AS_IF([test $ac_cv_func_getnameinfo = yes], + [AC_DEFINE(HAVE_GETNAMEINFO)]) +LIBS=$ac_func_getnameinfo_save_LIBS + dnl Check for va_copy AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy, AC_TRY_LINK( @@ -368,7 +423,7 @@ fi AC_CHECK_FUNCS(inet_aton,,[ AC_CHECK_LIB(resolv,inet_aton,[ - AX_ADD_LDFLAGS([ipv4 vlc],[-lresolv]) + VLC_ADD_LDFLAGS([ipv4 vlc],[-lresolv]) ]) ]) @@ -381,7 +436,7 @@ AC_CHECK_FUNCS(getopt_long,[AC_DEFINE(HAVE_GETOPT_LONG,1,long getopt support)], [ # FreeBSD has a gnugetopt library for this: AC_CHECK_LIB([gnugetopt],[getopt_long], [AC_DEFINE(HAVE_GETOPT_LONG,1,getopt support) - AX_ADD_LDFLAGS([vlc],[-lgnugetopt])], + VLC_ADD_LDFLAGS([vlc],[-lgnugetopt])], [need_getopt=:])]) fi AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt}) @@ -389,13 +444,13 @@ AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt}) if test "${SYS}" != "mingw32"; then AC_TYPE_SIGNAL AC_CHECK_LIB(m,cos,[ - AX_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32],[-lm]) + VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32 x264],[-lm]) ]) AC_CHECK_LIB(m,pow,[ - AX_ADD_LDFLAGS([ffmpeg stream_out_transcode stream_out_transrate i420_rgb faad vlc],[-lm]) + VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad toolame equalizer vlc],[-lm]) ]) AC_CHECK_LIB(m,sqrt,[ - AX_ADD_LDFLAGS([headphone_channel_mixer],[-lm]) + VLC_ADD_LDFLAGS([headphone_channel_mixer normvol],[-lm]) ]) fi # end "${SYS}" != "mingw32" @@ -416,7 +471,7 @@ if test "${ac_cv_have_plugins}" = "no"; then [ac_cv_my_have_shl_load=yes, AC_CHECK_LIB(dld, shl_load, [ac_cv_my_have_shl_load=yes - AX_ADD_LDFLAGS([vlc],[-ldld])])]) + VLC_ADD_LDFLAGS([vlc],[-ldld])])]) if test "${ac_cv_my_have_shl_load}" = "yes"; then AC_DEFINE(HAVE_DL_SHL_LOAD, 1, [Define if you have the shl_load API]) ac_cv_have_plugins=yes @@ -426,7 +481,7 @@ fi # Whatever style if test "${ac_cv_have_plugins}" = "no"; then AC_CHECK_LIB(dld, dld_link, - [AX_ADD_LDFLAGS([vlc],[-ldld]) + [VLC_ADD_LDFLAGS([vlc],[-ldld]) AC_DEFINE(HAVE_DL_DLD_LINK, 1, [Define if you have the GNU dld library]) ac_cv_have_plugins=yes]) fi @@ -435,7 +490,7 @@ fi if test "${ac_cv_have_plugins}" = "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then AC_CHECK_LIB(kernel32, main, - [AX_ADD_LDFLAGS([vlc],[-lkernel32]) + [VLC_ADD_LDFLAGS([vlc],[-lkernel32]) AC_DEFINE(HAVE_DL_WINDOWS, 1, [Define if you have Windows' LoadLibrary]) ac_cv_have_plugins=yes]) fi @@ -457,10 +512,10 @@ if test "${ac_cv_have_plugins}" = "no"; then ac_cv_my_have_dlopen=yes, AC_CHECK_LIB(dl, dlopen, ac_cv_my_have_dlopen=yes - AX_ADD_LDFLAGS([vlc],[-ldl]), + VLC_ADD_LDFLAGS([vlc],[-ldl]), AC_CHECK_LIB(svld, dlopen, ac_cv_my_have_dlopen=yes - AX_ADD_LDFLAGS([vlc],[-lsvld])))) + VLC_ADD_LDFLAGS([vlc],[-lsvld])))) if test "${ac_cv_my_have_dlopen}" = "yes"; then AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API]) ac_cv_have_plugins=yes @@ -525,19 +580,19 @@ AC_ARG_ENABLE(st, fi ]) -AX_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}]) +VLC_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}]) dnl Don't link with rt when using GNU-pth if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then dnl HP/UX port - AC_CHECK_LIB(rt,sem_init, [AX_ADD_LDFLAGS([vlc],[-lrt])]) + AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])]) have_nanosleep=false AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ AC_CHECK_LIB(rt,nanosleep, - [AX_ADD_LDFLAGS([vlc],[-lrt]) have_nanosleep=:], + [VLC_ADD_LDFLAGS([vlc],[-lrt]) have_nanosleep=:], [AC_CHECK_LIB(posix4,nanosleep, - [AX_ADD_LDFLAGS([vlc],[-lposix4]) have_nanosleep=:])] + [VLC_ADD_LDFLAGS([vlc],[-lposix4]) have_nanosleep=:])] ) ]) if ${have_nanosleep}; then @@ -620,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 @@ -640,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 @@ -778,7 +829,7 @@ AC_CACHE_CHECK([if \$CC accepts -fomit-frame-pointer], if test "${ac_cv_c_omit_frame_pointer}" != "no"; then CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer" # this plugin does not compile without -fomit-frame-pointer, damn gcc! - AX_ADD_CFLAGS([i420_yuy2_mmx],[-fomit-frame-pointer]) + VLC_ADD_CFLAGS([i420_yuy2_mmx],[-fomit-frame-pointer]) fi dnl Check for -mdynamic-no-pic @@ -787,8 +838,8 @@ AC_CACHE_CHECK([if \$CC accepts -mdynamic-no-pic], [CFLAGS="${CFLAGS_save} -mdynamic-no-pic" AC_TRY_COMPILE([],,ac_cv_c_dynamic_no_pic=yes, ac_cv_c_dynamic_no_pic=no)]) if test "${ac_cv_c_dynamic_no_pic}" != "no"; then - AX_ADD_CFLAGS([builtin],[-mdynamic-no-pic]) - AX_ADD_CFLAGS([libvlc],[-mdynamic-no-pic]) + VLC_ADD_CFLAGS([builtin],[-mdynamic-no-pic]) + VLC_ADD_CFLAGS([libvlc],[-mdynamic-no-pic]) fi dnl Check for Darwin plugin linking flags @@ -797,20 +848,20 @@ AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error -lcc_dynamic], [CFLAGS="${CFLAGS_save} -bundle -undefined error -lcc_dynamic" AC_TRY_COMPILE([],,ac_cv_ld_darwin=yes, ac_cv_ld_darwin=no)]) if test "${ac_cv_ld_darwin}" != "no"; then - AX_ADD_LDFLAGS([plugin],[-bundle -undefined error -lcc_dynamic]) + VLC_ADD_LDFLAGS([plugin],[-bundle -undefined error -lcc_dynamic]) fi dnl Check for standard plugin linking flags dnl BeOS' gcc needs -nostart instead of -shared, even if -shared isn't harmful (just a warning) if test "${SYS}" = "beos"; then - AX_ADD_LDFLAGS([plugin mozilla],[-nostart]) + VLC_ADD_LDFLAGS([plugin mozilla],[-nostart]) else AC_CACHE_CHECK([if \$CC accepts -shared], [ac_cv_ld_plugins], [CFLAGS="${CFLAGS_save} -shared" AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)]) if test "${ac_cv_ld_plugins}" != "no"; then - AX_ADD_LDFLAGS([plugin mozilla],[-shared]) + VLC_ADD_LDFLAGS([plugin mozilla],[-shared]) fi fi @@ -892,21 +943,21 @@ test "${enable_cprof}" != "yes" && enable_cprof="no" dnl dnl default modules dnl -AX_ADD_PLUGINS([dummy rc telnet logger gestures memcpy hotkeys netsync]) -AX_ADD_PLUGINS([mpgv mpga m4v h264 ps pva avi asf aac mp4 rawdv nsv real aiff mjpeg]) -AX_ADD_PLUGINS([cvdsub svcdsub spudec dvbsub mpeg_audio lpcm a52 dts cinepak]) -AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur]) -AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32]) -AX_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler]) -AX_ADD_PLUGINS([trivial_channel_mixer headphone_channel_mixer]) -AX_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer]) -AX_ADD_PLUGINS([aout_file]) -AX_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga]) -AX_ADD_PLUGINS([m3u playlist export sgimb]) -AX_ADD_PLUGINS([rawvideo]) -AX_ADD_PLUGINS([wav araw demuxsub adpcm a52sys dtssys au]) -AX_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms]) -AX_ADD_PLUGINS([access_ftp access_directory sap http]) +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]) +VLC_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32 audio_format]) +VLC_ADD_PLUGINS([trivial_resampler ugly_resampler linear_resampler bandlimited_resampler]) +VLC_ADD_PLUGINS([trivial_channel_mixer simple_channel_mixer headphone_channel_mixer 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 blend scale time marq]) +VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au]) +VLC_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms]) +VLC_ADD_PLUGINS([access_ftp access_directory sap http]) dnl dnl Switch to enable a version of VLC where most modules will be builtin @@ -914,7 +965,7 @@ dnl AC_ARG_ENABLE(mostly-builtin, [ --enable-mostly-builtin most modules will be built-in (default disabled)]) if test "${enable_mostly_builtin}" = "yes"; then - AX_ADD_BUILTINS([${PLUGINS}]) + VLC_ADD_BUILTINS([${PLUGINS}]) PLUGINS="" fi @@ -922,9 +973,11 @@ dnl dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" != "mingw32"; then - AX_ADD_PLUGINS([screensaver]) + VLC_ADD_PLUGINS([screensaver]) else - AX_ADD_PLUGINS([ntservice]) + VLC_ADD_PLUGINS([ntservice]) + VLC_ADD_PLUGINS([dmo]) + VLC_ADD_LDFLAGS([dmo],[-lole32]) fi dnl @@ -998,11 +1051,11 @@ AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly], if test "${ac_cv_altivec_inline}" != "no"; then AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, Define if \$CC groks AltiVec inline assembly.) if test "${ac_cv_altivec_inline}" != "yes"; then - AX_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}]) - AX_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}]) - AX_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}]) - AX_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}]) - AX_ADD_CFLAGS([vlc],[${ac_cv_altivec_inline}]) + VLC_ADD_CFLAGS([idctaltivec],[${ac_cv_altivec_inline}]) + VLC_ADD_CFLAGS([motionaltivec],[${ac_cv_altivec_inline}]) + VLC_ADD_CFLAGS([memcpyaltivec],[${ac_cv_altivec_inline}]) + VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}]) + VLC_ADD_CFLAGS([vlc],[${ac_cv_altivec_inline}]) fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -1014,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 @@ -1034,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.) - AX_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 @@ -1045,7 +1101,7 @@ AC_CACHE_CHECK([if linker needs -framework vecLib], LDFLAGS="${LDFLAGS_save}" ]) if test "${ac_cv_ld_altivec}" != "no"; then - AX_ADD_LDFLAGS([vlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib]) + VLC_ADD_LDFLAGS([vlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib]) fi fi # end "${SYS}" != "mingw32" @@ -1078,7 +1134,7 @@ dnl if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "x86" -o "${target_cpu}" = "i386" then ARCH="${ARCH} mmx" - AX_ADD_BUILTINS([${ACCEL_MODULES}]) + VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi dnl @@ -1094,9 +1150,9 @@ dnl AC_ARG_ENABLE(altivec, [ --disable-altivec disable AltiVec optimizations (default enabled on PPC)], [ if test "${enable_altivec}" = "yes"; then ARCH="${ARCH} altivec"; - AX_ADD_BUILTINS([${ACCEL_MODULES}]) fi ], + VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi ], [ if test "${target_cpu}" = "powerpc"; then ARCH="${ARCH} altivec"; - AX_ADD_BUILTINS([${ACCEL_MODULES}]) fi ]) + VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi ]) dnl dnl Debugging mode @@ -1119,19 +1175,38 @@ AC_ARG_ENABLE(sout, [ --enable-sout Stream output modules (default enabled)]) if test "${enable_sout}" != "no" then - AX_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http]) - AX_ADD_PLUGINS([mux_ps mux_avi mux_mp4 mux_asf mux_dummy]) - AX_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) - AX_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) - AX_ADD_PLUGINS([packetizer_copy]) + VLC_ADD_PLUGINS([access_output_dummy access_output_udp access_output_file access_output_http]) + VLC_ADD_PLUGINS([mux_ps mux_avi mux_mp4 mux_asf mux_dummy mux_wav mux_mpjpeg]) + VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) + VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) + VLC_ADD_PLUGINS([packetizer_copy]) - AX_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp]) - AX_ADD_PLUGINS([stream_out_duplicate stream_out_display stream_out_gather]) -# AX_ADD_PLUGINS([stream_out_transrate]) + 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 Input plugins @@ -1157,21 +1232,21 @@ if test "${enable_livedotcom}" = "yes"; then CPPFLAGS_livedotcom="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment" CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_livedotcom}" AC_CHECK_HEADERS(liveMedia.hh, [ - AX_ADD_CXXFLAGS([livedotcom], [${CPPFLAGS_livedotcom}]) + VLC_ADD_CXXFLAGS([livedotcom], [${CPPFLAGS_livedotcom}]) AC_CHECK_LIB(liveMedia_pic, main, [ # We have -lliveMedia_pic, build plugins - AX_ADD_PLUGINS([livedotcom]) - AX_ADD_LDFLAGS([livedotcom], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic]) + VLC_ADD_PLUGINS([livedotcom]) + VLC_ADD_LDFLAGS([livedotcom], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic]) ], [ AC_CHECK_LIB(liveMedia, main, [ # We only have -lliveMedia, do builtins - AX_ADD_BUILTINS([livedotcom]) - AX_ADD_LDFLAGS([livedotcom], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment]) + VLC_ADD_BUILTINS([livedotcom]) + VLC_ADD_LDFLAGS([livedotcom], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment]) ]) ]) if test "${SYS}" = "mingw32"; then # add ws2_32 for closesocket, select, recv - AX_ADD_LDFLAGS([livedotcom],[-lws2_32]) + VLC_ADD_LDFLAGS([livedotcom],[-lws2_32]) fi ]) CPPFLAGS="${CPPFLAGS_save}" @@ -1187,22 +1262,22 @@ if test "${enable_livedotcom}" = "yes"; then if test -f "${real_livedotcom_tree}/liveMedia/libliveMedia.a"; then AC_MSG_RESULT(${real_livedotcom_tree}/liveMedia/libliveMedia.a) - AX_ADD_BUILTINS([livedotcom]) + VLC_ADD_BUILTINS([livedotcom]) if test "${SYS}" = "mingw32"; then # add ws2_32 for closesocket, select, recv - AX_ADD_LDFLAGS([livedotcom],[-lws2_32]) + VLC_ADD_LDFLAGS([livedotcom],[-lws2_32]) fi - AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/liveMedia -lliveMedia]) - AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/BasicUsageEnvironment -lBasicUsageEnvironment]) - AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/groupsock -lgroupsock]) - AX_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/UsageEnvironment -lUsageEnvironment]) + VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/liveMedia -lliveMedia]) + VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/BasicUsageEnvironment -lBasicUsageEnvironment]) + VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/groupsock -lgroupsock]) + VLC_ADD_LDFLAGS([livedotcom],[-L${real_livedotcom_tree}/UsageEnvironment -lUsageEnvironment]) - AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/BasicUsageEnvironment/include]) - AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/groupsock/include]) - AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/liveMedia/include]) - AX_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/UsageEnvironment/include ]) + VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/BasicUsageEnvironment/include]) + VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/groupsock/include]) + VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/liveMedia/include]) + VLC_ADD_CXXFLAGS([livedotcom],[-I${real_livedotcom_tree}/UsageEnvironment/include ]) else dnl The given live.com wasn't built AC_MSG_RESULT(no) @@ -1212,202 +1287,74 @@ if test "${enable_livedotcom}" = "yes"; then fi +dnl +dnl dvdread module: check for libdvdread +dnl +AC_ARG_ENABLE(dvdread, +[ --enable-dvdread dvdread input module (default disabled)]) +if test "${enable_dvdread}" != "no" +then + AC_ARG_WITH(dvdread, + [ --with-dvdread=PATH libdvdread headers and libraries]) + AC_ARG_WITH(dvdread-tree, + [ --with-dvdread-tree=PATH libdvdread tree for static linking]) + + dnl Temporary hack (yeah, sure ;) + if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then + VLC_ADD_LDFLAGS([dvdread],[-ldvdcss]) + fi -dnl dnl -dnl dnl DVD module: optionally check for installed libdvdcss -dnl dnl -dnl AC_ARG_ENABLE(dvd, -dnl [ --enable-dvd DVD input module (default enabled)]) -dnl if test "${enable_dvd}" != "no" -dnl then -dnl AC_ARG_WITH(dvdcss, -dnl [ --with-dvdcss=PATH libdvdcss headers and libraries]) -dnl AC_ARG_WITH(dvdcss-tree, -dnl [ --with-dvdcss-tree=PATH libdvdcss tree for static linking]) -dnl case "${with_dvdcss}" in -dnl ""|yes) -dnl if test -z "${with_dvdcss_tree}" -dnl then -dnl AC_CHECK_HEADERS(dvdcss/dvdcss.h, -dnl [ AX_ADD_PLUGINS([dvd]) -dnl AX_ADD_LDFLAGS([dvd dvdcss],[-ldvdcss])], -dnl [ AC_MSG_WARN([libdvdcss is no longer provided with vlc; please get libdvdcss from http://www.videolan.org/libdvdcss/ and build it. Then either use --with-dvdcss= for dynamic linking (recommended under Unix) or --with-dvdcss-tree= for static linking (recommended under BeOS, Windows, MacOS X). Alternatively you can use --disable-dvd to disable the DVD plugin.]) -dnl AC_MSG_ERROR([cannot find libdvdcss headers]) ]) -dnl else -dnl AC_MSG_CHECKING(for libdvdcss.a in ${with_dvdcss_tree}) -dnl real_dvdcss_tree="`cd ${with_dvdcss_tree} 2>/dev/null && pwd`" -dnl if test -z "${real_dvdcss_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_dvdcss_tree}]) -dnl fi -dnl if test -f "${real_dvdcss_tree}/src/.libs/libdvdcss.a" -dnl then -dnl dnl Use a custom libdvdcss -dnl AC_MSG_RESULT(${real_dvdcss_tree}/src/.libs/libdvdcss.a) -dnl AX_ADD_BUILTINS([dvd]) -dnl AX_ADD_LDFLAGS([dvd dvdcss],[-L${real_dvdcss_tree}/src/.libs -ldvdcss]) -dnl AX_ADD_CPPFLAGS([dvd],[-I${real_dvdcss_tree}/src]) -dnl else -dnl dnl The given libdvdcss wasn't built -dnl AC_MSG_RESULT(no) -dnl AC_MSG_ERROR([cannot find ${real_dvdcss_tree}/src/.libs/libdvdcss.a, make sure you compiled libdvdcss in ${with_dvdcss_tree}]) -dnl fi -dnl fi -dnl ;; -dnl no) -dnl dnl Compile without dvdcss (dlopen version, works only under Linux) -dnl AX_ADD_PLUGINS([dvd]) -dnl AX_ADD_CPPFLAGS([dvd],[-DGOD_DAMN_DMCA]) -dnl AX_ADD_LDFLAGS([dvd],[-ldl]) -dnl ;; -dnl *) -dnl AC_MSG_CHECKING(for dvdcss headers in ${with_dvdcss}) -dnl if test -f ${with_dvdcss}/include/dvdcss/dvdcss.h -dnl then -dnl dnl Use ${with_dvdcss}/include/dvdcss/dvdcss.h -dnl AC_MSG_RESULT(yes) -dnl AX_ADD_PLUGINS([dvd]) -dnl AX_ADD_LDFLAGS([dvd dvdcss],[-L${with_dvdcss}/lib -ldvdcss]) -dnl AX_ADD_CPPFLAGS([dvd],[-I${with_dvdcss}/include]) -dnl else -dnl dnl No libdvdcss could be found, sorry -dnl AC_MSG_RESULT(no) -dnl AC_MSG_ERROR([cannot find ${with_dvdcss}/include/dvdcss/dvdcss.h]) -dnl fi -dnl ;; -dnl esac -dnl fi -dnl -dnl dnl -dnl dnl dvdread module: check for libdvdread -dnl dnl -dnl AC_ARG_ENABLE(dvdread, -dnl [ --enable-dvdread dvdread input module (default disabled)]) -dnl if test "${enable_dvdread}" != "no" -dnl then -dnl AC_ARG_WITH(dvdread, -dnl [ --with-dvdread=PATH libdvdread headers and libraries]) -dnl AC_ARG_WITH(dvdread-tree, -dnl [ --with-dvdread-tree=PATH libdvdread tree for static linking]) -dnl if test -z "${with_dvdread}" -dnl then -dnl if test -z "${with_dvdread_tree}" -dnl then -dnl AC_CHECK_HEADERS(dvdread/dvd_reader.h, -dnl [ AX_ADD_PLUGINS([dvdread]) -dnl AX_ADD_LDFLAGS([dvdread],[-ldvdread ${LDFLAGS_dvdcss}]) -dnl ],[ -dnl if test -n "${enable_dvdread}" -dnl then -dnl AC_MSG_WARN([Please get libdvdread from http://www.dtek.chalmers.se/groups/dvd/downloads.shtml]) -dnl AC_MSG_ERROR([cannot find libdvdread headers]) -dnl fi -dnl ]) -dnl else -dnl AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree}) -dnl real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`" -dnl if test -z "${real_dvdread_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_dvdread_tree}]) -dnl fi -dnl if test -f "${real_dvdread_tree}/dvdread/.libs/libdvdread.a" -dnl then -dnl dnl Use a custom libdvdread -dnl AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a) -dnl AX_ADD_BUILTINS([dvdread]) -dnl AX_ADD_LDFLAGS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}]) -dnl AX_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}]) -dnl else -dnl dnl The given libdvdread wasn't built -dnl AC_MSG_RESULT(no) -dnl AC_MSG_ERROR([cannot find ${real_dvdread_tree}/dvdread/.libs/libdvdread.a, make sure you compiled libdvdread in ${with_dvdread_tree}]) -dnl fi -dnl fi -dnl else -dnl AC_MSG_CHECKING(for dvdread headers in ${with_dvdread}) -dnl if test -f ${with_dvdread}/include/dvdread/dvd_reader.h -dnl then -dnl dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h -dnl AC_MSG_RESULT(yes) -dnl AX_ADD_PLUGINS([dvdread]) -dnl AX_ADD_LDFLAGS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LDFLAGS_dvdcss}]) -dnl AX_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include]) -dnl else -dnl dnl No libdvdread could be found, sorry -dnl AC_MSG_RESULT(no) -dnl AC_MSG_ERROR([cannot find ${with_dvdread}/include/dvdread/dvd_reader.h]) -dnl fi -dnl fi -dnl fi -dnl -dnl dnl -dnl dnl dvdplay module: check for libdvdplay -dnl dnl -dnl AC_ARG_ENABLE(dvdplay, -dnl [ --enable-dvdplay dvdplay input module (default enabled)]) -dnl if test "${enable_dvdplay}" != "no" -dnl then -dnl AC_ARG_WITH(dvdplay, -dnl [ --with-dvdplay=PATH libdvdplay headers and libraries]) -dnl AC_ARG_WITH(dvdplay-tree, -dnl [ --with-dvdplay-tree=PATH libdvdplay tree for static linking]) -dnl if test -z "${with_dvdplay}" -dnl then -dnl if test -z "${with_dvdplay_tree}" -dnl then -dnl AC_CHECK_HEADERS(dvdplay/dvdplay.h,[ -dnl AX_ADD_PLUGINS([dvdplay]) -dnl AX_ADD_LDFLAGS([dvdplay],[-ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) -dnl AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread}]) -dnl ],[ -dnl if test -n "${enable_dvdplay}" -dnl then -dnl AC_MSG_WARN([Please get libdvdplay from http://www.videolan.org/.]) -dnl AC_MSG_ERROR([cannot find libdvdplay headers]) -dnl fi -dnl ]) -dnl else -dnl AC_MSG_CHECKING(for libdvdplay.a in ${with_dvdplay_tree}) -dnl real_dvdplay_tree="`cd ${with_dvdplay_tree} 2>/dev/null && pwd`" -dnl if test -z "${real_dvdplay_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_dvdplay_tree}]) -dnl fi -dnl if test -f "${real_dvdplay_tree}/src/.libs/libdvdplay.a" -dnl then -dnl dnl Use a custom libdvdplay -dnl AC_MSG_RESULT(${real_dvdplay_tree}/src/.libs/libdvdplay.a) -dnl AX_ADD_BUILTINS([dvdplay]) -dnl AX_ADD_LDFLAGS([dvdplay],[-L${real_dvdplay_tree}/src/.libs -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) -dnl AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src]) -dnl else -dnl dnl The given libdvdplay wasn't built -dnl AC_MSG_RESULT(no) -dnl AC_MSG_ERROR([cannot find ${real_dvdplay_tree}/src/.libs/libdvdplay.a, make sure you compiled libdvdplay in ${with_dvdplay_tree}]) -dnl fi -dnl fi -dnl else -dnl AC_MSG_CHECKING(for dvdplay headers in ${with_dvdplay}) -dnl if test -f "${with_dvdplay}/include/dvdplay/dvdplay.h" -dnl then -dnl dnl Use ${with_dvdplay}/include/dvdplay/dvdplay.h -dnl AC_MSG_RESULT(yes) -dnl AX_ADD_PLUGINS([dvdplay]) -dnl AX_ADD_LDFLAGS([dvdplay],[-L${with_dvdplay}/lib -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}]) -dnl AX_ADD_CPPFLAGS([dvdplay],[${CPPFLAGS_dvdread} -I${with_dvdplay}/include]) -dnl else -dnl dnl No libdvdplay could be found, sorry -dnl AC_MSG_RESULT(no) -dnl AC_MSG_ERROR([cannot find ${with_dvdplay}/include/dvdplay/dvdplay.h]) -dnl fi -dnl fi -dnl fi + if test -z "${with_dvdread}" + then + if test -z "${with_dvdread_tree}" + then + AC_CHECK_HEADERS(dvdread/dvd_reader.h, + [ VLC_ADD_PLUGINS([dvdread]) + VLC_ADD_LDFLAGS([dvdread],[-ldvdread ${LDFLAGS_dvdcss}]) + ],[ + if test -n "${enable_dvdread}" + then + AC_MSG_ERROR([cannot find libdvdread headers]) + fi + ]) + else + AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree}) + real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`" + if test -z "${real_dvdread_tree}" + then + dnl The given directory can't be found + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_dvdread_tree}]) + fi + if test -f "${real_dvdread_tree}/dvdread/.libs/libdvdread.a" + then + dnl Use a custom libdvdread + AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a) + VLC_ADD_BUILTINS([dvdread]) + VLC_ADD_LDFLAGS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}]) + VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}]) + else + dnl The given libdvdread wasn't built + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${real_dvdread_tree}/dvdread/.libs/libdvdread.a, make sure you compiled libdvdread in ${with_dvdread_tree}]) + fi + fi + else + AC_MSG_CHECKING(for dvdread headers in ${with_dvdread}) + if test -f ${with_dvdread}/include/dvdread/dvd_reader.h + then + dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h + AC_MSG_RESULT(yes) + VLC_ADD_PLUGINS([dvdread]) + VLC_ADD_LDFLAGS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LDFLAGS_dvdcss}]) + VLC_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include]) + else + dnl No libdvdread could be found, sorry + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find ${with_dvdread}/include/dvdread/dvd_reader.h]) + fi + fi +fi dnl dnl libdvdnav plugin @@ -1416,6 +1363,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)], @@ -1426,9 +1378,9 @@ then AC_PATH_PROG(DVDNAV_CONFIG, dvdnav-config, no, ${DVDNAV_PATH}) if test "${DVDNAV_CONFIG}" != "no" then - AX_ADD_PLUGINS([dvdnav]) - AX_ADD_CFLAGS([dvdnav],[`${DVDNAV_CONFIG} --cflags`]) - AX_ADD_LDFLAGS([dvdnav],[`${DVDNAV_CONFIG} --libs`]) + VLC_ADD_PLUGINS([dvdnav]) + VLC_ADD_CFLAGS([dvdnav],[`${DVDNAV_CONFIG} --cflags`]) + VLC_ADD_LDFLAGS([dvdnav],[`${DVDNAV_CONFIG} --libs`]) fi fi @@ -1442,9 +1394,9 @@ then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" then AC_CHECK_HEADERS(dshow.h, - [ AX_ADD_PLUGINS([dshow]) - AX_ADD_CXXFLAGS([dshow],[]) - AX_ADD_LDFLAGS([dshow],[-lole32 -loleaut32]) ]) + [ VLC_ADD_PLUGINS([dshow]) + VLC_ADD_CXXFLAGS([dshow],[]) + VLC_ADD_LDFLAGS([dshow],[-lole32 -loleaut32]) ]) fi fi @@ -1464,8 +1416,8 @@ then if test -z "${with_dvbpsi_tree}" then AC_CHECK_HEADERS(dvbpsi/dr.h, - [ AX_ADD_PLUGINS([mux_ts ts]) - AX_ADD_LDFLAGS([mux_ts ts],[-ldvbpsi]) ], + [ VLC_ADD_PLUGINS([mux_ts ts]) + VLC_ADD_LDFLAGS([mux_ts ts],[-ldvbpsi]) ], [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], [#if defined( HAVE_STDINT_H ) # include @@ -1489,9 +1441,9 @@ then then dnl Use a custom libdvbpsi AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a) - AX_ADD_BUILTINS([mux_ts ts]) - AX_ADD_CPPFLAGS([mux_ts ts],[-I${real_dvbpsi_tree}/src]) - AX_ADD_LDFLAGS([mux_ts ts],[-L${real_dvbpsi_tree}/src/.libs -ldvbpsi]) + 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]) else dnl The given libdvbpsi wasn't built AC_MSG_RESULT(no) @@ -1514,9 +1466,9 @@ then fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" AC_CHECK_HEADERS([dvbpsi/dr.h],[ - AX_ADD_PLUGINS([mux_ts ts]) - AX_ADD_CPPFLAGS([mux_ts ts],[${CPPFLAGS_test}]) - AX_ADD_LDFLAGS([mux_ts ts],[${LDFLAGS_test} -ldvbpsi]) + VLC_ADD_PLUGINS([mux_ts ts]) + VLC_ADD_CPPFLAGS([mux_ts ts],[${CPPFLAGS_test}]) + VLC_ADD_LDFLAGS([mux_ts ts],[${LDFLAGS_test} -ldvbpsi]) ],[ if test -n "${enable_dvbpsi}" @@ -1540,12 +1492,12 @@ then [ --with-v4l=PATH path to a v4l-enabled kernel tree],[],[]) if test "${with_v4l}" != "no" -a -n "${with_v4l}" then - AX_ADD_CPPFLAGS([v4l],[-I${with_v4l}/include]) + VLC_ADD_CPPFLAGS([v4l],[-I${with_v4l}/include]) fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l}" AC_CHECK_HEADERS(linux/videodev.h, [ - AX_ADD_PLUGINS([v4l]) + VLC_ADD_PLUGINS([v4l]) ],[]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -1557,62 +1509,62 @@ AC_ARG_ENABLE(pvr, [ --enable-pvr PVR cards access module (default disabled)]) if test "${enable_pvr}" = "yes" then - AX_ADD_PLUGINS([pvr]) + 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 AX_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS]) -dnl AX_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS]) -dnl AX_ADD_PLUGINS([cddax])], -dnl [AC_MSG_WARN(libcdio library not found) -dnl HAVE_CDDAX=no]) -dnl -dnl if test x$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 AX_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS]) -dnl AX_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS]) -dnl ], -dnl [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) -dnl HAVE_LIBCDDB=no]) -dnl fi -dnl + +AC_ARG_ENABLE(cdda, + [ --enable-cdda CDDA plugin support (default enabled)]) + +AC_ARG_ENABLE(cddax, + [ --enable-cddax CDDAX plugin support (default enabled)]) + +if test "${enable_cddax}" != "no" +then + PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.70, + [enable_cddax="no" + AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio]) + VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS]) + VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS]) + VLC_ADD_PLUGINS([cddax])], + [AC_MSG_WARN(libcdio library not found) + HAVE_CDDAX=no]) + + if test "$enable_libcddb" != "no"; then + PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [ + HAVE_LIBCDDB=yes + AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed]) + VLC_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS]) + VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS]) + ], + [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) + HAVE_LIBCDDB=no]) + fi + dnl if test "${enable_vcdx}" != "no" dnl then dnl PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20, dnl [enable_vcd="no" dnl AC_DEFINE(HAVE_VCDX, [], dnl [Define for the VCD plugin using libcdio/libvcdinfo]) -dnl AX_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS]) -dnl AX_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS]) -dnl AX_ADD_PLUGINS([vcdx])], +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 +fi dnl dnl VCD module @@ -1625,7 +1577,7 @@ then AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h) AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[ AC_MSG_RESULT(yes) - AX_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGINS([vcd cdda]) ],[ AC_MSG_RESULT(no) ]) @@ -1633,7 +1585,7 @@ then AC_MSG_CHECKING(for scsireq in sys/scsiio.h) AC_EGREP_HEADER(scsireq,sys/scsiio.h,[ AC_MSG_RESULT(yes) - AX_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGINS([vcd cdda]) AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support) ],[ AC_MSG_RESULT(no) @@ -1642,7 +1594,7 @@ then AC_MSG_CHECKING(for ioc_toc_header in sys/cdio.h) AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[ AC_MSG_RESULT(yes) - AX_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGINS([vcd cdda]) AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support) ],[ AC_MSG_RESULT(no) @@ -1650,13 +1602,13 @@ then if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32" then - AX_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGINS([vcd cdda]) fi if test "${SYS}" = "darwin" then - AX_ADD_PLUGINS([vcd cdda]) - AX_ADD_LDFLAGS([vcd vcdx cdda],[-framework IOKit -framework CoreFoundation]) + VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_LDFLAGS([vcd vcdx cdda],[-framework IOKit -framework CoreFoundation]) fi fi @@ -1669,7 +1621,7 @@ AC_ARG_ENABLE(satellite, then AC_DEFINE(HAVE_SATELLITE, [], [Define for the VCD plugin using libcdio/libvcdinfo]) - AX_ADD_PLUGINS([satellite]) + VLC_ADD_PLUGINS([satellite]) fi]) dnl @@ -1684,15 +1636,44 @@ then [ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[]) if test "${with_dvb}" != "no" -a -n "${with_dvb}" then - AX_ADD_CFLAGS([dvb],[-I${with_dvb}/include]) + VLC_ADD_CFLAGS([dvb],[-I${with_dvb}/include]) fi CPPFLAGS="${CPPFLAGS_save} -I${with_dvb}/include" AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [ - AX_ADD_PLUGINS([dvb]) + VLC_ADD_PLUGINS([dvb]) ],[]) 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 @@ -1702,20 +1683,20 @@ then AC_CHECK_FUNCS(inet_pton,[have_ipv6=:],[ AC_CHECK_LIB(resolv,inet_pton, [have_ipv6=: - AX_ADD_LDFLAGS([ipv6],[-lresolv])]) + 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 - AX_ADD_PLUGINS([ipv6]) + VLC_ADD_PLUGINS([ipv6]) fi fi if test "${SYS}" = "mingw32" then AC_MSG_CHECKING(for getaddrinfo in ws2tcpip.h) AC_EGREP_HEADER(addrinfo,ws2tcpip.h,[AC_MSG_RESULT(yes) - AX_ADD_PLUGINS([ipv6])],[AC_MSG_RESULT(no)]) + VLC_ADD_PLUGINS([ipv6])],[AC_MSG_RESULT(no)]) fi dnl @@ -1727,8 +1708,8 @@ if test "${enable_ogg}" != "no" then AC_CHECK_HEADERS(ogg/ogg.h, [ AC_CHECK_LIB( ogg, oggpack_read, [ - AX_ADD_PLUGINS([ogg mux_ogg]) - AX_ADD_LDFLAGS([ogg mux_ogg],[-logg])]) + VLC_ADD_PLUGINS([ogg mux_ogg]) + VLC_ADD_LDFLAGS([ogg mux_ogg],[-logg])]) ],[]) fi @@ -1742,16 +1723,16 @@ if test "${enable_mkv}" != "no"; then AC_CHECK_HEADERS(ebml/EbmlVersion.h, [ AC_CHECK_HEADERS(matroska/KaxVersion.h, [ AC_CHECK_HEADERS(matroska/KaxAttachments.h) - AX_ADD_CXXFLAGS([mkv],[]) + VLC_ADD_CXXFLAGS([mkv],[]) AC_CHECK_LIB(ebml_pic, main, [ # We have ebml_pic, that's good, we can build an mkv.so plugin ! - AX_ADD_PLUGINS([mkv]) - AX_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic]) + 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 - AX_ADD_BUILTINS([mkv]) - AX_ADD_LDFLAGS([mkv],[-lmatroska -lebml]) + VLC_ADD_BUILTINS([mkv]) + VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml]) ]) ]) ]) @@ -1767,9 +1748,9 @@ AC_ARG_ENABLE(mod, if test "${enable_mod}" != "no" then AC_CHECK_HEADERS(libmodplug/modplug.h, [ - AX_ADD_PLUGINS([mod]) - AX_ADD_CXXFLAGS([mod],[]) - AX_ADD_LDFLAGS([mod],[-lmodplug])]) + VLC_ADD_PLUGINS([mod]) + VLC_ADD_CXXFLAGS([mod],[]) + VLC_ADD_LDFLAGS([mod],[-lmodplug])]) fi dnl @@ -1789,8 +1770,8 @@ then [ --with-mad=PATH path to libmad],[],[]) if test "${with_mad}" != "no" -a -n "${with_mad}" then - AX_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include]) - AX_ADD_LDFLAGS([mpgatofixed32],[-L${with_mad}/lib]) + VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include]) + VLC_ADD_LDFLAGS([mpgatofixed32],[-L${with_mad}/lib]) fi AC_ARG_WITH(mad-tree, @@ -1809,12 +1790,12 @@ then if test -f ${real_mad_tree}/mad.h then AC_MSG_RESULT(yes) - AX_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}]) - AX_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/.libs]) + VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}]) + VLC_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/.libs]) LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}" AC_CHECK_LIB(mad, mad_bit_init, [ - AX_ADD_BUILTINS([mpgatofixed32]) - AX_ADD_LDFLAGS([mpgatofixed32],[-lmad]) + VLC_ADD_BUILTINS([mpgatofixed32]) + VLC_ADD_LDFLAGS([mpgatofixed32],[-lmad]) ],[ AC_MSG_ERROR([the specified tree hasn't been compiled ]) ],[]) LDFLAGS="${LDFLAGS_save}" @@ -1828,8 +1809,8 @@ then AC_CHECK_HEADERS(mad.h, , [ AC_MSG_ERROR([Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin.]) ]) AC_CHECK_LIB(mad, mad_bit_init, [ - AX_ADD_PLUGINS([mpgatofixed32]) - AX_ADD_LDFLAGS([mpgatofixed32],[-lmad])], + VLC_ADD_PLUGINS([mpgatofixed32]) + VLC_ADD_LDFLAGS([mpgatofixed32],[-lmad])], [ AC_MSG_ERROR([Cannot find libmad library...]) ]) CPPFLAGS="${CPPFLAGS_save}" LDFLAGS="${LDFLAGS_save}" @@ -1839,10 +1820,10 @@ fi dnl dnl libid3tag support (FIXME!!! doesn't work with new input) dnl -dnl AC_CHECK_HEADERS(id3tag.h, [ -dnl AC_CHECK_HEADERS(zlib.h, [ -dnl AX_ADD_LDFLAGS([id3tag],[-lid3tag -lz]) -dnl AX_ADD_PLUGINS([id3tag])]) ]) +AC_CHECK_HEADERS(id3tag.h, [ + AC_CHECK_HEADERS(zlib.h, [ + VLC_ADD_LDFLAGS([id3tag],[-lid3tag -lz]) + VLC_ADD_PLUGINS([id3tag])]) ]) dnl dnl ffmpeg decoder/demuxer plugin @@ -1851,85 +1832,169 @@ 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. - AX_ADD_LDFLAGS([stream_out_transcode],[]) - AX_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. - AX_ADD_LDFLAGS([stream_out_transcode],[]) - AX_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]) ], [], [-lavcodec -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, [ - AX_ADD_BUILTINS([ffmpeg stream_out_transcode]) - AX_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. - AX_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.]) - AX_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) + + 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 ${real_ffmpeg_tree}/libavformat/libavformat.a]) + 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) - AX_ADD_BUILTINS([ffmpeg stream_out_transcode]) - AX_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec -lavcodec]) - AX_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.]) - AX_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat -lavformat -lz]) - AX_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. - AX_ADD_LDFLAGS([stream_out_transcode],[-L${real_ffmpeg_tree}/libavcodec]) - AX_ADD_CPPFLAGS([stream_out_transcode],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat]) fi fi @@ -1956,9 +2021,9 @@ then then dnl Use a custom faad AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a) - AX_ADD_BUILTINS([faad]) - AX_ADD_LDFLAGS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a]) - AX_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include]) + VLC_ADD_BUILTINS([faad]) + VLC_ADD_LDFLAGS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a]) + VLC_ADD_CPPFLAGS([faad],[-I${real_faad_tree}/include]) else dnl The given libfaad wasn't built AC_MSG_RESULT(no) @@ -1970,17 +2035,61 @@ then AC_CHECK_HEADERS(faad.h, , [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ]) AC_CHECK_LIB(faad, faacDecOpen, [ - AX_ADD_PLUGINS([faad]) - AX_ADD_LDFLAGS([faad],[-lfaad]) ], + VLC_ADD_PLUGINS([faad]) + VLC_ADD_LDFLAGS([faad],[-lfaad]) ], AC_CHECK_LIB(faad, NeAACDecOpen, [ - AX_ADD_PLUGINS([faad]) - AX_ADD_LDFLAGS([faad],[-lfaad]) ], + VLC_ADD_PLUGINS([faad]) + VLC_ADD_LDFLAGS([faad],[-lfaad]) ], [ AC_MSG_ERROR([Cannot find libfaad library...]) ])) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" 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 @@ -1993,8 +2102,8 @@ 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 AX_ADD_CPPFLAGS([xvid],[-I${with_xvid}/include]) -dnl AX_ADD_LDFLAGS([xvid],[-L${with_xvid}/lib]) +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, @@ -2013,9 +2122,9 @@ 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 AX_ADD_BUILTINS([xvid]) -dnl AX_ADD_LDFLAGS([xvid],[-L${real_xvid_tree}/build/generic -lxvidcore]) -dnl AX_ADD_CPPFLAGS([xvid],[-I${real_xvid_tree}/src]) +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) @@ -2027,8 +2136,8 @@ 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 AX_ADD_PLUGINS([xvid]) -dnl AX_ADD_LDFLAGS([xvid],[-lxvidcore]) ], +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}" @@ -2044,11 +2153,11 @@ if test "${enable_quicktime}" != "no" && (test "${SYS}" = "darwin" || test "${enable_quicktime}" = "yes") then if test "${SYS}" = "mingw32"; then - AX_ADD_BUILTINS([quicktime]) + VLC_ADD_BUILTINS([quicktime]) else AC_CHECK_HEADERS(QuickTime/QuickTime.h, - [ AX_ADD_BUILTINS([quicktime]) - AX_ADD_LDFLAGS([quicktime],[-framework QuickTime -framework Carbon]) + [ VLC_ADD_BUILTINS([quicktime]) + VLC_ADD_LDFLAGS([quicktime],[-framework QuickTime -framework Carbon]) ], [ AC_MSG_ERROR([cannot find QuickTime headers]) ]) fi fi @@ -2057,18 +2166,18 @@ dnl dnl MP4 module dnl AC_CHECK_HEADERS(zlib.h, [ - AX_ADD_LDFLAGS([mp4 skins skins2 sap],[-lz]) + VLC_ADD_LDFLAGS([mp4 skins2 sap mkv],[-lz]) ] ) AC_CHECK_HEADERS(sysfs/libsysfs.h, [ - AX_ADD_LDFLAGS([mp4],[-lsysfs]) + VLC_ADD_LDFLAGS([mp4 mkv],[-lsysfs]) ] ) dnl -dnl skins module +dnl skins2 module dnl AC_CHECK_HEADERS(libtar.h, [ - AX_ADD_LDFLAGS([skins skins2],[-ltar]) + VLC_ADD_LDFLAGS([skins2],[-ltar]) ] ) @@ -2098,13 +2207,13 @@ then if test -f ${real_a52_tree}/include/a52.h then AC_MSG_RESULT(yes) - AX_ADD_CPPFLAGS([a52tofloat32],[-I${real_a52_tree}]) - AX_ADD_LDFLAGS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs]) + VLC_ADD_CPPFLAGS([a52tofloat32],[-I${real_a52_tree}]) + VLC_ADD_LDFLAGS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs]) LDFLAGS="${LDFLAGS_save} ${LDFLAGS_a52tofloat32}" AC_CHECK_LIB(a52, a52_free, [ - AX_ADD_BUILTINS([a52tofloat32]) - AX_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE]) - AX_ADD_LDFLAGS([a52tofloat32],[-la52]) + VLC_ADD_BUILTINS([a52tofloat32]) + VLC_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE]) + VLC_ADD_LDFLAGS([a52tofloat32],[-la52]) ],[ if test -f ${real_a52_tree}/liba52/.libs/liba52.a then @@ -2131,9 +2240,9 @@ then LDFLAGS="${LDFLAGS_save} ${LDFLAGS_test} ${LDFLAGS_a52tofloat32}" AC_CHECK_HEADERS(a52dec/a52.h, [ AC_CHECK_LIB(a52, a52_free, [ - AX_ADD_PLUGINS([a52tofloat32]) - AX_ADD_LDFLAGS([a52tofloat32],[${LDFLAGS_test} -la52]) - AX_ADD_CPPFLAGS([a52tofloat32],[${CPPFLAGS_test}]) + VLC_ADD_PLUGINS([a52tofloat32]) + VLC_ADD_LDFLAGS([a52tofloat32],[${LDFLAGS_test} -la52]) + VLC_ADD_CPPFLAGS([a52tofloat32],[${CPPFLAGS_test}]) ],[ AC_MSG_ERROR([Could not find liba52 on your system: you may get it from http://liba52.sf.net/. Alternatively you can use --disable-a52 to disable the a52 plugin.]) ]) @@ -2165,19 +2274,24 @@ if test "${enable_dts}" != "no"; then if test -f ${real_dts_tree}/include/dts.h then AC_MSG_RESULT(yes) - AX_ADD_CPPFLAGS([dtstofloat32],[-I${real_dts_tree}/include]) - AX_ADD_LDFLAGS([dtstofloat32],[-L${real_dts_tree}/libdts]) + 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, [ - AX_ADD_BUILTINS([dtstofloat32]) - AX_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 @@ -2187,13 +2301,18 @@ if test "${enable_dts}" != "no"; then else LDFLAGS="${LDFLAGS_save} ${LDFLAGS_dtstofloat32}" AC_CHECK_HEADERS(dts.h, [ - AC_CHECK_LIB(dts, dts_free, [ - AX_ADD_PLUGINS([dtstofloat32]) - AX_ADD_LDFLAGS([dtstofloat32],[-ldts]) + AC_CHECK_LIB(dts_pic, dts_free, [ + VLC_ADD_PLUGINS([dtstofloat32]) + 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}" @@ -2208,8 +2327,8 @@ dnl [ --enable-dv DV decoder support (deprecated in favor of ffmp dnl if test "${enable_dv}" = "yes" dnl then dnl AC_CHECK_HEADERS(libdv/dv.h, [ -dnl AX_ADD_PLUGINS([dv]) -dnl AX_ADD_LDFLAGS([dv],[-ldv]) +dnl VLC_ADD_PLUGINS([dv]) +dnl VLC_ADD_LDFLAGS([dv],[-ldv]) dnl ],[]) dnl fi @@ -2221,8 +2340,8 @@ AC_ARG_ENABLE(flac, if test "${enable_flac}" = "yes" then AC_CHECK_HEADERS(FLAC/stream_decoder.h, [ - AX_ADD_PLUGINS([flac flacdec]) - AX_ADD_LDFLAGS([flacdec],[-lFLAC]) + VLC_ADD_PLUGINS([flac flacdec]) + VLC_ADD_LDFLAGS([flacdec],[-lFLAC]) ],[]) fi @@ -2249,9 +2368,9 @@ then then dnl Use a custom libmpeg2 AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a) - AX_ADD_PLUGINS([libmpeg2]) - AX_ADD_LDFLAGS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2]) - AX_ADD_CFLAGS([libmpeg2],[-I${real_libmpeg2_tree}/include]) + VLC_ADD_PLUGINS([libmpeg2]) + VLC_ADD_LDFLAGS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2]) + VLC_ADD_CFLAGS([libmpeg2],[-I${real_libmpeg2_tree}/include]) eval "`cd ${real_libmpeg2_tree}/include && ln -sf . mpeg2dec 2>/dev/null`" else dnl The given libmpeg2 wasn't built @@ -2269,8 +2388,8 @@ then #endif #endif], [AC_MSG_RESULT([yes]) - AX_ADD_PLUGINS([libmpeg2]) - AX_ADD_LDFLAGS([libmpeg2],[-lmpeg2])], + VLC_ADD_PLUGINS([libmpeg2]) + VLC_ADD_LDFLAGS([libmpeg2],[-lmpeg2])], [AC_MSG_RESULT([no]) AC_MSG_ERROR([Your libmpeg2 is too old (you need the cvs version): you may get a more recent one from http://libmpeg2.sf.net/. Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])])], @@ -2287,11 +2406,11 @@ AC_ARG_ENABLE(vorbis, if test "${enable_vorbis}" != "no" then AC_CHECK_HEADERS(vorbis/codec.h, [ - AX_ADD_PLUGINS([vorbis]) - AX_ADD_LDFLAGS([vorbis],[-lvorbis -logg]) ],[]) + VLC_ADD_PLUGINS([vorbis]) + VLC_ADD_LDFLAGS([vorbis],[-lvorbis -logg]) ],[]) AC_CHECK_HEADERS(vorbis/vorbisenc.h, [ - AX_ADD_LDFLAGS([vorbis],[-lvorbisenc]) ],[]) + VLC_ADD_LDFLAGS([vorbis],[-lvorbisenc]) ],[]) fi dnl @@ -2302,8 +2421,8 @@ AC_ARG_ENABLE(tremor, if test "${enable_tremor}" = "yes" then AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [ - AX_ADD_PLUGINS([tremor]) - AX_ADD_LDFLAGS([tremor],[-lvorbisidec -logg]) + VLC_ADD_PLUGINS([tremor]) + VLC_ADD_LDFLAGS([tremor],[-lvorbisidec -logg]) ],[]) fi @@ -2322,8 +2441,8 @@ then yes #endif], [ AC_MSG_RESULT([yes]) - AX_ADD_PLUGINS([speex]) - AX_ADD_LDFLAGS([speex],[-lspeex]) ], + 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.]) ] ) @@ -2345,9 +2464,9 @@ then real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`" if test -f "${real_tarkin_tree}/tarkin.o" then - AX_ADD_BUILTINS([tarkin]) - AX_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}]) - AX_ADD_LDFLAGS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg]) + VLC_ADD_BUILTINS([tarkin]) + VLC_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}]) + VLC_ADD_LDFLAGS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg]) AC_MSG_RESULT(yes) else dnl The given tarkin tree wasn't built @@ -2368,12 +2487,12 @@ then AC_CHECK_HEADERS(theora/theora.h, [ AC_CHECK_LIB(theora, theora_granule_time, [ if test "${SYS}" = "mingw32"; then - AX_ADD_PLUGINS([theora]) + VLC_ADD_PLUGINS([theora]) else - AX_ADD_BUILTINS([theora]) + VLC_ADD_BUILTINS([theora]) fi theora_libs="-ltheora -logg" - AX_ADD_LDFLAGS([theora],[${theora_libs}]) ],[ + VLC_ADD_LDFLAGS([theora],[${theora_libs}]) ],[ AC_MSG_ERROR([libtheora doesn't appear to be installed on you system. You also need to check that you have a libogg posterior to the 1.0 release.])], [-logg]) @@ -2381,11 +2500,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 -AX_ADD_LDFLAGS([subsdec],[${LIBICONV}]) -AX_ADD_CPPFLAGS([subsdec],[${INCICONV}]) -AX_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 @@ -2394,7 +2558,7 @@ AC_ARG_ENABLE(cmml, [ --enable-cmml CMML support (default enabled)]) if test "${enable_cmml}" != "no" then - AX_ADD_PLUGINS([cmml]) + VLC_ADD_PLUGINS([cmml]) fi @@ -2406,11 +2570,16 @@ dnl dnl png dnl AC_CHECK_HEADERS(png.h, [ - AX_ADD_LDFLAGS([logo],[-lpng -lz]) - AX_ADD_PLUGINS([logo]) - AX_ADD_LDFLAGS([svcdsub],[-lpng -lz]) - AX_ADD_LDFLAGS([cvdsub],[-lpng -lz -lm]) - AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])]) + 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])], + [],[-lz]) + ]) + LDFLAGS="${LDFLAGS_save}" dnl dnl Video plugins @@ -2447,9 +2616,9 @@ if test "${enable_x11}" != "no" && (test "${SYS}" != "mingw32" || test "${enable_x11}" = "yes"); then CPPFLAGS="${CPPFLAGS_save} -I${x_includes}" AC_CHECK_HEADERS(X11/Xlib.h, [ - AX_ADD_PLUGINS([x11]) - AX_ADD_LDFLAGS([x11],[-L${x_libraries} -lX11 -lXext]) - AX_ADD_CPPFLAGS([x11],[-I${x_includes}]) + VLC_ADD_PLUGINS([x11]) + VLC_ADD_LDFLAGS([x11],[-L${x_libraries} -lX11 -lXext]) + VLC_ADD_CPPFLAGS([x11],[-I${x_includes}]) ]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -2469,18 +2638,18 @@ if test "${enable_xvideo}" != "no" && # If libXv.so is available, xvideo can be a plugin. Otherwise, we # test for libXv_pic. if test -f /usr/X11R6/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then - AX_ADD_PLUGINS([xvideo]) - AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) - AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv]) + VLC_ADD_PLUGINS([xvideo]) + VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) + VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv]) else AC_CHECK_LIB(Xv_pic,XvPutImage,[ - AX_ADD_PLUGINS([xvideo]) - AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) - AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic]) + VLC_ADD_PLUGINS([xvideo]) + VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) + VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv_pic]) ],[ - AX_ADD_BUILTINS([xvideo]) - AX_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv]) - AX_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) + VLC_ADD_BUILTINS([xvideo]) + VLC_ADD_LDFLAGS([xvideo],[-L${x_libraries} -lX11 -lXext -lXv]) + VLC_ADD_CPPFLAGS([xvideo],[-I${x_includes}]) ]) fi ]) @@ -2489,6 +2658,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 @@ -2499,13 +2686,15 @@ if test "${enable_xvideo}" != "no" && CFLAGS="${CFLAGS_save} -L${x_libraries} -lX11 -lXext" AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[ AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[ - AX_ADD_LDFLAGS([xvideo],[-lXinerama_pic]) - AX_ADD_LDFLAGS([x11],[-lXinerama_pic]) + 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,[ - AX_ADD_LDFLAGS([xvideo],[-lXinerama]) - AX_ADD_LDFLAGS([x11],[-lXinerama]) + VLC_ADD_LDFLAGS([xvideo],[-lXinerama]) + VLC_ADD_LDFLAGS([x11],[-lXinerama]) + VLC_ADD_LDFLAGS([glx],[-lXinerama]) ac_cv_have_xinerama="yes" ]) ]) @@ -2517,6 +2706,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 @@ -2557,9 +2769,9 @@ then fi if test "${SDL_CONFIG}" != "no" then - AX_ADD_PLUGINS([vout_sdl aout_sdl]) - AX_ADD_CFLAGS([vout_sdl aout_sdl],[`${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`]) - AX_ADD_LDFLAGS([vout_sdl aout_sdl],[`${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`]) + 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,,'`]) 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), @@ -2604,11 +2816,11 @@ then if test "${FREETYPE_CONFIG}" != "no" then - AX_ADD_PLUGINS([freetype]) - AX_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags` ${INCICONV}]) - AX_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs` ${LIBICONV}]) + VLC_ADD_PLUGINS([freetype]) + VLC_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`]) + VLC_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`]) AC_CHECK_HEADERS(Carbon/Carbon.h, - [AX_ADD_LDFLAGS([freetype],[-framework Carbon])]) + [VLC_ADD_LDFLAGS([freetype],[-framework Carbon])]) elif test "${enable_freetype}" = "yes" then AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2 @@ -2630,8 +2842,8 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice if test "${FRIBIDI_CONFIG}" != "no" then - AX_ADD_CFLAGS([freetype], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI]) - AX_ADD_LDFLAGS([freetype], [`${FRIBIDI_CONFIG} --libs`]) + VLC_ADD_CFLAGS([freetype], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI]) + VLC_ADD_LDFLAGS([freetype], [`${FRIBIDI_CONFIG} --libs`]) fi fi fi @@ -2640,15 +2852,15 @@ dnl dnl SVG module dnl AC_ARG_ENABLE(svg, - [ --enable-svg SVG support (default disabled)]) + [ --enable-svg SVG support (default disabled)]) if test "${enable_svg}" == "yes" then PKG_CHECK_MODULES(SVG, librsvg-2.0 >= 2.5.0, [ - AX_ADD_LDFLAGS([svg],[$SVG_LIBS]) - AX_ADD_CFLAGS([svg],[$SVG_CFLAGS]) - AX_ADD_PLUGINS([svg]) ], + VLC_ADD_LDFLAGS([svg],[$SVG_LIBS]) + VLC_ADD_CFLAGS([svg],[$SVG_CFLAGS]) + VLC_ADD_PLUGINS([svg]) ], [AC_MSG_WARN(SVG library not found)]) fi @@ -2664,13 +2876,13 @@ then [ --with-qte=PATH Qt Embedded headers and libraries]) if test "${with_qte}" != "no" -a -n "${with_qte}" then - AX_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) - AX_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) + VLC_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) + VLC_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) else - AX_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) - AX_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) + VLC_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) + VLC_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) fi - AX_ADD_PLUGINS([qte]) + VLC_ADD_PLUGINS([qte]) NEED_QTE_MAIN=yes CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}" AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ @@ -2687,19 +2899,19 @@ dnl AC_ARG_ENABLE(qt_video, dnl [ --enable-qt_video QT Video Output support (default disabled)]) dnl if test "${enable_qt_video}" = "yes" dnl then -dnl AX_ADD_PLUGINS([qt_video]) -dnl AX_ADD_LDFLAGS([qt_video],[-L${QTDIR}/lib]) +dnl VLC_ADD_PLUGINS([qt_video]) +dnl VLC_ADD_LDFLAGS([qt_video],[-L${QTDIR}/lib]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt_video}" dnl AC_CHECK_LIB(qt-mt,main,[ -dnl AX_ADD_LDFLAGS([qt_video],[-lqt-mt]) +dnl VLC_ADD_LDFLAGS([qt_video],[-lqt-mt]) dnl ],[ dnl AC_CHECK_LIB(qt,main,[ -dnl AX_ADD_LDFLAGS([qt_video],[-lqt]) +dnl VLC_ADD_LDFLAGS([qt_video],[-lqt]) dnl ]) dnl ]) dnl NEED_QTE_MAIN=yes dnl LDFLAGS="${LDFLAGS_save}" -dnl AX_ADD_CXXFLAGS([qt_video],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include]) +dnl VLC_ADD_CXXFLAGS([qt_video],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include]) dnl fi dnl @@ -2721,8 +2933,8 @@ then ]) if test "$can_build_roku" = "yes" then - AX_ADD_PLUGINS([hd1000v]) - AX_ADD_LDFLAGS([hd1000v],[-lCascade -ldvbpsi -lmad]) + VLC_ADD_PLUGINS([hd1000v]) + VLC_ADD_LDFLAGS([hd1000v],[-lCascade -ldvbpsi -lmad]) fi AC_LANG_POP([C++]) fi @@ -2741,15 +2953,20 @@ then if test -z "${with_directx}" then AC_CHECK_HEADERS(ddraw.h, - [ AX_ADD_PLUGINS([vout_directx aout_directx]) - AX_ADD_LDFLAGS([vout_directx],[-lgdi32]) ]) + [ VLC_ADD_PLUGINS([vout_directx aout_directx]) + 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 then - AX_ADD_PLUGINS([vout_directx aout_directx]) - AX_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}]) - AX_ADD_LDFLAGS([vout_directx],[-lgdi32]) + VLC_ADD_PLUGINS([vout_directx aout_directx]) + VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}]) + VLC_ADD_LDFLAGS([vout_directx],[-lgdi32]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -2767,7 +2984,7 @@ AC_ARG_ENABLE(fb, if test "${enable_fb}" != "no" then AC_CHECK_HEADERS(linux/fb.h, [ - AX_ADD_PLUGINS([fb]) + VLC_ADD_PLUGINS([fb]) ]) fi @@ -2778,7 +2995,7 @@ AC_ARG_ENABLE(mga, [ --enable-mga Linux kernel Matrox support (default disabled)], [ if test "${enable_mga}" = "yes" then - AX_ADD_PLUGINS([mga]) + VLC_ADD_PLUGINS([mga]) fi ]) dnl @@ -2788,8 +3005,8 @@ AC_ARG_ENABLE(svgalib, [ --enable-svgalib SVGAlib support (default disabled)]) if test "${enable_svgalib}" = "yes" then - AX_ADD_PLUGINS([svgalib]) - AX_ADD_LDFLAGS([svgalib],[-lvgagl -lvga]) + VLC_ADD_PLUGINS([svgalib]) + VLC_ADD_LDFLAGS([svgalib],[-lvgagl -lvga]) fi dnl @@ -2799,14 +3016,14 @@ AC_ARG_ENABLE(ggi, [ --enable-ggi GGI support (default disabled)]) if test "${enable_ggi}" = "yes" then - AX_ADD_PLUGINS([ggi]) - AX_ADD_LDFLAGS([ggi],[-lggi]) + VLC_ADD_PLUGINS([ggi]) + VLC_ADD_LDFLAGS([ggi],[-lggi]) AC_ARG_WITH(ggi, [ --with-ggi=PATH path to libggi], [ if test "${with_ggi}" != "no" -a -n "${with_ggi}" then - AX_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include]) - AX_ADD_LDFLAGS([ggi],[-L${with_ggi}/lib]) + VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include]) + VLC_ADD_LDFLAGS([ggi],[-L${with_ggi}/lib]) fi ]) fi @@ -2817,15 +3034,15 @@ AC_ARG_ENABLE(glide, [ --enable-glide Glide (3dfx) support (default disabled)]) if test "${enable_glide}" = "yes" then - AX_ADD_PLUGINS([glide]) - AX_ADD_LDFLAGS([glide],[-lglide2x -lm]) - AX_ADD_CPPFLAGS([glide],[-I/usr/include/glide]) + VLC_ADD_PLUGINS([glide]) + VLC_ADD_LDFLAGS([glide],[-lglide2x -lm]) + VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide]) AC_ARG_WITH(glide, [ --with-glide=PATH path to libglide], [ if test "${with_glide}" != "no" -a -n "${with_glide}" then - AX_ADD_CPPFLAGS([glide],[-I${with_glide}/include]) - AX_ADD_LDFLAGS([glide],[-L${with_glide}/lib]) + VLC_ADD_CPPFLAGS([glide],[-I${with_glide}/include]) + VLC_ADD_LDFLAGS([glide],[-L${with_glide}/lib]) fi ]) fi @@ -2839,8 +3056,8 @@ then AC_CHECK_HEADER(aalib.h,have_aa="true",have_aa="false") if test "${have_aa}" = "true" then - AX_ADD_PLUGINS([aa]) - AX_ADD_LDFLAGS([aa],[-laa]) + VLC_ADD_PLUGINS([aa]) + VLC_ADD_LDFLAGS([aa],[-laa]) fi fi @@ -2861,9 +3078,9 @@ then AC_PATH_PROG(CACA_CONFIG, caca-config, no, ${CACA_PATH}) if test "${CACA_CONFIG}" != "no" then - AX_ADD_PLUGINS([caca]) - AX_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`]) - AX_ADD_LDFLAGS([caca],[`${CACA_CONFIG} --plugin-libs`]) + VLC_ADD_PLUGINS([caca]) + VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`]) + VLC_ADD_LDFLAGS([caca],[`${CACA_CONFIG} --plugin-libs`]) fi fi @@ -2874,8 +3091,8 @@ AC_ARG_ENABLE(wingdi, [ --enable-wingdi Win32 GDI module (default enabled on Win32)]) if test "${enable_wingdi}" != "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then - AX_ADD_PLUGINS([wingdi]) - AX_ADD_LDFLAGS([wingdi],[-lgdi32]) + VLC_ADD_PLUGINS([wingdi]) + VLC_ADD_LDFLAGS([wingdi],[-lgdi32]) fi fi @@ -2895,8 +3112,8 @@ if test "${enable_oss}" != "no" && (test "${SYS}" != "mingw32" || test "${enable_oss}" = "yes") then AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ - AX_ADD_PLUGINS([oss]) - AC_CHECK_LIB(ossaudio,main,AX_ADD_LDFLAGS([oss],[-lossaudio])) + VLC_ADD_PLUGINS([oss]) + AC_CHECK_LIB(ossaudio,main,VLC_ADD_LDFLAGS([oss],[-lossaudio])) ]) fi @@ -2910,9 +3127,25 @@ AC_ARG_ENABLE(esd, AC_PATH_PROG(ESD_CONFIG, esd-config, no) if test "${ESD_CONFIG}" != "no" then - AX_ADD_PLUGINS([esd]) - AX_ADD_CFLAGS([esd],[`${ESD_CONFIG} --cflags`]) - AX_ADD_LDFLAGS([esd],[`${ESD_CONFIG} --libs`]) + VLC_ADD_PLUGINS([esd]) + VLC_ADD_CFLAGS([esd],[`${ESD_CONFIG} --cflags`]) + VLC_ADD_LDFLAGS([esd],[`${ESD_CONFIG} --libs`]) + 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]) @@ -2926,9 +3159,9 @@ AC_ARG_ENABLE(arts, AC_PATH_PROG(ARTS_CONFIG, artsc-config, no) if test "${ARTS_CONFIG}" != "no" then - AX_ADD_PLUGINS([arts]) - AX_ADD_CFLAGS([arts],[`${ARTS_CONFIG} --cflags`]) - AX_ADD_LDFLAGS([arts],[`${ARTS_CONFIG} --libs `]) + VLC_ADD_PLUGINS([arts]) + VLC_ADD_CFLAGS([arts],[`${ARTS_CONFIG} --cflags`]) + VLC_ADD_LDFLAGS([arts],[`${ARTS_CONFIG} --libs `]) fi fi]) @@ -2936,8 +3169,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" @@ -2947,10 +3180,12 @@ AC_ARG_ENABLE(alsa, #include ], [void foo() { snd_pcm_hw_params_get_period_time(0,0,0); }], AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4)) - AX_ADD_PLUGINS([alsa]) - AX_ADD_LDFLAGS([alsa],[-lasound -lm -ldl]) + 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]) @@ -2961,8 +3196,8 @@ AC_ARG_ENABLE(waveout, [ --enable-waveout Win32 waveOut module (default enabled on Win32)]) if test "${enable_waveout}" != "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then - AX_ADD_PLUGINS([waveout]) - AX_ADD_LDFLAGS([waveout],[-lwinmm]) + VLC_ADD_PLUGINS([waveout]) + VLC_ADD_LDFLAGS([waveout],[-lwinmm]) fi fi @@ -2975,13 +3210,13 @@ if test "${enable_coreaudio}" != "no" && (test "${SYS}" = "darwin" || test "${enable_coreaudio}" = "yes") then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, - [ AX_ADD_BUILTINS([coreaudio]) - AX_ADD_LDFLAGS([coreaudio],[-framework CoreAudio]) + [ VLC_ADD_BUILTINS([coreaudio]) + VLC_ADD_LDFLAGS([coreaudio],[-framework CoreAudio]) AC_MSG_CHECKING(for kAudioConverterPrimeMethod in AudioToolbox/AudioConverter.h) AC_EGREP_HEADER(kAudioConverterPrimeMethod,AudioToolbox/AudioConverter.h,[ AC_MSG_RESULT(yes) - AX_ADD_PLUGINS([coreaudio_resampler]) - AX_ADD_LDFLAGS([coreaudio_resampler],[-framework AudioToolbox]) + VLC_ADD_PLUGINS([coreaudio_resampler]) + VLC_ADD_LDFLAGS([coreaudio_resampler],[-framework AudioToolbox]) ],[ AC_MSG_RESULT(no) ]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -2996,8 +3231,8 @@ if test "${enable_hd1000a}" != "no" && then AC_LANG_PUSH([C++]) AC_CHECK_HEADERS(deschutes/libraries/hdmachinex225/PCMAudioPlayer.h, [ - AX_ADD_PLUGINS([hd1000a]) - AC_CHECK_LIB(HDMachineX225,main,AX_ADD_LDFLAGS([hd1000a],[-lHDMachineX225])) ]) + VLC_ADD_PLUGINS([hd1000a]) + AC_CHECK_LIB(HDMachineX225,main,VLC_ADD_LDFLAGS([hd1000a],[-lHDMachineX225])) ]) AC_LANG_POP([C++]) fi @@ -3010,30 +3245,7 @@ AC_ARG_WITH(,[Interface plugins:]) dnl special case for BeOS if test "${SYS}" = "beos" then - AX_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 - - AX_ADD_PLUGINS([skins]) - ALIASES="${ALIASES} svlc" - AX_ADD_CPPFLAGS([skins],[-U_OFF_T_ -U_off_t -Imodules/gui/skins]) - AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti]) - AX_ADD_LDFLAGS([skins],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32]) - - else if test "${enable_skins}" = "yes"; then - AX_ADD_PLUGINS([skins]) - ALIASES="${ALIASES} svlc" - AX_ADD_CPPFLAGS([skins],[-Imodules/gui/skins -I${x_includes} -I/usr/include/freetype2 -DX11_SKINS]) - AX_ADD_CXXFLAGS([skins],[-O2 -fno-rtti]) - AX_ADD_LDFLAGS([skins],[-L${x_libraries} -lImlib2 -lXext -lX11 -lfreetype -lpng -lz ]) - fi fi + VLC_ADD_BUILTINS([beos]) fi dnl @@ -3048,8 +3260,8 @@ if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS} dnl freetype if test "${FREETYPE_CONFIG}" != "no"; then - AX_ADD_CPPFLAGS([skins2],[`${FREETYPE_CONFIG} --cflags`]) - AX_ADD_LDFLAGS([skins2],[`${FREETYPE_CONFIG} --libs`]) + VLC_ADD_CPPFLAGS([skins2],[`${FREETYPE_CONFIG} --cflags`]) + VLC_ADD_LDFLAGS([skins2],[`${FREETYPE_CONFIG} --libs` -lpng]) else skins2_missing_lib="yes" if test "${enable_skins2}" = "yes"; then @@ -3057,17 +3269,6 @@ if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS} fi fi - dnl iconv - if test "$am_cv_func_iconv" = "yes"; then - AX_ADD_CPPFLAGS([skins2],[${INCICONV}]) - AX_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, @@ -3077,8 +3278,8 @@ if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS} fi ]) AC_PATH_PROG(XML2_CONFIG, xml2-config, no, ${XML2_PATH}) if test "${XML2_CONFIG}" != "no"; then - AX_ADD_CPPFLAGS([skins2],[`${XML2_CONFIG} --cflags`]) - AX_ADD_LDFLAGS([skins2],[`${XML2_CONFIG} --libs`]) + 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,[],[ @@ -3096,18 +3297,18 @@ if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS} fi if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"); then - AX_ADD_PLUGINS([skins2]) + VLC_ADD_PLUGINS([skins2]) ALIASES="${ALIASES} svlc" - AX_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS]) - AX_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) - AX_ADD_LDFLAGS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32]) + VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS]) + VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) + VLC_ADD_LDFLAGS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32]) else if test "${skins2_missing_lib}" = "no"; then - AX_ADD_PLUGINS([skins2]) + VLC_ADD_PLUGINS([skins2]) ALIASES="${ALIASES} svlc" - AX_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -I${x_includes} -DX11_SKINS]) - AX_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) - AX_ADD_LDFLAGS([skins2],[-L${x_libraries} -lXext -lX11]) + VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -I${x_includes} -DX11_SKINS]) + VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) + VLC_ADD_LDFLAGS([skins2],[-L${x_libraries} -lXext -lX11]) fi fi fi @@ -3140,11 +3341,11 @@ dnl then dnl AC_MSG_ERROR([Your development package for Gtk+ is too old, you need at least version 1.2.0. Please upgrade and try again. Alternatively you can also configure with --disable-gtk.]) dnl fi dnl if test "${SYS}" != "mingw32"; then -dnl AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk gthread`]) -dnl AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`]) +dnl VLC_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk gthread`]) +dnl VLC_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`]) dnl else -dnl AX_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk`]) -dnl AX_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`]) +dnl VLC_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk`]) +dnl VLC_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`]) dnl fi dnl # now look for the gtk.h header dnl CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gtk}" @@ -3155,7 +3356,7 @@ dnl echo "Cannot find gtk development headers." dnl ]) dnl if test "${ac_cv_gtk_headers}" = "yes" dnl then -dnl AX_ADD_PLUGINS([gtk]) +dnl VLC_ADD_PLUGINS([gtk]) dnl if test "${SYS}" != "mingw32"; then dnl NEED_GTK_MAIN=yes dnl fi @@ -3173,9 +3374,9 @@ dnl [ --enable-gtk2 Gtk2 support (default disabled)]) dnl if test "${enable_gtk2}" = "yes" dnl then dnl PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0]) -dnl AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}]) -dnl AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}]) -dnl AX_ADD_PLUGINS([gtk2]) +dnl VLC_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}]) +dnl VLC_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}]) +dnl VLC_ADD_PLUGINS([gtk2]) dnl if test "${SYS}" != "mingw32"; then dnl NEED_GTK2_MAIN=yes dnl fi @@ -3186,14 +3387,14 @@ dnl PDA Gtk+2 module dnl AC_ARG_ENABLE(pda, [ --enable-pda PDA interface needs Gtk2 support (default disabled)]) -if test "x${enable_pda}" = "xyes" +if test "${enable_pda}" = "yes" then PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0]) - AX_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}]) - AX_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}]) - AX_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}]) - AX_ADD_LDFLAGS([pda],[${GTK2_LIBS} ${LDFLAGS_pda}]) - AX_ADD_PLUGINS([pda]) + VLC_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}]) + VLC_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}]) + VLC_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}]) + VLC_ADD_LDFLAGS([pda],[${GTK2_LIBS} ${LDFLAGS_pda}]) + VLC_ADD_PLUGINS([pda]) if test "${SYS}" != "mingw32"; then NEED_GTK2_MAIN=yes fi @@ -3209,13 +3410,13 @@ dnl # look for gnome-config dnl AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) dnl if test -x ${GNOME_CONFIG} dnl then -dnl AX_ADD_CFLAGS([gnome],[`${GNOME_CONFIG} --cflags gtk gnomeui`]) -dnl AX_ADD_LDFLAGS([gnome],[`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`]) +dnl VLC_ADD_CFLAGS([gnome],[`${GNOME_CONFIG} --cflags gtk gnomeui`]) +dnl VLC_ADD_LDFLAGS([gnome],[`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`]) dnl fi dnl # now look for the gnome.h header dnl CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gnome}" dnl AC_CHECK_HEADERS(gnome.h, [ -dnl AX_ADD_PLUGINS([gnome]) +dnl VLC_ADD_PLUGINS([gnome]) dnl NEED_GTK_MAIN=yes dnl NEED_GNOME_MAIN=yes dnl ALIASES="${ALIASES} gnome-vlc" @@ -3241,9 +3442,9 @@ dnl [ --enable-gnome2 Gnome2 support (default disabled)]) dnl if test "${enable_gnome2}" = "yes" dnl then dnl PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0]) -dnl AX_ADD_CFLAGS([gnome2],[${GNOME2_CFLAGS}]) -dnl AX_ADD_LDFLAGS([gnome2],[${GNOME2_LIBS}]) -dnl AX_ADD_PLUGINS([gnome2]) +dnl VLC_ADD_CFLAGS([gnome2],[${GNOME2_CFLAGS}]) +dnl VLC_ADD_LDFLAGS([gnome2],[${GNOME2_LIBS}]) +dnl VLC_ADD_PLUGINS([gnome2]) dnl if test "${SYS}" != "mingw32"; then dnl NEED_GNOME2_MAIN=yes dnl fi @@ -3272,8 +3473,8 @@ 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++) - AX_ADD_CXXFLAGS([wxwindows],[`${WX_CONFIG} --cxxflags`]) - AX_ADD_LDFLAGS([wxwindows],[`${WX_CONFIG} --libs`]) + 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}" ac_cv_wx_headers=yes @@ -3283,7 +3484,7 @@ then ]) if test "${ac_cv_wx_headers}" = "yes" then - AX_ADD_PLUGINS([wxwindows]) + VLC_ADD_PLUGINS([wxwindows]) ALIASES="${ALIASES} wxvlc" fi CPPFLAGS="${CPPFLAGS_save}" @@ -3297,19 +3498,19 @@ dnl dnl dnl AC_ARG_ENABLE(qt, dnl [ --enable-qt Qt interface support (default disabled)], dnl [if test "${enable_qt}" = "yes"; then -dnl AX_ADD_PLUGINS([qt]) +dnl VLC_ADD_PLUGINS([qt]) dnl ALIASES="${ALIASES} qvlc" -dnl AX_ADD_LDFLAGS([qt],[-L${QTDIR}/lib]) +dnl VLC_ADD_LDFLAGS([qt],[-L${QTDIR}/lib]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}" dnl AC_CHECK_LIB(qt-mt,main,[ -dnl AX_ADD_LDFLAGS([qt],[-lqt-mt]) +dnl VLC_ADD_LDFLAGS([qt],[-lqt-mt]) dnl ],[ dnl AC_CHECK_LIB(qt,main,[ -dnl AX_ADD_LDFLAGS([qt],[-lqt]) +dnl VLC_ADD_LDFLAGS([qt],[-lqt]) dnl ]) dnl ]) dnl LDFLAGS="${LDFLAGS_save}" -dnl AX_ADD_CXXFLAGS([qt],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include]) +dnl VLC_ADD_CXXFLAGS([qt],[-I/usr/include/qt3 -I/usr/include/qt -I${QTDIR}/include]) dnl if test -x ${QTDIR}/bin/moc dnl then dnl MOC=${QTDIR}/bin/moc @@ -3324,25 +3525,25 @@ dnl dnl dnl AC_ARG_ENABLE(kde, dnl [ --enable-kde KDE interface support (default disabled)], dnl [if test "${enable_kde}" = "yes"; then -dnl AX_ADD_PLUGINS([kde]) +dnl VLC_ADD_PLUGINS([kde]) dnl ALIASES="${ALIASES} kvlc" -dnl AX_ADD_LDFLAGS([kde],[-L${KDEDIR}/lib]) +dnl VLC_ADD_LDFLAGS([kde],[-L${KDEDIR}/lib]) dnl dnl Check for -lkfile (only in KDE 2) or -lkdeui -lkio (KDE 3) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" dnl AC_CHECK_LIB(kfile,main,[ -dnl AX_ADD_LDFLAGS([kde],[-lkfile]) +dnl VLC_ADD_LDFLAGS([kde],[-lkfile]) dnl ]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" dnl AC_CHECK_LIB(kdeui,main,[ -dnl AX_ADD_LDFLAGS([kde],[-lkdeui]) +dnl VLC_ADD_LDFLAGS([kde],[-lkdeui]) dnl ]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" dnl AC_CHECK_LIB(kio,main,[ -dnl AX_ADD_LDFLAGS([kde],[-lkio]) +dnl VLC_ADD_LDFLAGS([kde],[-lkio]) dnl ]) dnl LDFLAGS="${LDFLAGS_save}" -dnl AX_ADD_CXXFLAGS([kde],[-I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt]) -dnl AX_ADD_CXXFLAGS([kde],[-I${KDEDIR}/include -I${QTDIR}/include]) +dnl VLC_ADD_CXXFLAGS([kde],[-I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt]) +dnl VLC_ADD_CXXFLAGS([kde],[-I${KDEDIR}/include -I${QTDIR}/include]) dnl if test -x ${QTDIR}/bin/moc dnl then dnl MOC=${QTDIR}/bin/moc @@ -3361,11 +3562,11 @@ AC_ARG_ENABLE(opie, [ --with-qte=PATH Qt Embedded headers and libraries]) if test "${with_qte}" != "no" -a -n "${with_qte}" then - AX_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) - AX_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) + VLC_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) + VLC_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti]) else - AX_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`]) - AX_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`]) + VLC_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`]) + VLC_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`]) fi CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}" AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ @@ -3373,10 +3574,10 @@ AC_ARG_ENABLE(opie, ] ) CPPFLAGS="${CPPFLAGS_save}" - AX_ADD_PLUGINS([opie]) + VLC_ADD_PLUGINS([opie]) NEED_QTE_MAIN=yes - AX_ADD_LDFLAGS([opie],[-lqpe ${LDFLAGS_qte}]) - AX_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}]) + VLC_ADD_LDFLAGS([opie],[-lqpe ${LDFLAGS_qte}]) + VLC_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}]) if test "${with_qte}" != "no" -a -n "${with_qte}" then MOC=${with_qte}/bin/moc @@ -3392,12 +3593,12 @@ AC_ARG_ENABLE(macosx, [ --enable-macosx MacOS X support (default enabled on MacOS X)], [if test "${enable_macosx}" = "yes" then - AX_ADD_BUILTINS([macosx]) - AX_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL]) + VLC_ADD_BUILTINS([macosx]) + VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL]) fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, - AX_ADD_BUILTINS([macosx]) - AX_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL]) + VLC_ADD_BUILTINS([macosx]) + VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL]) )]) dnl @@ -3408,8 +3609,8 @@ AC_ARG_ENABLE(qnx, if test "${enable_qnx}" != "no" then AC_CHECK_HEADERS(Ph.h, [ - AX_ADD_PLUGINS([qnx]) - AX_ADD_LDFLAGS([qnx],[-lasound -lph]) + VLC_ADD_PLUGINS([qnx]) + VLC_ADD_LDFLAGS([qnx],[-lasound -lph]) ]) fi @@ -3419,8 +3620,8 @@ dnl AC_ARG_ENABLE(ncurses, [ --enable-ncurses ncurses interface support (default disabled)], [if test "${enable_ncurses}" = "yes"; then - AX_ADD_PLUGINS([ncurses]) - AX_ADD_LDFLAGS([ncurses],[-lncurses]) + VLC_ADD_PLUGINS([ncurses]) + VLC_ADD_LDFLAGS([ncurses],[-lncurses]) fi]) dnl @@ -3440,8 +3641,8 @@ then AC_DEFINE(HAVE_XOSD_VERSION_0, 1, Define if is pre-1.0.0)))) if test "${have_xosd}" = "true" then - AX_ADD_PLUGINS([xosd]) - AX_ADD_LDFLAGS([xosd],[-lxosd]) + VLC_ADD_PLUGINS([xosd]) + VLC_ADD_LDFLAGS([xosd],[-lxosd]) fi fi @@ -3449,10 +3650,27 @@ dnl dnl Visualisation plugin dnl AC_ARG_ENABLE(visual, - [ --enable-visual visualisation plugin (default enabled)]) + [ --enable-visual visualisation plugin (default enabled)]) if test "${enable_visual}" != "no" then - AX_ADD_PLUGINS([visual]) + VLC_ADD_PLUGINS([visual]) +fi + +dnl +dnl OpenGL visualisation plugin +dnl +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]) + if test "${SYS}" != "mingw32"; then + VLC_ADD_LDFLAGS([galaktos],[-L${x_libraries} -lGL -lGLU]) + else + VLC_ADD_LDFLAGS([galaktos],[-lopengl32]) + fi + ]) fi dnl @@ -3478,18 +3696,18 @@ then fi if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a) - AX_ADD_BUILTINS([goom]) - AX_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2]) - AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE]) + VLC_ADD_BUILTINS([goom]) + VLC_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2]) + VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE]) else dnl The given libgoom2 wasn't built, try to look for the old goom AC_MSG_RESULT(no) AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) if test -f "${real_goom_tree}/libgoom.a"; then AC_MSG_RESULT(${real_goom_tree}/libgoom.a) - AX_ADD_BUILTINS([goom]) - AX_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom]) - AX_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM]) + VLC_ADD_BUILTINS([goom]) + VLC_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom]) + VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM]) else dnl The given libgoom wasn't built AC_MSG_RESULT(no) @@ -3499,8 +3717,8 @@ then else AC_CHECK_HEADERS(goom/goom.h, [ AC_CHECK_LIB(goom2, goom_init, [ - AX_ADD_PLUGINS([goom]) - AX_ADD_LDFLAGS([goom],[-lgoom2]) + 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/.]) ]) @@ -3522,9 +3740,9 @@ then AC_CHECK_HEADERS(slp.h, have_slp="true", have_slp="false") if test "${have_slp}" = "true" then - AX_ADD_PLUGINS([slp]) - AX_ADD_LDFLAGS([slp],[-lslp]) - AX_ADD_LDFLAGS([stream_out_standard],[-lslp]) + VLC_ADD_PLUGINS([slp]) + VLC_ADD_LDFLAGS([slp],[-lslp]) + VLC_ADD_LDFLAGS([stream_out_standard],[-lslp]) fi else AC_MSG_CHECKING(for slp headers in ${with_slp}) @@ -3532,10 +3750,10 @@ then then dnl Use ${with_slp}/libslp/slp.h AC_MSG_RESULT(yes) - AX_ADD_PLUGINS([slp]) - AX_ADD_LDFLAGS([slp],[-L${with_slp} -lslp]) - AX_ADD_LDFLAGS([stream_out_standard],[-L${with_slp} -lslp]) - AX_ADD_CPPFLAGS([slp],[-I${with_slp}]) + VLC_ADD_PLUGINS([slp]) + VLC_ADD_LDFLAGS([slp],[-L${with_slp} -lslp]) + VLC_ADD_LDFLAGS([stream_out_standard],[-L${with_slp} -lslp]) + VLC_ADD_CPPFLAGS([slp],[-I${with_slp}]) AC_DEFINE(HAVE_SLP_H) else dnl No libslp could be found, sorry @@ -3555,8 +3773,8 @@ then AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false") if test "${have_lirc}" = "true" then - AX_ADD_PLUGINS([lirc]) - AX_ADD_LDFLAGS([lirc],[-llirc_client]) + VLC_ADD_PLUGINS([lirc]) + VLC_ADD_LDFLAGS([lirc],[-llirc_client]) fi fi @@ -3564,12 +3782,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, - [AX_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 @@ -3588,13 +3803,13 @@ if test "${enable_corba}" = "yes"; then gthread-2.0 >= $GLIB_VERSION, [ enablecorba=true - AX_ADD_LDFLAGS([corba],[$CORBA_LIBS]) - AX_ADD_CFLAGS([corba],[$CORBA_CFLAGS]) - AX_ADD_PLUGINS([corba snapshot]) ], + VLC_ADD_LDFLAGS([corba],[$CORBA_LIBS]) + VLC_ADD_CFLAGS([corba],[$CORBA_CFLAGS]) + VLC_ADD_PLUGINS([corba snapshot]) ], [ enablecorba=false AC_MSG_WARN(corba library not found) ]) fi -AM_CONDITIONAL(ENABLE_CORBA, test x$enablecorba = xtrue) +AM_CONDITIONAL(ENABLE_CORBA, test "$enablecorba" = "true") AC_ARG_WITH(,[Misc options:]) @@ -3672,15 +3887,17 @@ then else if test "${SYS}" != "mingw32"; then LDFLAGS="${LDFLAGS_save} -L${x_libraries}" - AC_CHECK_LIB(Xt,XtStrings,[ - AX_ADD_LDFLAGS([mozilla],[-L${x_libraries} -lXt]) + AC_CHECK_LIB(Xt,XtStrings, + [VLC_ADD_LDFLAGS([mozilla],[-L${x_libraries} -lXt -lX11 -lSM -lICE])], + [], + [[-L${x_libraries} -lX11 -lSM -lICE] ]) LDFLAGS="${LDFLAGS_save}" fi mozilla=: dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 - AX_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) - AX_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`]) + VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) + VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`]) CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}" AC_CHECK_HEADERS(mozilla-config.h) CPPFLAGS="${CPPFLAGS_save}" @@ -3696,8 +3913,8 @@ then CPPFLAGS="${CPPFLAGS_save} ${real_mozilla_sdk}" AC_CHECK_HEADERS(mozilla-config.h, [ mozilla=: - AX_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -I${real_mozilla_sdk} -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include]) - AX_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -lnspr4 -lplds4 -lplc4 -lembedstring -lxpcomglue -Wl,--kill-at]) + VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -I${real_mozilla_sdk} -I${real_mozilla_sdk}/embedstring/include -I${real_mozilla_sdk}/xpcom/include -I${real_mozilla_sdk}/nspr/include -I${real_mozilla_sdk}/string/include -I${real_mozilla_sdk}/plugin/include -I${real_mozilla_sdk}/java/include]) + VLC_ADD_LDFLAGS([mozilla],[-L${real_mozilla_sdk}/embedstring/bin -L${real_mozilla_sdk}/xpcom/bin -L${real_mozilla_sdk}/nspr/bin -L${real_mozilla_sdk}/string/bin -lnspr4 -lplds4 -lplc4 -lembedstring -lxpcomglue -Wl,--kill-at]) XPIDL_INCL="-I${real_mozilla_sdk}/xpcom/idl" if test -n "${CYGPATH}"; then XPIDL="${real_mozilla_sdk}/xpcom/bin/xpidl" @@ -3724,13 +3941,13 @@ then TESTS="test1 test2 test3 test4" dnl we define those so that bootstrap sets the right linker - AX_ADD_CXXFLAGS([test2],[]) - AX_ADD_OBJCFLAGS([test3],[]) + VLC_ADD_CXXFLAGS([test2],[]) + VLC_ADD_OBJCFLAGS([test3],[]) dnl this one is needed until automake knows what to do - AX_ADD_LDFLAGS([test3],[-lobjc]) + VLC_ADD_LDFLAGS([test3],[-lobjc]) - AX_ADD_PLUGINS([${TESTS}]) - #AX_ADD_BUILTINS([${TESTS}]) + VLC_ADD_PLUGINS([${TESTS}]) + #VLC_ADD_BUILTINS([${TESTS}]) fi dnl @@ -3738,32 +3955,32 @@ dnl gtk_main plugin dnl if test "${NEED_GTK_MAIN}" != "no" then - AX_ADD_PLUGINS([gtk_main]) - AX_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk}]) - AX_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk}]) + VLC_ADD_PLUGINS([gtk_main]) + VLC_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk}]) + VLC_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk}]) fi if test "${NEED_GNOME_MAIN}" != "no" then - AX_ADD_PLUGINS([gnome_main]) - AX_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_gnome}]) - AX_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_gnome}]) + VLC_ADD_PLUGINS([gnome_main]) + VLC_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_gnome}]) + VLC_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_gnome}]) fi if test "${NEED_GTK2_MAIN}" != "no" then - AX_ADD_PLUGINS([gtk2_main]) - AX_ADD_CFLAGS([gtk2],[-DNEED_GTK2_MAIN]) - AX_ADD_CFLAGS([pda],[-DNEED_GTK2_MAIN]) - AX_ADD_CFLAGS([gtk2_main],[${CFLAGS_gtk2} ${CFLAGS_pda}]) - AX_ADD_LDFLAGS([gtk2_main],[${LDFLAGS_gtk2} ${LDFLAGS_pda}]) + VLC_ADD_PLUGINS([gtk2_main]) + VLC_ADD_CFLAGS([gtk2],[-DNEED_GTK2_MAIN]) + VLC_ADD_CFLAGS([pda],[-DNEED_GTK2_MAIN]) + VLC_ADD_CFLAGS([gtk2_main],[${CFLAGS_gtk2} ${CFLAGS_pda}]) + VLC_ADD_LDFLAGS([gtk2_main],[${LDFLAGS_gtk2} ${LDFLAGS_pda}]) fi if test "${NEED_GNOME2_MAIN}" != "no" then - AX_ADD_PLUGINS([gnome2_main]) - AX_ADD_CFLAGS([gnome2_main],[${CFLAGS_gtk2} ${CFLAGS_gnome2}]) - AX_ADD_LDFLAGS([gnome2_main],[${LDFLAGS_gtk2} ${LDFLAGS_gnome2}]) + VLC_ADD_PLUGINS([gnome2_main]) + VLC_ADD_CFLAGS([gnome2_main],[${CFLAGS_gtk2} ${CFLAGS_gnome2}]) + VLC_ADD_LDFLAGS([gnome2_main],[${LDFLAGS_gtk2} ${LDFLAGS_gnome2}]) fi dnl @@ -3771,10 +3988,10 @@ dnl qte_main plugin dnl if test "${NEED_QTE_MAIN}" != "no" then - AX_ADD_PLUGINS([qte_main]) - AX_ADD_CXXFLAGS([opie qte qt_video],[-DNEED_QTE_MAIN]) - AX_ADD_CXXFLAGS([qte_main],[${CXXFLAGS_qte} ${CXXFLAGS_qt_video}]) - AX_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte} ${LDFLAGS_qt_video}]) + VLC_ADD_PLUGINS([qte_main]) + VLC_ADD_CXXFLAGS([opie qte qt_video],[-DNEED_QTE_MAIN]) + VLC_ADD_CXXFLAGS([qte_main],[${CXXFLAGS_qte} ${CXXFLAGS_qt_video}]) + VLC_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte} ${LDFLAGS_qt_video}]) fi @@ -3810,7 +4027,7 @@ then eval "${plugin}_p=yes" done else - AX_ADD_BUILTINS([${PLUGINS}]) + VLC_ADD_BUILTINS([${PLUGINS}]) PLUGINS="" fi AM_CONDITIONAL(HAVE_PLUGINS, ${plugin_support}) @@ -3826,7 +4043,7 @@ fi] AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support}) dnl Import conditional variables generated by bootstrap -AX_VLC_CONDITIONALS +VLC_CONDITIONALS dnl dnl Stuff used by the program @@ -3838,7 +4055,6 @@ AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command 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]) -AC_DEFINE_UNQUOTED(LIBEXT, "${LIBEXT}", [Dynamic object extension]) DATA_PATH="${ac_tool_prefix}/share/vlc" AC_SUBST(DATA_PATH) @@ -3855,7 +4071,7 @@ CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include" dnl dnl Restore *FLAGS dnl -AX_RESTORE_FLAGS +VLC_RESTORE_FLAGS dnl dnl Create the vlc-config script @@ -3879,14 +4095,13 @@ AC_SUBST(INCLUDES) AC_SUBST(ALL_LINGUAS) dnl Import substitutions generated by bootstrap -AX_VLC_SUBSTS +VLC_SUBSTS dnl Create vlc-config.in -AX_OUTPUT_VLC_CONFIG_IN +VLC_OUTPUT_VLC_CONFIG_IN AC_CONFIG_FILES([ Makefile - autotools/Makefile debian/Makefile doc/Makefile intl/Makefile @@ -3904,9 +4119,6 @@ AC_CONFIG_FILES([ modules/access/Makefile modules/access/dshow/Makefile modules/access/dvb/Makefile - modules/access/dvd/Makefile - modules/access/dvdplay/Makefile - modules/access/dvdread/Makefile modules/access/mms/Makefile modules/access/pvr/Makefile modules/access/satellite/Makefile @@ -3914,6 +4126,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 @@ -3923,8 +4136,8 @@ AC_CONFIG_FILES([ modules/audio_output/Makefile modules/codec/Makefile 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 @@ -3945,7 +4158,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 @@ -3961,12 +4173,14 @@ 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 modules/video_output/x11/Makefile modules/visualization/Makefile modules/visualization/visual/Makefile + modules/visualization/galaktos/Makefile ]) AC_CONFIG_FILES([vlc-config], [chmod 0755 vlc-config])