X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=f301e3e51292539275af6e467c499bcde6079a5e;hb=4475aeda1a449436710c3b4548bad06a77410afe;hp=fa4a7ce1773efc5e68b6451baf61f7c4890eb694;hpb=1105c8b0c4f01dd18283b010977b0d6e32ec6511;p=vlc diff --git a/configure.ac b/configure.ac index fa4a7ce177..f301e3e512 100644 --- a/configure.ac +++ b/configure.ac @@ -6,13 +6,14 @@ VERSION_MINOR="9" VERSION_REVISION="0" VERSION_EXTRA="svn" -CONFIGURE_LINE="$0 $*" +CONFIGURE_LINE="$0 $ac_configure_args" CODENAME="Grishenko" AC_PREREQ(2.59) AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) -AC_CANONICAL_SYSTEM +AC_CANONICAL_BUILD +AC_CANONICAL_HOST AM_INIT_AUTOMAKE([1.7 check-news dist-bzip2]) AM_CONFIG_HEADER(config.h) @@ -54,6 +55,7 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(AR, ar, :) AC_CHECK_TOOL(LD, ld, :) +AC_CHECK_TOOL(DLLTOOL, dlltool, :) dnl Check for compiler properties AC_C_CONST @@ -139,7 +141,7 @@ LDFLAGS_vlc="${LDFLAGS}" dnl dnl Check the operating system dnl -case "${target_os}" in +case "${host_os}" in "") SYS=unknown ;; @@ -152,14 +154,14 @@ case "${target_os}" in VLC_ADD_LDFLAGS([dvd dvdcss vcd cdda vcdx cddax],[-ldvd]) ;; *bsd*) - SYS="${target_os}" + SYS="${host_os}" CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}" - case "${target_os}" in + case "${host_os}" in freebsd*) CPPFLAGS_save="${CPPFLAGS_save} -I/usr/local/include" CPPFLAGS="${CPPFLAGS_save}" LDFLAGS_save="${LDFLAGS_save} -L/usr/local/lib" - LDFLAGS="${LDLFAGS_save}" + LDFLAGS="${LDFLAGS_save}" ;; esac ;; @@ -168,27 +170,26 @@ case "${target_os}" in SYS=darwin CFLAGS_save="${CFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}" - VLC_ADD_LDFLAGS([vlc ffmpeg 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,-m -Wl,-multiply_defined -Wl,suppress]) + OBJCFLAGS_save="${OBJCFLAGS_save} -no-cpp-precomp -D_INTL_REDIRECT_MACROS -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}" + VLC_ADD_LDFLAGS([libvlc ffmpeg ffmpegaltivec],[-all_load]) + VLC_ADD_LDFLAGS([mkv mp4], [-framework IOKit -framework CoreFoundation]) + VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c]) + VLC_ADD_LDFLAGS([libvlc vlc],[-Wl,-m -Wl,-multiply_defined -Wl,suppress]) ;; darwin*) SYS=darwin CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS"; OBJCFLAGS="${OBJCFLAGS_save}" + OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}" 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([mkv mp4], [-framework IOKit -framework CoreFoundation]) + VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c]) ;; *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) AC_CHECK_TOOL(WINDRES, windres, :) enable_libtool="no" - case "${target_os}" in + case "${host_os}" in *mingw32*) SYS=mingw32 ;; @@ -209,16 +210,16 @@ 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}" - VLC_ADD_LDFLAGS([vlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows]) + VLC_ADD_LDFLAGS([libvlc],[-lws2_32 -lnetapi32 -lwinmm -mwindows]) VLC_ADD_LDFLAGS([cdda 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 stream_out_rtp vod_rtsp telnet netsync growl],[-lws2_32]) + VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard stream_out_rtp vod_rtsp telnet netsync growl],[-lws2_32]) fi if test "${SYS}" = "mingwce"; then # add ws2 for closesocket, select, recv CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}" - VLC_ADD_CPPFLAGS([vlc],[-Dmain(a,b)=maince(a,b)]) - VLC_ADD_LDFLAGS([vlc],[-lws2 -e WinMainCRTStartup]) - VLC_ADD_LDFLAGS([ipv4 ipv6 access_http access_mms access_udp access_tcp access_ftp access_output_udp sap http netsync],[-lws2]) + VLC_ADD_CPPFLAGS([libvlc vlc],[-Dmain(a,b)=maince(a,b)]) + VLC_ADD_LDFLAGS([libvlc vlc],[-lws2 -e WinMainCRTStartup]) + VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp access_output_udp sap http netsync],[-lws2]) fi ;; *nto*) @@ -239,16 +240,16 @@ case "${target_os}" in CFLAGS_save="${CFLAGS_save} -Wno-multichar"; CFLAGS="${CFLAGS_save}" CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}" VLC_ADD_CXXFLAGS([beos],[]) - VLC_ADD_LDFLAGS([vlc logger],[-lbe]) + VLC_ADD_LDFLAGS([vlc libvlc logger],[-lbe]) VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame]) VLC_ADD_LDFLAGS([dvdnav dvdread],[-ldl]) VLC_ADD_LDFLAGS([access_file],[-lpoll]) - LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${CFLAGS_save}" + LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}" dnl Check for BONE if test -f /boot/beos/system/lib/libbind.so; then - VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lbind -lsocket]) + VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl],[-lbind -lsocket]) else - VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lnet]) + VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl],[-lnet]) fi dnl Ugly check for Zeta @@ -257,7 +258,7 @@ case "${target_os}" in fi ;; *) - SYS="${target_os}" + SYS="${host_os}" ;; esac AM_CONDITIONAL(HAVE_BEOS, test "${SYS}" = "beos") @@ -273,6 +274,8 @@ dnl AC_DISABLE_STATIC AC_LIBTOOL_DLOPEN dnl AC_LIBTOOL_WIN32_DLL - couldn't get libtool to work on Win32 so far +m4_undefine([AC_PROG_F77]) +m4_defun([AC_PROG_F77],[]) AC_PROG_LIBTOOL AC_ARG_ENABLE(libtool, @@ -297,7 +300,7 @@ fi dnl dnl Gettext stuff dnl -ALL_LINGUAS="ca cs da de en_GB es fr gl he hi hu it ja ka ko ms nl oc pt_BR ro ru sk sv tr zh_CN zh_TW" +ALL_LINGUAS="af ar bn ca co cs da de el en_GB es eu fr fur gl he hi hu it ja ka ko lt lv ms my nb ne nl nn no oc pa pl ps pt_BR pt_PT ro ru sk sl sq sv tet th tl tr zh_CN zh_TW" AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [ @@ -310,9 +313,9 @@ AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [ ]) ], [ AS_IF([test "${enable_libtool}" != "no"], [ - VLC_ADD_LDFLAGS([vlc], [${LTLIBINTL}]) + VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}]) ], [ - VLC_ADD_LDFLAGS([vlc], [${LIBINTL}]) + VLC_ADD_LDFLAGS([libvlc vlc], [${LIBINTL}]) ]) ]) AC_SUBST(INCLUDED_LIBINTL) @@ -325,19 +328,19 @@ if test "${SYS}" != "mingwce"; then AS_IF([test "$am_cv_func_iconv" != "yes"], [AC_MSG_ERROR([libiconv is needed for VLC to work properly])]) fi -VLC_ADD_CFLAGS([vlc],[${INCICONV}]) +VLC_ADD_CFLAGS([libvlc],[${INCICONV}]) AS_IF([test "${enable_libtool}" != "no"], [ - VLC_ADD_LDFLAGS([vlc],[${LIBICONV}]) + VLC_ADD_LDFLAGS([libvlc vlc],[${LIBICONV}]) ],[ - VLC_ADD_LDFLAGS([vlc],[${LTLIBICONV}]) + VLC_ADD_LDFLAGS([libvlc vlc],[${LTLIBICONV}]) ]) 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,VLC_ADD_LDFLAGS([vlc],[]), - [VLC_ADD_LDFLAGS([vlc gtk],[-lmingwex])]) + AC_CHECK_LIB(mingw32,opendir,VLC_ADD_LDFLAGS([libvlc],[]), + [VLC_ADD_LDFLAGS([libvlc gtk],[-lmingwex])]) ) fi @@ -439,7 +442,7 @@ fi AC_CHECK_FUNCS(connect,,[ AC_CHECK_LIB(socket,connect,[ - VLC_ADD_LDFLAGS([vlc ipv4 ipv6 cdda cddax],-lsocket) + VLC_ADD_LDFLAGS([libvlc cdda cddax],-lsocket) LIBS_socket="-lsocket" ]) ]) @@ -452,10 +455,10 @@ AC_CHECK_FUNCS(send,,[ AC_CHECK_FUNCS(gethostbyname,,[ AC_CHECK_LIB(nsl,gethostbyname,[ - VLC_ADD_LDFLAGS([cdda cddax ipv4 ipv6 vlc],[-lnsl]) + VLC_ADD_LDFLAGS([cdda cddax libvlc],[-lnsl]) ],[ AC_CHECK_LIB(bind,gethostbyname,[ - VLC_ADD_LDFLAGS([ipv4 access_mms],[-lbind]) + VLC_ADD_LDFLAGS([access_mms],[-lbind]) ]) ]) ]) @@ -540,7 +543,7 @@ fi AC_CHECK_FUNCS(inet_aton,,[ AC_CHECK_LIB(resolv,inet_aton,[ - VLC_ADD_LDFLAGS([ipv4 vlc],[-lresolv]) + VLC_ADD_LDFLAGS([libvlc],[-lresolv]) ]) ]) @@ -553,7 +556,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) - VLC_ADD_LDFLAGS([vlc],[-lgnugetopt])], + VLC_ADD_LDFLAGS([libvlc],[-lgnugetopt])], [need_getopt=:])]) fi AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt}) @@ -564,10 +567,10 @@ AC_CHECK_LIB(m,cos,[ VLC_ADD_LDFLAGS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise],[-lm]) ]) AC_CHECK_LIB(m,pow,[ - VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq vlc freetype mpc dmo quicktime realaudio galaktos],[-lm]) + VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq libvlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm]) ]) AC_CHECK_LIB(m,sqrt,[ - VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex],[-lm]) + VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex mono colorthres],[-lm]) ]) AC_CHECK_LIB(m,ceil,[ VLC_ADD_LDFLAGS([mosaic],[-lm]) @@ -594,7 +597,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 - VLC_ADD_LDFLAGS([vlc],[-ldld])])]) + VLC_ADD_LDFLAGS([libvlc],[-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 @@ -604,7 +607,7 @@ fi # Whatever style if test "${ac_cv_have_plugins}" = "no"; then AC_CHECK_LIB(dld, dld_link, - [VLC_ADD_LDFLAGS([vlc],[-ldld]) + [VLC_ADD_LDFLAGS([libvlc],[-ldld]) AC_DEFINE(HAVE_DL_DLD_LINK, 1, [Define if you have the GNU dld library]) ac_cv_have_plugins=yes]) fi @@ -613,7 +616,7 @@ fi if test "${ac_cv_have_plugins}" = "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then AC_CHECK_LIB(kernel32, main, - [VLC_ADD_LDFLAGS([vlc],[-lkernel32]) + [VLC_ADD_LDFLAGS([libvlc],[-lkernel32]) AC_DEFINE(HAVE_DL_WINDOWS, 1, [Define if you have Windows' LoadLibrary]) ac_cv_have_plugins=yes]) fi @@ -643,10 +646,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 - VLC_ADD_LDFLAGS([vlc],[-ldl]), + VLC_ADD_LDFLAGS([libvlc],[-ldl]), AC_CHECK_LIB(svld, dlopen, ac_cv_my_have_dlopen=yes - VLC_ADD_LDFLAGS([vlc],[-lsvld])))) + VLC_ADD_LDFLAGS([libvlc],[-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 @@ -711,24 +714,24 @@ AC_ARG_ENABLE(st, fi ]) -VLC_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}]) +VLC_ADD_LDFLAGS([libvlc plugin],[${THREAD_LIB}]) dnl Don't link with rt when using GNU-pth if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then AC_CHECK_LIB(rt, clock_nanosleep, [ - VLC_ADD_LDFLAGS([vlc],[-lrt]) + VLC_ADD_LDFLAGS([libvlc],[-lrt]) AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.]) ], [ dnl HP/UX port - AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])]) + AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([libvlc],[-lrt])]) ]) have_nanosleep=false AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ AC_CHECK_LIB(rt,nanosleep, - [VLC_ADD_LDFLAGS([vlc],[-lrt]) have_nanosleep=:], + [VLC_ADD_LDFLAGS([libvlc],[-lrt]) have_nanosleep=:], [AC_CHECK_LIB(posix4,nanosleep, - [VLC_ADD_LDFLAGS([vlc],[-lposix4]) have_nanosleep=:])] + [VLC_ADD_LDFLAGS([libvlc],[-lposix4]) have_nanosleep=:])] ) ]) if ${have_nanosleep}; then @@ -772,6 +775,7 @@ fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" AC_HEADER_TIME +AC_CHECK_TYPE(ssize_t, int) AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])]) dnl Check for dirent @@ -823,14 +827,14 @@ then [ AC_DEFINE( HAVE_HAL_1, [] , [Define if you have the new HAL library API]) AC_DEFINE( HAVE_HAL, [], [Define if you have the HAL library] ) VLC_ADD_PLUGINS([hal probe_hal]) - VLC_ADD_LDFLAGS([vlc hal probe_hal],[$HAL_LIBS]) - VLC_ADD_CFLAGS([vlc hal probe_hal],[$HAL_CFLAGS])], + VLC_ADD_LDFLAGS([libvlc hal probe_hal],[$HAL_LIBS]) + VLC_ADD_CFLAGS([libvlc hal probe_hal],[$HAL_CFLAGS])], dnl No hal 0.5 Test for 0.2 [ PKG_CHECK_MODULES( HAL, hal >= 0.2.97, [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library]) VLC_ADD_PLUGINS([hal]) - VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS]) - VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])], + VLC_ADD_LDFLAGS([libvlc hal],[$HAL_LIBS]) + VLC_ADD_CFLAGS([libvlc hal],[$HAL_CFLAGS])], [AC_MSG_WARN(HAL library not found)]) ] ) @@ -842,26 +846,65 @@ AC_ARG_ENABLE(dbus, if test "${enable_dbus}" != "no" then - PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.92, - [ AC_DEFINE( HAVE_DBUS_2, 1, [Define if you have the D-BUS library API >= 0.92] ) + dnl api stable dbus + PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0.0, + [ AC_DEFINE( HAVE_DBUS_3, 1, [Define if you have the D-BUS library API >= 1.0.0] ) + AC_DEFINE( HAVE_DBUS_2, 1, [Define if you have the D-BUS library API >= 0.92] ) AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the D-BUS library API >= 0.30] ) AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] ) - VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS]) - VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], - dnl older dbus - [ PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.30, - [ AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the D-BUS library API >= 0.30 ] ) - AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] ) - VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS]) - VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], - dnl much older dbus - [ PKG_CHECK_MODULES( DBUS, dbus-1, - [AC_DEFINE(HAVE_DBUS, 1, [Define if you have the D-BUS library]) - VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS]) - VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], - [AC_MSG_WARN(DBUS library not found)]) - ] - )] + VLC_ADD_LDFLAGS([screensaver libvlc],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([screensaver libvlc],[$DBUS_CFLAGS]) + dnl Check for dbus control interface + AC_ARG_ENABLE(dbus-control, [ --enable-dbus-control D-BUS control interface (default disabled)]) + if test "${enable_dbus_control}" = "yes" + then + VLC_ADD_PLUGINS([dbus]) + VLC_ADD_LDFLAGS([dbus],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS]) + fi], + + if ${PKG_CONFIG} --exists dbus-1 + then + [AC_ARG_ENABLE(old-dbus, + [ --enable-old-dbus Deprecated D-Bus support (default disabled)])] + + if test "${enable_old_dbus}" != "yes" + then + echo "" + echo "****** WARNING **** WARNING ***** WARNING *************" + echo "*** Your D-Bus version is < 1.0.0" + echo "*** You are using old and buggy software and so" + echo "*** D-Bus support has been disabled." + echo "*** Please upgrade D-Bus : http://dbus.freedesktop.org" + echo "*** Alternatively you can force the use of your old and" + echo "*** buggy D-Bus version by specifying --enable-old-dbus" + echo "*******************************************************" + echo "" + else + dnl not too old dbus + [ PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.92, + [ AC_DEFINE( HAVE_DBUS_2, 1, [Define if you have the D-BUS library API >= 0.92] ) + AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the D-BUS library API >= 0.30] ) + AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] ) + VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], + dnl older dbus + [ PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.30, + [ AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the D-BUS library API >= 0.30 ] ) + AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] ) + VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], + dnl much older dbus + [ PKG_CHECK_MODULES( DBUS, dbus-1, + [AC_DEFINE(HAVE_DBUS, 1, [Define if you have the D-BUS library]) + VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], + [AC_MSG_WARN(DBUS library not found)]) + ] + )] + )] + fi + fi ) fi @@ -879,97 +922,28 @@ AC_CACHE_CHECK([for ntohl in sys/param.h], [ac_cv_c_ntohl_sys_param_h], [CFLAGS="${CFLAGS_save} -Wall -Werror" AC_TRY_COMPILE([#include ], - [void foo() { int meuh; ntohl(meuh); }], + [int meuh; ntohl(meuh);], ac_cv_c_ntohl_sys_param_h=yes, ac_cv_c_ntohl_sys_param_h=no)]) if test "${ac_cv_c_ntohl_sys_param_h}" != "no"; then AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if defines ntohl.) fi +CFLAGS="${CFLAGS_save}" -# XXX: do this with an M4 macro? -#dnl Check for various -W flags -#for flag in "" all unreachable-code conversion sign-compare disabled-optimization -#do -# AC_CACHE_CHECK([if \$CC accepts -W${flag}], -# [ac_cv_c_W${flag}], -# [CFLAGS="-W${flag} ${CFLAGS_save}" -# AC_TRY_COMPILE([],,ac_cv_c_W${flag}=yes, ac_cv_c_W${flag}=no)]) -# if test "${ac_cv_c_W${flag}}" != "no"; then -# CFLAGS_save="-W${flag} ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" -# CXXFLAGS_save="-W${flag} ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" -# OBJCFLAGS_save="-W${flag} ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" -# fi -#done - -AC_CACHE_CHECK([if $CC accepts -Wall], - [ac_cv_c_Wall], - [CFLAGS="-Wall ${CFLAGS_save}" - AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)]) - -AC_CACHE_CHECK([if $CC accepts -Wextra], - [ac_cv_c_Wextra], - [CFLAGS="-Wextra ${CFLAGS_save}" - AC_TRY_COMPILE([],,ac_cv_c_Wextra=yes, ac_cv_c_Wextra=no)]) - -AC_CACHE_CHECK([if $CC accepts -Wno-unused-parameter], - [ac_cv_c_Wno_unused_parameter], - [CFLAGS="-Wno-unused-parameter ${CFLAGS_save}" - AC_TRY_COMPILE([],,ac_cv_c_Wno_unused_parameter=yes, ac_cv_c_Wno_unused_parameter=no)]) - -AC_CACHE_CHECK([if $CC accepts -Wconversion], - [ac_cv_c_Wconversion], - [CFLAGS="-Wconversion ${CFLAGS_save}" - AC_TRY_COMPILE([],,ac_cv_c_Wconversion=yes, ac_cv_c_Wconversion=no)]) - -AC_CACHE_CHECK([if $CC accepts -Wunreachable-code], - [ac_cv_c_Wunreachable_code], - [CFLAGS="-Wunreachable-code ${CFLAGS_save}" - AC_TRY_COMPILE([],,ac_cv_c_Wunreachable_code=yes, ac_cv_c_Wunreachable_code=no)]) - -AC_CACHE_CHECK([if $CC accepts -Wsign-compare], - [ac_cv_c_Wsign_compare], - [CFLAGS="-Wsign-compare ${CFLAGS_save}" - AC_TRY_COMPILE([],,ac_cv_c_Wsign_compare=yes, ac_cv_c_Wsign_compare=no)]) - -if test "${ac_cv_c_Wall}" != "no"; then - CFLAGS_save="-Wall ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="-Wall ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" -fi - -if test "${ac_cv_c_Wextra}" != "no"; then - CFLAGS_save="-Wextra ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="-Wextra ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="-Wextra ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" -fi - -if test "${ac_cv_c_Wno_unused_parameter}" != "no"; then - CFLAGS_save="${CFLAGS_save} -Wno-unused-parameter"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="${CFLAGS_save} -Wno-unused-parameter"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="${OBJCFLAGS_save} -Wno-unused-parameter "; OBJCFLAGS="${OBJCFLAGS_save}" -fi - -if test "${ac_cv_c_Wsign_compare}" != "no"; then - CFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="-Wsign-compare ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" -fi - -dnl Check for -pipe -AC_CACHE_CHECK([if \$CC accepts -pipe], - [ac_cv_c_pipe], - [CFLAGS="${CFLAGS_save} -pipe" - AC_TRY_COMPILE([],,ac_cv_c_pipe=yes, ac_cv_c_pipe=no)]) -if test "${ac_cv_c_pipe}" != "no"; then - CFLAGS_save="${CFLAGS_save} -pipe"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="${CXXFLAGS_save} -pipe"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="${OBJCFLAGS_save} -pipe"; OBJCFLAGS="${OBJCFLAGS_save}" -fi +RDC_PROG_CC_WFLAGS([all extra no-unused-parameter sign-compare undef pointer-arith bad-function-cast cast-align write-strings old-style-definition missing-prototypes volatile-register-var]) +RDC_PROG_CC_FLAGS_IFELSE([-pipe]) + +dnl This helps detect broken plugins with undefined symbols +dnl Better fail loudly at build-time than silenty at run-time. +RDC_PROG_LINK_FLAGS_IFELSE([-Wl,-z,defs], [ + VLC_ADD_LDFLAGS([plugin],[-Wl,-z,defs]) +]) dnl Check for various optimization flags AC_CACHE_CHECK([if \$CC accepts -Os], [ac_cv_c_os], [CFLAGS="${CFLAGS_save} -Os" AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)]) -if test "${ac_cv_c_os}" != "no" -a "${target_cpu}" = "mipsel"; then +if test "${ac_cv_c_os}" != "no" -a "${host_cpu}" = "mipsel"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -Os" fi @@ -977,7 +951,7 @@ AC_CACHE_CHECK([if \$CC accepts -O3], [ac_cv_c_o3], [CFLAGS="${CFLAGS_save} -O3" AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) -if test "${ac_cv_c_o3}" != "no" -a "${target_cpu}" != "mipsel"; then +if test "${ac_cv_c_o3}" != "no" -a "${host_cpu}" != "mipsel"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3" fi @@ -985,7 +959,7 @@ AC_CACHE_CHECK([if \$CC accepts -O2], [ac_cv_c_o2], [CFLAGS="${CFLAGS_save} -O2" AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)]) -if test "${ac_cv_c_o2}" != "no" -a "${target_cpu}" != "mipsel"; then +if test "${ac_cv_c_o2}" != "no" -a "${host_cpu}" != "mipsel"; then if test "${ac_cv_c_o3}" = "no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2" fi @@ -995,7 +969,7 @@ else [ac_cv_c_o], [CFLAGS="${CFLAGS_save} -O" AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)]) - if test "${ac_cv_c_o}" != "no" -a "${target_cpu}" != "mipsel"; then + if test "${ac_cv_c_o}" != "no" -a "${host_cpu}" != "mipsel"; then if test "${ac_cv_c_o3}" = "no"; then CFLAGS_OPTIM="${CFLAGS_OPTIM} -O" fi @@ -1057,17 +1031,19 @@ 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 - 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 - VLC_ADD_LDFLAGS([plugin mozilla],[-shared]) - fi -fi +AS_IF([test "${enable_libtool}" = "no"], [ + AS_IF([test "${SYS}" = "beos"], [ + VLC_ADD_LDFLAGS([plugin mozilla],[-nostart]) + ], [ + 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)]) + AS_IF([test "${ac_cv_ld_plugins}" != "no"], [ + VLC_ADD_LDFLAGS([plugin mozilla],[-shared]) + ]) + ]) +]) dnl Check for variadic macros AC_CACHE_CHECK([for variadic cpp macros], @@ -1125,12 +1101,12 @@ fi dnl dnl Check the CPU dnl -case "${target_cpu}" in +case "${host_cpu}" in "") ARCH=unknown ;; *) - ARCH="${target_cpu}" + ARCH="${host_cpu}" ;; esac @@ -1148,31 +1124,30 @@ dnl dnl default modules dnl VLC_ADD_PLUGINS([dummy logger memcpy]) -VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf mp4 rawdv nsv real aiff mjpeg demuxdump flac tta]) -VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flacdec]) +VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf mp4 rawdv nsv real aiff mjpeg demuxdump flacsys tta]) +VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flac]) VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise]) -VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32 mono]) +VLC_ADD_PLUGINS([converter_fixed mono]) VLC_ADD_PLUGINS([trivial_resampler ugly_resampler]) VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer]) VLC_ADD_PLUGINS([playlist export sgimb nsc xtag]) -VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo magnify]) +VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo magnify puzzle colorthres]) VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv]) VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp]) -VLC_ADD_PLUGINS([access_http access_mms access_ftp ipv4]) +VLC_ADD_PLUGINS([access_http access_mms access_ftp]) VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) if test "${SYS}" != "mingwce"; then -dnl VLC_ADD_PLUGINS([externrun]) - VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record]) + VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record access_filter_dump]) VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf marq podcast shout sap fake folder]) VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop]) VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga]) VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler]) VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer]) VLC_ADD_PLUGINS([dolby_surround_decoder headphone_channel_mixer normvol equalizer param_eq]) - VLC_ADD_PLUGINS([fixed32tofloat32 float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif s16tofloat32 s16tofloat32swab s8tofloat32 u8tofloat32 audio_format]) + VLC_ADD_PLUGINS([converter_float a52tospdif dtstospdif audio_format]) fi dnl @@ -1297,7 +1272,7 @@ if test "${ac_cv_altivec_inline}" != "no"; then 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}]) + VLC_ADD_CFLAGS([libvlc],[${ac_cv_altivec_inline}]) fi ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" fi @@ -1316,12 +1291,12 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], [ac_cv_c_altivec], [# OS X/PPC test (gcc 4.x) CFLAGS="${CFLAGS_save} -mpim-altivec -force_cpusubtype_ALL" - AC_TRY_COMPILE([], + AC_TRY_COMPILE([vector unsigned char foo;], [vec_ld(0, (unsigned char *)0);], [ac_cv_c_altivec="-mpim-altivec -force_cpusubtype_ALL"], [# OS X/PPC test (gcc 3.x) CFLAGS="${CFLAGS_save} -faltivec" - AC_TRY_COMPILE([], + AC_TRY_COMPILE([vector unsigned char foo;], [vec_ld(1 * sizeof(vector float), (unsigned char *)0);], [ac_cv_c_altivec="-faltivec"], dnl Below this are the Linux tests @@ -1357,7 +1332,7 @@ CPPFLAGS="${CPPFLAGS_save}" if test "${ac_cv_c_altivec}" != "no"; then AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.) - VLC_ADD_CFLAGS([vlc],[${ac_cv_c_altivec}]) + VLC_ADD_CFLAGS([libvlc],[${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}]) if test "${ac_cv_altivec_inline}" = "no"; then @@ -1372,7 +1347,7 @@ AC_CACHE_CHECK([if linker needs -framework vecLib], LDFLAGS="${LDFLAGS_save}" ]) if test "${ac_cv_ld_altivec}" != "no"; then - VLC_ADD_LDFLAGS([vlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib]) + VLC_ADD_LDFLAGS([libvlc idctaltivec motionaltivec memcpyaltivec],[-framework vecLib]) fi fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" @@ -1390,13 +1365,13 @@ if test -n "${with_tuning}"; then CFLAGS_TUNING="-mtune=${with_tuning}" fi else - if test "${SYS}" = "darwin" -a "${target_cpu}" = "i686"; then + if test "${SYS}" = "darwin" -a "${host_cpu}" = "i686"; then CFLAGS_TUNING="-march=pentium-m -mtune=prescott" - elif test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "i486" -o "${target_cpu}" = "i386"; then + elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then CFLAGS_TUNING="-mtune=pentium2" - elif test "${target_cpu}" = "x86_64"; then + elif test "${host_cpu}" = "x86_64"; then CFLAGS_TUNING="-mtune=athlon64" - elif test "${target_cpu}" = "powerpc"; then + elif test "${host_cpu}" = "powerpc"; then CFLAGS_TUNING="-mtune=G4"; fi fi @@ -1420,7 +1395,7 @@ AS_IF([test "${CFLAGS_TUNING}"], dnl dnl x86 accelerations dnl -if test "${target_cpu}" = "i686" -o "${target_cpu}" = "i586" -o "${target_cpu}" = "x86" -o "${target_cpu}" = "i386" -o "${target_cpu}" = "x86_64" +if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}" = "x86_64" then ARCH="${ARCH} mmx" VLC_ADD_BUILTINS([${ACCEL_MODULES}]) @@ -1449,7 +1424,7 @@ AC_ARG_ENABLE(altivec, [ --disable-altivec disable AltiVec optimizations (default enabled on PPC)], [ if test "${enable_altivec}" = "yes"; then ARCH="${ARCH} altivec"; VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi ], -[ if test "${target_cpu}" = "powerpc"; then ARCH="${ARCH} altivec"; +[ if test "${host_cpu}" = "powerpc"; then ARCH="${ARCH} altivec"; VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi ]) dnl @@ -1490,8 +1465,9 @@ then VLC_ADD_PLUGINS([packetizer_copy]) 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 stream_out_bridge stream_out_mosaic_bridge]) + VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge stream_out_autodel]) # VLC_ADD_PLUGINS([stream_out_transrate]) +# VLC_ADD_PLUGINS([rtcp]) VLC_ADD_PLUGINS([profile_parser]) AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support) @@ -1549,7 +1525,7 @@ dnl AC_ARG_ENABLE(notify, [ --enable-notify libnotify notification plugin (default enabled)]) -AS_IF([test "${enable_notify}" != "no"], [ +AS_IF([test "${enable_notify}" != "no" -a "${SYS}" != "mingw32"], [ PKG_CHECK_MODULES(NOTIFY, libnotify, [ VLC_ADD_PLUGINS([notify]) @@ -1566,7 +1542,7 @@ dnl Audioscrobbler plugin dnl AC_ARG_ENABLE(audioscrobbler, - [ --enable-audioscrobbler Last.fm submission plugin (default enabled)]) + [ --disable-audioscrobbler Last.fm submission plugin (default enabled)]) AS_IF([test "${enable_audioscrobbler}" != "no"], [ VLC_ADD_PLUGINS([audioscrobbler]) ]) @@ -1699,6 +1675,37 @@ if test "${enable_live555}" != "no"; then fi fi +dnl +dnl special access module for dc1394 input +dnl +AC_ARG_ENABLE(dc1394, + [ --enable-dc1394 dc1394 access module (default disabled)]) +if test "${enable_dc1394}" = "yes" +then + AC_CHECK_HEADERS(libraw1394/raw1394.h, [ + AC_CHECK_LIB( raw1394, raw1394_get_nodecount, [ + AC_CHECK_HEADERS(libdc1394/dc1394_control.h , [ +dnl AC_CHECK_LIB( dc1394_control, dc1394_setup_capture, [ + VLC_ADD_PLUGINS([dc1394]) + VLC_ADD_LDFLAGS([dc1394],[-ldc1394_control -lraw1394]) +dnl ], +dnl [ +dnl AC_MSG_ERROR([libdc1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) +dnl ]) + ], + [ + AC_MSG_ERROR([libdc1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) + ]) + ], + [ + AC_MSG_ERROR([libraw1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) + ]) + ], + [ + AC_MSG_ERROR([libraw1394 is mandatory for the dc1394 input module. try --disable-dc1394 or install this library]) + ]) +fi + dnl dnl dv module: digital video module check for libraw1394 dnl @@ -2164,16 +2171,16 @@ have_libcdio=no have_libvcdinfo=no if test "${enable_libcdio}" != "no" then - PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.72, + PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.78.2, have_libcdio=yes AC_DEFINE(HAVE_LIBCDIO, [], - [Define if you have libcdio 0.72 or greater installed]), + [Define if you have libcdio 0.78.2 or greater installed]), [AC_MSG_WARN(CD Reading and information library not found)]) - PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21, + PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.22, [have_libvcdinfo=yes AC_DEFINE(HAVE_VCDINFO, [], - [Define if you have libvcdinfo 0.7.21 or greater installed])], + [Define if you have libvcdinfo 0.7.22 or greater installed])], [AC_MSG_WARN(VCD information library not found)]) fi @@ -2377,22 +2384,6 @@ AC_CHECK_FUNCS(inet_pton,[have_ipv6=yes],[ AS_IF([test "${have_ipv6}" = "yes"], [ AC_DEFINE(HAVE_INET_PTON, 1, [Define to 1 if you have inet_pton().])]) -if test "${SYS}" != "nto" && - test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -then - 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=no]) - AS_IF([test "${have_ipv6}" != "no"], [ - VLC_ADD_PLUGINS([ipv6])]) -fi -if test "${SYS}" = "mingw32" -then - AC_MSG_CHECKING(for getaddrinfo in ws2tcpip.h) - AC_EGREP_HEADER(addrinfo,ws2tcpip.h,[AC_MSG_RESULT(yes) - VLC_ADD_PLUGINS([ipv6])],[AC_MSG_RESULT(no)]) -fi - dnl dnl ogg demux plugin dnl @@ -2457,7 +2448,7 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then #endif], [AC_MSG_RESULT([yes]) AC_CHECK_HEADERS(matroska/KaxVersion.h, [ - AC_MSG_CHECKING(for libmatroska version >= 0.7.5) + AC_MSG_CHECKING(for libmatroska version >= 0.7.7) AC_EGREP_CPP(yes, [#include #ifdef LIBMATROSKA_VERSION @@ -2472,16 +2463,14 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then VLC_ADD_CXXFLAGS([mkv],[-O1]) fi AC_CHECK_LIB(ebml_pic, main, [ - # We have ebml_pic, that's good, we can build an mkv.so plugin ! VLC_ADD_PLUGINS([mkv]) - VLC_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic]) - ], [ + VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml_pic]) + ], AC_CHECK_LIB(ebml, main, [ - # We only have libebml, make mkv.a a builtin - VLC_ADD_BUILTINS([mkv]) + VLC_ADD_PLUGINS([mkv]) VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml]) - ]) - ]) + ]) + ) ], [AC_MSG_RESULT([no]) AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.]) @@ -2519,8 +2508,8 @@ then dnl Use a custom mod AC_MSG_RESULT(${real_mod_tree}/src/.libs/libmodplug.a) VLC_ADD_PLUGINS([mod]) - VLC_ADD_LDFLAGS([mod],[${real_mod_tree}/src/.libs/libmodplug.a]) - VLC_ADD_CFLAGS([mod],[-I${real_mod_tree}/include]) + VLC_ADD_LDFLAGS([mod],[${real_mod_tree}/src/.libs/libmodplug.a -lstdc++]) + VLC_ADD_CXXFLAGS([mod],[-I${real_mod_tree}/include]) else dnl The given mod wasn't built AC_MSG_RESULT(no) @@ -2530,7 +2519,7 @@ then AC_CHECK_HEADERS(libmodplug/modplug.h, [ VLC_ADD_PLUGINS([mod]) VLC_ADD_CXXFLAGS([mod],[]) - VLC_ADD_LDFLAGS([mod],[-lmodplug])]) + VLC_ADD_LDFLAGS([mod],[-lmodplug -lstdc++])]) fi fi @@ -2808,6 +2797,12 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat ${real_ffmpeg_tree}/libavformat/libavformat.a]) VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavformat]) fi + + if test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"; then + AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.]) + VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libswscale ${real_ffmpeg_tree}/libswscale/libswscale.a]) + VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libswscale]) + fi else dnl Look for a ffmpeg-config (we are on debian ) @@ -2822,10 +2817,10 @@ dnl Look for a ffmpeg-config (we are on debian ) 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(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) AC_CHECK_HEADERS(ffmpeg/avformat.h) AC_CHECK_HEADERS(ffmpeg/avutil.h) - AC_CHECK_HEADERS(postproc/postprocess.h) + AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) VLC_ADD_PLUGINS([ffmpeg]) if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then VLC_ADD_PLUGINS([stream_out_switcher]) @@ -2838,10 +2833,20 @@ dnl Look for a ffmpeg-config (we are on debian ) dnl Trying with pkg-config PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], [ - AC_CHECK_HEADERS(ffmpeg/avcodec.h) + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}" + CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}" + AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) AC_CHECK_HEADERS(ffmpeg/avformat.h) AC_CHECK_HEADERS(ffmpeg/avutil.h) - AC_CHECK_HEADERS(postproc/postprocess.h) + dnl newer ffmpeg have a separate libpostproc + PKG_CHECK_MODULES(POSTPROC, libpostproc,[ + VLC_ADD_CFLAGS([ffmpeg],[${POSTPROC_CFLAGS}]) + VLC_ADD_LDFLAGS([ffmpeg],[${POSTPROC_LIBS}]) + ],[ true ]) + CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}" + CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" + AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) if test "${SYS}" = "darwin"; then VLC_ADD_BUILTINS([ffmpeg]) else @@ -2856,10 +2861,13 @@ dnl Trying with pkg-config fi VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}]) VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}]) - dnl newer ffmpeg have a separate libpostproc - PKG_CHECK_MODULES(POSTPROC, libpostproc,[ - VLC_ADD_LDFLAGS([ffmpeg],[${POSTPROC_LIBS}]) + dnl even newer ffmpeg has a libswscale + PKG_CHECK_MODULES(SWSCALE, libswscale,[ + VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}]) + VLC_ADD_LDFLAGS([ffmpeg],[${SWSCALE_LIBS}]) + AC_CHECK_HEADERS(ffmpeg/swscale.h) ],[ true ]) + VLC_RESTORE_FLAGS ],[ dnl @@ -2869,6 +2877,7 @@ dnl Trying with pkg-config LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) AC_CHECK_HEADERS(ffmpeg/avformat.h) + AC_CHECK_HEADERS(ffmpeg/swscale.h) AC_CHECK_HEADERS(ffmpeg/avutil.h) AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) @@ -2894,6 +2903,11 @@ dnl Trying with pkg-config VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL]) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" + + AC_CHECK_LIB(swscale, sws_getContext, [ + VLC_ADD_LDFLAGS([ffmpeg],[-lswscale]) ], [], [-lavcodec $LDAVUTIL]) + LDFLAGS="${LDFLAGS_save}" + CPPFLAGS="${CPPFLAGS_save}" ]) fi fi @@ -3153,7 +3167,9 @@ then 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.]) - ]) + ]) + ],[ + 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.]) ]) CPPFLAGS="${CPPFLAGS_save}" LDFLAGS="${LDFLAGS_save}" @@ -3192,7 +3208,7 @@ if test "${enable_dts}" != "no"; then LDFLAGS="${LDFLAGS_save} ${LDFLAGS_dtstofloat32}" AC_CHECK_LIB(dts_pic, dts_free, [ VLC_ADD_PLUGINS([dtstofloat32]) - VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic]) + VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic -lm]) ],[ AC_CHECK_LIB(dts, dts_free, [ VLC_ADD_BUILTINS([dtstofloat32]) @@ -3205,7 +3221,7 @@ if test "${enable_dts}" != "no"; then AC_MSG_ERROR([the specified tree hasn't been compiled]) fi ]) - ]) + ], [-lm]) LDFLAGS="${LDFLAGS_save}" else AC_MSG_RESULT(no) @@ -3216,7 +3232,7 @@ if test "${enable_dts}" != "no"; then AC_CHECK_HEADERS(dts.h, [ AC_CHECK_LIB(dts_pic, dts_free, [ VLC_ADD_PLUGINS([dtstofloat32]) - VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic]) + VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic -lm]) ],[ AC_CHECK_LIB(dts, dts_free, [ VLC_ADD_BUILTINS([dtstofloat32]) @@ -3226,7 +3242,7 @@ if test "${enable_dts}" != "no"; then AC_MSG_ERROR([Could not find libdts on your system: you may get it from http://www.videolan.org/dtsdec.html]) fi ]) - ]) + ], [-lm]) ]) LDFLAGS="${LDFLAGS_save}" fi @@ -3236,7 +3252,7 @@ dnl dnl Flac plugin dnl AC_ARG_ENABLE(flac, - [ --enable-flac flac decoder support (default disabled)]) + [ --enable-flac libflac decoder/encoder support (default disabled)]) if test "${enable_flac}" = "yes" then AC_ARG_WITH(flac-tree, @@ -3255,8 +3271,8 @@ then then dnl Use a custom flac AC_MSG_RESULT(${real_flac_tree}/src/libFLAC/.libs/libFLAC.a) - VLC_ADD_LDFLAGS([flacdec],[${real_flac_tree}/src/libFLAC/.libs/libFLAC.a]) - VLC_ADD_CFLAGS([flacdec],[-I${real_flac_tree}/include]) + VLC_ADD_LDFLAGS([flac],[${real_flac_tree}/src/libFLAC/.libs/libFLAC.a]) + VLC_ADD_CFLAGS([flac],[-I${real_flac_tree}/include]) AC_DEFINE(HAVE_FLAC_STREAM_DECODER_H, 1, [Define if you have FLAC]) else dnl The given flac wasn't built @@ -3265,7 +3281,7 @@ then fi else AC_CHECK_HEADERS(FLAC/stream_decoder.h, [ - VLC_ADD_LDFLAGS([flacdec],[-lFLAC]) + VLC_ADD_LDFLAGS([flac],[-lFLAC]) ],[]) fi fi @@ -3357,10 +3373,10 @@ then else AC_CHECK_HEADERS(vorbis/codec.h, [ VLC_ADD_PLUGINS([vorbis]) - VLC_ADD_LDFLAGS([vorbis],[-lvorbis -logg]) ],[]) + VLC_ADD_LDFLAGS([vorbis],[-lvorbis -logg -lm]) ],[]) AC_CHECK_HEADERS(vorbis/vorbisenc.h, [ - VLC_ADD_LDFLAGS([vorbis],[-lvorbisenc]) ],[]) + VLC_ADD_LDFLAGS([vorbis],[-lvorbisenc -lm]) ],[]) fi fi @@ -3651,11 +3667,34 @@ if test "${enable_glx}" != "no" && (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || test "${enable_glx}" = "yes"); then CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" - AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h, [ + AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h) + AC_COMPILE_IFELSE(AC_LANG_PROGRAM( + [[#if !defined(HAVE_X11_XLIB_H) || !defined(HAVE_GL_GLU_H) || !defined(HAVE_GL_GLX_H) + choke me + #endif]]), + [ VLC_ADD_PLUGINS([glx]) VLC_ADD_LDFLAGS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU]) VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}]) - ]) + ],[AC_MSG_ERROR([Please install GL development package. Alternatively you can also configure with --disable-glx.])]) + CPPFLAGS="${CPPFLAGS_save}" +fi + +dnl +dnl XVMC module +dnl (enabled by default except on win32) +dnl +AC_ARG_ENABLE(xvmc, + [ --enable-xvmc XVMC support (default disabled)]) +if test "${enable_xvmc}" = "yes" && + (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || + test "${enable_xvmc}" = "yes"); then + CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}" + AC_CHECK_HEADERS(X11/extensions/vldXvMC.h, [ + VLC_ADD_PLUGINS([xvmc]) + VLC_ADD_LDFLAGS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) + VLC_ADD_CPPFLAGS([xvmc],[${X_CFLAGS}]) + ]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -4190,7 +4229,7 @@ then ],[ AC_MSG_ERROR([You don't have libglide. Install it or do not use --enable-glide]) ]) - CFAGS="${CFLAGS_save}" + CFLAGS="${CFLAGS_save}" fi dnl @@ -4330,7 +4369,7 @@ then AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API #define ALSA_PCM_NEW_SW_PARAMS_API #include ], - [void foo() { snd_pcm_hw_params_get_period_time(0,0,0); }], + [snd_pcm_hw_params_get_period_time(0,0,0);], AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4)) VLC_ADD_PLUGINS([alsa]) VLC_ADD_LDFLAGS([alsa],[-lasound -lm -ldl]) @@ -4483,7 +4522,7 @@ AS_IF([test "x${enable_upnp}" != "xno"], [ AC_MSG_ERROR([cannot find Intel UPnP SDK (libupnp)]) ]) AS_IF([test "${has_upnp}" = "yes"], [ - VLC_ADD_LDFLAGS([upnp_intel], [-lupnp]) + VLC_ADD_LDFLAGS([upnp_intel], [-lupnp -lixml]) ]) ], [ has_upnp="no" @@ -4735,6 +4774,18 @@ then fi VLC_ADD_LDFLAGS([wxwidgets],[`${WX_CONFIG} --libs`]) VLC_ADD_CXXFLAGS([wxwidgets],[`${WX_CONFIG} --cxxflags`]) + # check if we must link against gtk2 libs + # if __WXGTK20__ && __WXGTK__ are defined + # for modules/gui/wxwidgets/video.cpp + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +#include +#ifdef __WXGTK20__ +#error ok, we need to link against gtk2 +#endif + ])],[WXGTK=no],[WXGTK=yes]) + if test "$WXGTK" = "yes"; then + ${PKG_CONFIG} --exists gtk+-2.0 && VLC_ADD_LDFLAGS([wxwidgets],[`$PKG_CONFIG --libs gtk+-2.0`]) + fi if ${WX_CONFIG} --unicode then # wxwidgets should provide the following flags but does not @@ -4772,6 +4823,8 @@ then CPPFLAGS="${CPPFLAGS_save}" AC_LANG_POP(C++) fi + dnl WxWidgets plugin will yield incorrect code without this + VLC_ADD_CXXFLAGS([wxwidgets], [-fno-strict-aliasing]) fi dnl @@ -4971,7 +5024,7 @@ then AC_CHECK_LIB(xosd,xosd_set_horizontal_offset, AC_DEFINE(HAVE_XOSD_VERSION_2, 1, Define if is 2.0.x), AC_TRY_COMPILE([#include ], - [void foo() { xosd_init("foo","bar",12,XOSD_top,2,12,42); }],, + [xosd_init("foo","bar",12,XOSD_top,2,12,42);],, AC_DEFINE(HAVE_XOSD_VERSION_0, 1, Define if is pre-1.0.0)))) if test "${have_xosd}" = "true" then @@ -5062,20 +5115,6 @@ then fi fi -dnl -dnl DAAP access plugin and services discovery -dnl -AC_ARG_ENABLE(daap, - [ --enable-daap DAAP shares services discovery support (default enabled)]) -if test "$enable_daap" != "no" -then - PKG_CHECK_MODULES(DAAP, opendaap >= 0.3.0, - [ VLC_ADD_PLUGINS([daap]) - VLC_ADD_LDFLAGS([daap],[$DAAP_LIBS]) - VLC_ADD_CFLAGS([daap],[$DAAP_CFLAGS])]:, - [AC_MSG_WARN(DAAP library not found)]) -fi - dnl dnl Bonjour services discovery dnl @@ -5129,6 +5168,9 @@ AS_IF([test "${enable_gnutls}" != "no"], [ AC_MSG_ERROR([gnutls not present or too old (version 1.2.9 required)]) ]) ]) + AC_CHECK_LIB([gcrypt], [gcry_control], [ + VLC_ADD_LDFLAGS([gnutls], [-lgcrypt]) + ]) ]) @@ -5199,13 +5241,13 @@ AC_ARG_ENABLE(loader, [ --enable-loader build DLL loader for ELF i386 platforms (default disabled)]) AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) AS_IF([test "${enable_loader}" = "yes"], - [ VLC_ADD_PLUGINS([dmo quicktime]) + [ VLC_ADD_PLUGINS([dmo]) VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/loader]) - VLC_ADD_LDFLAGS([dmo],[../../../loader/libloader.la]) + VLC_ADD_LDFLAGS([dmo],[../../../loader/libloader.la -lpthread]) VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/loader]) - VLC_ADD_LDFLAGS([quicktime],[../../loader/libloader.la]) + VLC_ADD_LDFLAGS([quicktime],[../../loader/libloader.la -lpthread]) VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/loader -DLOADER]) - VLC_ADD_LDFLAGS([realaudio],[../../loader/libloader.la]) + VLC_ADD_LDFLAGS([realaudio],[../../loader/libloader.la -ldl -lpthread]) ]) dnl @@ -5259,12 +5301,12 @@ AC_ARG_ENABLE(mozilla, [ --enable-mozilla build a vlc-based Mozilla plugin (default disabled)]) AC_ARG_WITH(mozilla-sdk-path, [ --with-mozilla-sdk-path=PATH path to mozilla sdk]) - +AC_LANG_PUSH(C++) if test "${enable_mozilla}" = "yes" then dnl currently vlc plugin only needs headers, no xpcom support apis are actually used need_xpcom_libs=false - if test "${with_mozilla_sdk_path}" = "" + if test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no" then AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no) if test "${MOZILLA_CONFIG}" = "no" @@ -5307,17 +5349,21 @@ then VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin`]) fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}" - AC_CHECK_HEADERS(mozilla-config.h) + MOZILLA_REQUIRED_HEADERS=1 + AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0) + AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0) + AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0, + [#if HAVE_NPAPI_H + # include + #endif + ]) + if test "${MOZILLA_REQUIRED_HEADERS}" = "0" + then + AC_MSG_ERROR([Please install the Mozilla development tools, required headers were not found.]) + fi + MOZILLA_REQUIRED_HEADERS= CPPFLAGS="${CPPFLAGS_save}" MOZILLA_SDK_PATH="`${MOZILLA_CONFIG} --prefix`" - XPIDL_INCL="`${MOZILLA_CONFIG} --cflags plugin xpcom java` \ - `${MOZILLA_CONFIG} --idlflags plugin xpcom java` " - if ${have_xul} - then - xpidl_path="`${MOZILLA_CONFIG} --prefix`/lib/xulrunner" - else - xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin" - fi dnl End of moz_sdk = "" else dnl special case for mingw32 @@ -5332,39 +5378,40 @@ then real_mozilla_sdk="`cd ${with_mozilla_sdk_path} 2>/dev/null && pwd`" CPPFLAGS="${CPPFLAGS_save} -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include" - AC_CHECK_HEADERS(mozilla-config.h, [ - mozilla=: - VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -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]) - if ${need_xpcom_libs}; then - 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 -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue]) - if test "${SYS}" = "mingw32"; then - dnl latest gecko sdk does not have embedstring - if test -d "${real_mozilla_sdk}/embedstring/bin" - then - VLC_ADD_LDFLAGS([mozilla],[-lembedstring -Wl,--kill-at]) - fi - fi - fi - - MOZILLA_SDK_PATH="${real_mozilla_sdk}" - XPIDL_INCL="-I${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl" - xpidl_path="${real_mozilla_sdk}${mozilla_sdk_xpcom}/bin" + MOZILLA_REQUIRED_HEADERS=1 + AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0) + AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0) + AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0, + [#if HAVE_NPAPI_H + #include + #endif + ]) + if test "${MOZILLA_REQUIRED_HEADERS}" = "0" + then + AC_MSG_ERROR([Please install the Mozilla development tools, required headers were not found.]) + fi + MOZILLA_REQUIRED_HEADERS= + mozilla=: + VLC_ADD_CPPFLAGS([mozilla],[-DXPCOM_GLUE -DHAVE_CPP_MODERN_SPECIALIZE_TEMPLATE_SYNTAX -I${real_mozilla_sdk} -I${real_mozilla_sdk}/include -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]) + if ${need_xpcom_libs}; then + 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 -L${real_mozilla_sdk}/lib -lnspr4 -lplds4 -lplc4 -lxpcomglue]) + if test "${SYS}" = "mingw32"; then + dnl latest gecko sdk does not have embedstring + if test -d "${real_mozilla_sdk}/embedstring/bin" + then + VLC_ADD_LDFLAGS([mozilla],[-lembedstring -Wl,--kill-at]) + fi + fi + fi + MOZILLA_SDK_PATH="${real_mozilla_sdk}" - if test -n "${CYGPATH}"; then - real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`" - XPIDL_INCL="${XPIDL_INCL} -I\"${real_mozilla_sdk}${mozilla_sdk_xpcom}/idl\"" - fi ]) + if test -n "${CYGPATH}"; then + real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`" + fi CPPFLAGS="${CPPFLAGS_save}" fi - - if test "${enable_mozilla}" != "false" - then - AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla:/usr/lib/xulrunner:/usr/lib64/xulrunner) - if test "${XPIDL}" = "no"; then - AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.]) - fi - fi fi +AC_LANG_POP(C++) AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) dnl @@ -5414,7 +5461,7 @@ dnl if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" then AC_CHECK_LIB(unicows, LoadUnicowsSymbol, [ - VLC_ADD_LDFLAGS([vlc],[-Wl,--exclude-libs,libunicows.a -lunicows]) + VLC_ADD_LDFLAGS([vlc libvlc],[-Wl,--exclude-libs,libunicows.a -lunicows]) ]) fi @@ -5487,29 +5534,12 @@ then plugin_support=false fi -dnl Export automake variables -if ${plugin_support} -then +AS_IF([${plugin_support}], [ AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins) - for plugin in `echo ${PLUGINS}` - do - eval "${plugin}_p=yes" - done -else +], [ VLC_ADD_BUILTINS([${PLUGINS}]) PLUGINS="" -fi -AM_CONDITIONAL(HAVE_PLUGINS, ${plugin_support}) - -[if echo "${BUILTINS}" | grep '[^ ]' >/dev/null 2>&1 -then - builtin_support=: - for builtin in `echo ${BUILTINS}` - do - eval "${builtin}_b=yes" - done -fi] -AM_CONDITIONAL(HAVE_BUILTINS, ${builtin_support}) +]) dnl dnl Pic and shared libvlc stuff @@ -5518,10 +5548,14 @@ AS_IF([test "x${enable_shared_libvlc}" = "x"], [enable_shared_libvlc=no]) AM_CONDITIONAL(BUILD_SHARED, [test "${enable_shared_libvlc}" != "no"]) AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no"], [ AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.]) - FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"], - FILE_LIBVLC_DLL="" ) + FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll" + VLC_ADD_PLUGINS([${BUILTINS}]) + BUILTINS="" +], [ + FILE_LIBVLC_DLL="" +]) -dnl Import conditional variables generated by bootstrap + dnl Import conditional variables generated by bootstrap VLC_CONDITIONALS dnl @@ -5547,8 +5581,8 @@ dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`" dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions]) dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions]) -dnl New definitions with value matching 0.8.6 release -module_symbol="0_8_6c" +dnl New definitions with value matching 0.9.0 release +module_symbol="0_9_0b" AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions]) AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions]) VLC_ENTRY="vlc_entry__${module_symbol}" @@ -5569,7 +5603,7 @@ VLC_RESTORE_FLAGS dnl dnl Create the vlc-config script dnl -LDFLAGS_libvlc="${LDFLAGS_vlc} ${LDFLAGS_builtin}" +LDFLAGS_libvlc="${LDFLAGS_libvlc} ${LDFLAGS_builtin}" for i in `echo "${BUILTINS}" | sed -e 's@[^ ]*/@@g'` ; do LDFLAGS_libvlc="${LDFLAGS_libvlc} ${libdir}/vlc/${i}.a `eval echo '$'{LDFLAGS_${i}}`" ; done dnl @@ -5585,8 +5619,6 @@ AC_SUBST(UIC) AC_SUBST(WINDRES) AC_SUBST(MOZILLA_SDK_PATH) AC_SUBST(WINE_SDK_PATH) -AC_SUBST(XPIDL) -AC_SUBST(XPIDL_INCL) AC_SUBST(LIBEXT) AC_SUBST(AM_CPPFLAGS) AC_SUBST(ALL_LINGUAS) @@ -5643,6 +5675,7 @@ AC_CONFIG_FILES([ modules/codec/dmo/Makefile modules/codec/ffmpeg/Makefile modules/codec/spudec/Makefile + modules/codec/xvmc/Makefile modules/control/Makefile modules/control/http/Makefile modules/demux/Makefile @@ -5664,7 +5697,6 @@ AC_CONFIG_FILES([ modules/misc/Makefile modules/misc/dummy/Makefile modules/misc/memcpy/Makefile - modules/misc/network/Makefile modules/misc/notify/Makefile modules/misc/testsuite/Makefile modules/misc/playlist/Makefile @@ -5679,7 +5711,6 @@ 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 @@ -5707,7 +5738,7 @@ dnl Shortcut to nice compile message rm -f compile echo '#! /bin/sh' >compile -echo "PATH=$PATH LANG=C make \$* 2>&1| \\" >> compile +echo "PATH=$PATH LANG=C make \$@ 2>&1| \\" >> compile echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/make.pl' >> compile chmod a+x compile