X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=0d5eb07a1de8e2969295b4e2dcc6ebe3c8e4b6b5;hb=fb19b264f8a5fe4ebb47f863e0f040f2ffe9b0a5;hp=d62cda8dc5f6dd60a1cc81d41540fded34965e0d;hpb=e7b6ffc1681e4e60c02510ae0f1f92cdec88ac36;p=vlc diff --git a/configure.ac b/configure.ac index d62cda8dc5..7b3c50ba37 100644 --- a/configure.ac +++ b/configure.ac @@ -1,21 +1,22 @@ dnl Autoconf settings for vlc -AC_INIT(vlc,0.9.0-svn) +AC_INIT(vlc,0.9.0-git) VERSION_MAJOR="0" VERSION_MINOR="9" VERSION_REVISION="0" -VERSION_EXTRA="svn" +VERSION_EXTRA="git" CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Grishenko" +COPYRIGHT_YEARS="1996-2008" -AC_PREREQ(2.59) dnl this really should be 2.59c +AC_PREREQ(2.59c) AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) AC_CANONICAL_BUILD AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([1.9 check-news dist-bzip2 no-dist-gzip -Wall]) +AM_INIT_AUTOMAKE(tar-ustar) AM_CONFIG_HEADER(config.h) dnl Too many people are not aware of maintainer mode: @@ -75,10 +76,10 @@ AC_ARG_WITH(contrib, if test "`grep HOST ${topdir}/extras/contrib/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"; then if test "${with_contrib}" = "yes"; then AC_MSG_RESULT([no]) - AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host]) + AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host]) else AC_MSG_RESULT([no]) - AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host]) + AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host]) fi else if test -d ${topdir}/extras/contrib/lib; then @@ -93,22 +94,18 @@ AC_ARG_WITH(contrib, OBJCFLAGS="${OBJCFLAGS} -I${topdir}/extras/contrib/include" OBJCFLAGS_save="${OBJCFLAGS_save} -I${topdir}/extras/contrib/include" if test $build = $host -o "$PKG_CONFIG_LIBDIR"; then - export PKG_CONFIG_PATH=${topdir}/extras/contrib/lib/pkgconfig:$PKG_CONFIG_PATH + export PKG_CONFIG_PATH=${topdir}/extras/contrib/lib/pkgconfig:$PKG_CONFIG_PATH else - export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/lib/pkgconfig + export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/lib/pkgconfig fi LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib" LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib" -dnl kludge because only the debian package provides a ffmpeg-config - if test -z $with_ffmpeg_config_path; then - with_ffmpeg_config_path=${topdir}/extras/contrib/bin; - fi if test -z $with_live555_tree; then with_live555_tree=${topdir}/extras/contrib/src/live fi if test -z $with_goom_tree; then - with_goom_tree=${topdir}/extras/contrib/src/goom + with_goom_tree=${topdir}/extras/contrib/src/goom fi if test -z $with_mozilla_sdk_path; then with_mozilla_sdk_path=${topdir}/extras/contrib/gecko-sdk @@ -117,7 +114,10 @@ dnl kludge because only the debian package provides a ffmpeg-config with_cyberlink_tree=${topdir}/extras/contrib/src/clinkcc fi if test -z $with_libmpeg2_tree; then - with_libmpeg2_tree=${topdir}/extras/contrib/src/mpeg2dec + with_libmpeg2_tree=${topdir}/extras/contrib/src/mpeg2dec + fi + if test -z $with_a52_tree; then + with_a52_tree=${topdir}/extras/contrib/src/a52dec fi if test ".`uname -s`" = ".Darwin"; then @@ -150,7 +150,7 @@ case "${host_os}" in bsdi*) SYS=bsdi CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}" - VLC_ADD_LDFLAGS([dvd dvdcss vcd cdda vcdx cddax],[-ldvd]) + VLC_ADD_LIBS([dvd dvdcss vcd cdda vcdx cddax],[-ldvd]) ;; *bsd*) SYS="${host_os}" @@ -169,12 +169,12 @@ case "${host_os}" in 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 -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}" + LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names"; LDFLAGS="${LDFLAGS_save}" VLC_ADD_LDFLAGS([mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation]) - VLC_ADD_CFLAGS([libvlc vlc],[-x objective-c]) VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup]) VLC_ADD_LDFLAGS([libvlc_control],[-Wl,dynamic_lookup]) - VLC_ADD_LDFLAGS([ffmpeg i420_rgb_mmx],[-Wl,-read_only_relocs,suppress]) + VLC_ADD_LDFLAGS([ffmpeg i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress]) VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,Cocoa,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation]) @@ -184,6 +184,13 @@ case "${host_os}" in then echo "" echo "Building with Mac OS X defaults:" + with_macosx_version_min="10.4" + echo " Assuming --with-macosx-version-min=10.4" + build_dir=`pwd` + echo " Assuming --prefix=${build_dir}/vlc_install_dir" + ac_default_prefix="${build_dir}/vlc_install_dir" + enable_macosx="yes" + echo " Assuming --enable-macosx" enable_faad="yes" echo " Assuming --enable-faad" enable_flac="yes" @@ -215,13 +222,59 @@ case "${host_os}" in echo " Assuming --disable-glx" enable_xvideo="no" echo " Assuming --disable-xvideo" - + fi + if test ".`uname -p`" = ".i386"; then + dnl Due to a ld(64) bug in 10.5 we cannot use our mmx code + dnl without hacking it a lot, we disable mmx and sse. + dnl (that bug is about ld being unable to handle + dnl text relocation) + save_cflags="$CFLAGS" + CFLAGS="$CFLAGS -dynamiclib -single_module -read_only_relocs suppress" + AC_TRY_LINK( + [int a;], [asm("movq _a,%mm0\n");], + ac_ld_does_not_support_text_reloc=no, + ac_ld_does_not_support_text_reloc=yes) + CFLAGS="$save_cflags" + + if test "x$ac_ld_does_not_support_text_reloc" = "xyes"; then + enable_mmx="no" + echo " Assuming --disable-mmx (due to a bug in ld)" + enable_sse="no" + echo " Assuming --disable-sse (due to a bug in ld)" + fi + fi + dnl + dnl Check for Mac OS X SDK settings + dnl + AC_ARG_WITH(macosx-sdk, + [ --with-macosx-sdk=DIR compile using the SDK in DIR]) + if test "${with_macosx_sdk}" != "" ; then + CC="${CC} -isysroot ${with_macosx_sdk}" + CXX="${CXX} -isysroot ${with_macosx_sdk}" + OBJC="${OBJC} -isysroot ${with_macosx_sdk}" + LD="${LD} -syslibroot ${with_macosx_sdk}" + fi + AC_ARG_WITH(macosx-version-min, + [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above]) + if test "${with_macosx_version_min}" != "" ; then + CC="${CC} -mmacosx-version-min=${with_macosx_version_min}" + CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}" + OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}" + LD="${LD} -macosx_version_min=${with_macosx_version_min}" + CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; OBJCFLAGS="${OBJCFLAGS_save}" + MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min} + export MACOSX_DEPLOYMENT_TARGET fi ;; *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) AC_CHECK_TOOL(WINDRES, windres, :) case "${host_os}" in + *wince* | *mingwce* | *mingw32ce* | *pe*) + SYS=mingwce + ;; *mingw32*) SYS=mingw32 ;; @@ -234,29 +287,27 @@ case "${host_os}" in #endif], SYS=mingw32, SYS=cygwin) ;; - *wince* | *mingwce* | *pe*) - SYS=mingwce - ;; esac if test "${SYS}" = "mingw32"; then # add ws2_32 for closesocket, select, recv - VLC_ADD_LDFLAGS([libvlc],[-lws2_32 -lnetapi32 -lwinmm]) + VLC_ADD_LIBS([libvlc],[-lws2_32 -lnetapi32 -lwinmm]) VLC_ADD_LDFLAGS([vlc],[-mwindows]) - VLC_ADD_LDFLAGS([activex mozilla],[-lgdi32]) - VLC_ADD_LDFLAGS([cdda vcdx cddax sdl_image],[-lwinmm]) - VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl flac ts audioscrobbler],[-lws2_32]) + VLC_ADD_LIBS([activex mozilla],[-lgdi32]) + VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua],[-lws2_32]) fi if test "${SYS}" = "mingwce"; then # add ws2 for closesocket, select, recv 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]) + VLC_ADD_LDFLAGS([libvlc vlc],[-e WinMainCRTStartup]) + VLC_ADD_LIBS([libvlc access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp sap http netsync audioscrobbler growl rtp stream_out_rtp],[-lws2]) + VLC_ADD_LIBS([libvlc],[-lmmtimer]) fi ;; *nto*) SYS=nto - VLC_ADD_LDFLAGS([x11 xvideo],[-lsocket]) + VLC_ADD_LIBS([x11 xvideo],[-lsocket]) ;; solaris*) SYS=solaris @@ -272,21 +323,21 @@ case "${host_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 libvlc logger],[-lbe]) - VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame]) - VLC_ADD_LDFLAGS([dvdnav dvdread],[-ldl]) - VLC_ADD_LDFLAGS([access_file],[-lpoll]) + VLC_ADD_LIBS([vlc libvlc logger],[-lbe]) + VLC_ADD_LIBS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame]) + VLC_ADD_LIBS([dvdnav dvdread],[-ldl]) + VLC_ADD_LIBS([access_file],[-lpoll]) 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 libvlc growl],[-lbind -lsocket]) + VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl_udp],[-lbind -lsocket]) else - VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl],[-lnet]) + VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl_udp],[-lnet]) fi dnl Ugly check for Zeta if test -f /boot/beos/system/lib/libzeta.so; then - VLC_ADD_LDFLAGS([beos],[-lzeta]) + VLC_ADD_LIBS([beos],[-lzeta]) fi ;; *) @@ -305,9 +356,9 @@ dnl for program foo on win32 case "${build_os}" in cygwin|msys) ac_executable_extensions=".exe" - ;; + ;; *) - ;; + ;; esac dnl @@ -323,6 +374,7 @@ AC_CACHE_VAL(lt_cv_deplibs_check_method, [lt_cv_deplibs_check_method=pass_all]) AC_DISABLE_STATIC +AC_DISABLE_FAST_INSTALL AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL m4_undefine([AC_PROG_F77]) @@ -335,50 +387,28 @@ m4_defun([AC_DEPLIBS_CHECK_METHOD],[]) lt_cv_deplibs_check_method=pass_all -dnl -dnl Check for Mac OS X SDK settings -dnl -AC_ARG_WITH(macosx-sdk, - [ --with-macosx-sdk compile with the Mac OS X 10.4u SDK],[], with_macosx_sdk=no) -if test "${with_macosx_sdk}" != "no" ; then - CC="${CC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk" - CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.4u.sdk" - OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk" - LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.4u.sdk" - CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; OBJCFLAGS="${OBJCFLAGS_save}" - MACOSX_DEPLOYMENT_TARGET="10.4" - export MACOSX_DEPLOYMENT_TARGET -fi - dnl dnl Gettext stuff dnl -ALL_LINGUAS="af ar bn ca co cs da de el en_GB es eu fa fr fur gl he hi hu it ja ka ko lt lv ms my ne nl 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.16.1) -AM_GNU_GETTEXT -AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [ - AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, [Define if we use the local libintl]) - AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl" -], [ - VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}]) -]) +AM_GNU_GETTEXT_VERSION([0.17]) +AM_GNU_GETTEXT([external]) +VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}]) dnl dnl Iconv stuff dnl +AM_ICONV AS_IF([test "$am_cv_func_iconv" != "yes"], [AC_MSG_ERROR([libiconv is needed for VLC to work properly])]) VLC_ADD_CFLAGS([libvlc],[${INCICONV}]) -VLC_ADD_LDFLAGS([libvlc],[${LTLIBICONV}]) +VLC_ADD_LIBS([libvlc],[${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([libvlc],[]), - [VLC_ADD_LDFLAGS([libvlc gtk],[-lmingwex])]) + AC_CHECK_LIB(mingw32,opendir,, + [VLC_ADD_LIBS([libvlc gtk],[-lmingwex])]) ) fi @@ -427,26 +457,22 @@ dnl Plugin compilation stuff VLC_LIBRARY_SUFFIX -VLC_SYMBOL_PREFIX -AC_SUBST(SYMPREF) - dnl The -DSYS_FOO flag CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"; CPPFLAGS="${CPPFLAGS_save}" dnl Check for system libs needed need_libc=false -AC_CHECK_FUNCS(gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy) - dnl Check for usual libc functions -AC_CHECK_FUNCS(strdup strndup strnlen atof) +AC_CHECK_FUNCS([gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid_r memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy strdup strndup strnlen atof lldiv posix_fadvise posix_madvise]) AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)]) AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)]) AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)]) +AC_FUNC_ALLOCA -AS_IF([test "${SYS}" = "linux"], [ - AC_CHECK_FUNCS(tee) -]) +AH_BOTTOM([#include ]) + +AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGIN([access_mmap])]) dnl Check for setlocal and langinfo AC_CHECK_FUNCS(setlocale) @@ -466,38 +492,47 @@ fi AC_CHECK_FUNCS(connect,,[ AC_CHECK_LIB(socket,connect,[ - VLC_ADD_LDFLAGS([libvlc cdda cddax],-lsocket) + VLC_ADD_LIBS([libvlc cdda cddax],-lsocket) LIBS_socket="-lsocket" ]) ]) AC_CHECK_FUNCS(send,,[ AC_CHECK_LIB(socket,send,[ - VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard growl],[-lsocket]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp sap access_output_udp stream_out_standard growl_udp],[-lsocket]) ]) ]) AC_CHECK_FUNCS(gethostbyname,,[ AC_CHECK_LIB(nsl,gethostbyname,[ - VLC_ADD_LDFLAGS([cdda cddax libvlc],[-lnsl]) + VLC_ADD_LIBS([cdda cddax libvlc],[-lnsl]) ],[ AC_CHECK_LIB(bind,gethostbyname,[ - VLC_ADD_LDFLAGS([access_mms],[-lbind]) + VLC_ADD_LIBS([access_mms],[-lbind]) ]) ]) ]) +AC_CHECK_HEADERS(zlib.h, [ + VLC_ADD_LIBS([access_http],[-lz]) +]) + dnl Check for socklen_t -AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, - [AC_TRY_COMPILE( - [#include - #include ], - [socklen_t len = 42; return len;], - ac_cv_type_socklen_t=yes, - ac_cv_type_socklen_t=no)]) -if test "${ac_cv_type_socklen_t}" != "no"; then - AC_DEFINE(HAVE_SOCKLEN_T, 1, [Define if defines socklen_t.]) -fi +AH_TEMPLATE(socklen_t, [Define to `int' if does not define.]) +AC_CACHE_CHECK([for socklen_t in sys/socket.h], +ac_cv_type_socklen_t, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +[#include +#ifdef WIN32 +# include +# include +#else +# include +#endif]], [[socklen_t len; len = 0;]])], +ac_cv_type_socklen_t=yes, +ac_cv_type_socklen_t=no)]) +AS_IF([test "$ac_cv_type_socklen_t" = no], + [AC_DEFINE(socklen_t, int)]) dnl Check for struct sockaddr_storage AH_TEMPLATE(sockaddr_storage, [Define to `sockaddr' if does not define.]) @@ -567,7 +602,7 @@ fi AC_CHECK_FUNCS(inet_aton,,[ AC_CHECK_LIB(resolv,inet_aton,[ - VLC_ADD_LDFLAGS([libvlc],[-lresolv]) + VLC_ADD_LIBS([libvlc],[-lresolv]) ]) ]) @@ -580,7 +615,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([libvlc],[-lgnugetopt])], + VLC_ADD_LIBS([libvlc],[-lgnugetopt])], [need_getopt=:])]) fi AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt}) @@ -588,22 +623,25 @@ AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt}) if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_TYPE_SIGNAL AC_CHECK_LIB(m,cos,[ - VLC_ADD_LDFLAGS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain],[-lm]) ]) AC_CHECK_LIB(m,pow,[ - VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer spatializer param_eq libvlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm]) + VLC_ADD_LIBS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer spatializer 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 mono colorthres extract],[-lm]) + VLC_ADD_LIBS([headphone_channel_mixer normvol speex mono colorthres extract],[-lm]) ]) AC_CHECK_LIB(m,ceil,[ - VLC_ADD_LDFLAGS([mosaic],[-lm]) + VLC_ADD_LIBS([mosaic],[-lm]) ]) AC_CHECK_LIB(m,exp,[ - VLC_ADD_LDFLAGS([gaussianblur],[-lm]) + VLC_ADD_LIBS([gaussianblur],[-lm]) +]) +AC_CHECK_LIB(m,round,[ + VLC_ADD_LIBS([dbus],[-lm]) ]) AC_CHECK_LIB(mx,sqrtf,[ - VLC_ADD_LDFLAGS([x264],[-lmx]) + VLC_ADD_LIBS([x264],[-lmx]) ]) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" @@ -624,7 +662,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([libvlc],[-ldld])])]) + VLC_ADD_LIBS([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 @@ -634,7 +672,7 @@ fi # Whatever style if test "${ac_cv_have_plugins}" = "no"; then AC_CHECK_LIB(dld, dld_link, - [VLC_ADD_LDFLAGS([libvlc],[-ldld]) + [VLC_ADD_LIBS([libvlc],[-ldld]) AC_DEFINE(HAVE_DL_DLD_LINK, 1, [Define if you have the GNU dld library]) ac_cv_have_plugins=yes]) fi @@ -643,7 +681,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([libvlc],[-lkernel32]) + [VLC_ADD_LIBS([libvlc],[-lkernel32]) AC_DEFINE(HAVE_DL_WINDOWS, 1, [Define if you have Windows' LoadLibrary]) ac_cv_have_plugins=yes]) fi @@ -673,10 +711,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([libvlc],[-ldl]), + VLC_ADD_LIBS([libvlc realaudio],[-ldl]), AC_CHECK_LIB(svld, dlopen, ac_cv_my_have_dlopen=yes - VLC_ADD_LDFLAGS([libvlc],[-lsvld])))) + VLC_ADD_LIBS([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 @@ -700,89 +738,30 @@ if test "${THREAD_LIB}" = "error"; then THREAD_LIB="" fi -dnl Check for cthreads under GNU/Hurd for instance -AC_CHECK_LIB(threads,cthread_fork,THREAD_LIB="-lthreads") +VLC_ADD_LIBS([libvlc plugin],[${THREAD_LIB}]) -dnl -dnl GNU portable threads -dnl -AC_ARG_ENABLE(pth, - [ --enable-pth GNU Pth support (default disabled)], - [ if test "${enable_pth}" = "yes"; then - AC_CHECK_LIB(pth,pth_init) - AC_MSG_CHECKING(for pth_init in pth.h) - AC_EGREP_HEADER(pth_init,pth.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(PTH_INIT_IN_PTH_H, 1, - Define if defines pth_init) - THREAD_LIB="-lpth" - ],[ - AC_MSG_RESULT(no) - ]) - fi +AC_CHECK_LIB(rt, clock_nanosleep, [ + VLC_ADD_LIBS([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_LIBS([libvlc],[-lrt])]) ]) -dnl -dnl State Threads -dnl -AC_ARG_ENABLE(st, - [ --enable-st State Threads (default disabled)], - [ if test "${enable_st}" = "yes"; then - AC_CHECK_LIB(st,st_init) - AC_MSG_CHECKING(for st_init in st.h) - AC_EGREP_HEADER(st_init,st.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(ST_INIT_IN_ST_H, 1, - Define if defines st_init) - THREAD_LIB="-lst" - ],[ - AC_MSG_RESULT(yes) - ]) - fi +have_nanosleep=false +AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ + AC_CHECK_LIB(rt,nanosleep, + [VLC_ADD_LIBS([libvlc],[-lrt]) have_nanosleep=:], + [AC_CHECK_LIB(posix4,nanosleep, + [VLC_ADD_LIBS([libvlc],[-lposix4]) have_nanosleep=:])] + ) ]) - -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([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([libvlc],[-lrt])]) - ]) - - have_nanosleep=false - AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ - AC_CHECK_LIB(rt,nanosleep, - [VLC_ADD_LDFLAGS([libvlc],[-lrt]) have_nanosleep=:], - [AC_CHECK_LIB(posix4,nanosleep, - [VLC_ADD_LDFLAGS([libvlc],[-lposix4]) have_nanosleep=:])] - ) - ]) - if ${have_nanosleep}; then - AC_DEFINE(HAVE_NANOSLEEP, 1, - Define if nanosleep is available.) - fi +if ${have_nanosleep}; then + AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if nanosleep is available.]) fi +fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" dnl Check for misc headers -AC_MSG_CHECKING(for pthread_cond_t in pthread.h) -AC_EGREP_HEADER(pthread_cond_t,pthread.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(PTHREAD_COND_T_IN_PTHREAD_H, 1, - Define if defines pthread_cond_t.)],[ - AC_MSG_RESULT(no)]) - -AC_MSG_CHECKING(for pthread_once in pthread.h) -AC_EGREP_HEADER(pthread_once,pthread.h,[ - AC_MSG_RESULT(yes) - AC_DEFINE(PTHREAD_ONCE_IN_PTHREAD_H, 1, - Define if defines pthread_once.)],[ - AC_MSG_RESULT(no)]) -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" - AC_MSG_CHECKING(for strncasecmp in strings.h) AC_EGREP_HEADER(strncasecmp,strings.h,[ AC_MSG_RESULT(yes) @@ -793,7 +772,11 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ dnl Check for headers AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h) AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h) -AC_CHECK_HEADERS([arpa/inet.h net/if.h netinet/in.h sys/socket.h netinet/udplite.h]) +AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h]) +AC_CHECK_HEADERS([net/if.h], [], [], + [ + #include + ]) if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(machine/param.h sys/shm.h) AC_CHECK_HEADERS([linux/version.h linux/dccp.h]) @@ -802,8 +785,16 @@ 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 LP64 adn LLP64 architectures had better define ssize_t by themselves... +AH_TEMPLATE(ssize_t, [Define to `int' if does not define.]) +AC_CHECK_TYPE(ssize_t,, [ + AC_DEFINE(ssize_t, int) +]) + +dnl don't attemp to use poll on darwin, it can't poll a tty. select will do a better job. +if test "${SYS}" != "darwin"; then + AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])]) +fi dnl Check for dirent need_dirent=false @@ -834,7 +825,7 @@ AC_EGREP_HEADER(timespec,sys/time.h,[ dnl Check for threads library if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then -AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h) +AC_CHECK_HEADERS(pthread.h kernel/scheduler.h kernel/OS.h) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" dnl Find where are the X headers and libraries @@ -851,16 +842,17 @@ AC_ARG_ENABLE(hal, if test "${enable_hal}" != "no" then PKG_CHECK_MODULES(HAL, hal >= 0.5.0, - [ 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([libvlc hal probe_hal],[$HAL_LIBS]) + [ AC_DEFINE( HAVE_HAL_1, 1 , [Define if you have the new HAL library API]) + AC_DEFINE( HAVE_HAL, 1, [Define if you have the HAL library] ) + VLC_ADD_PLUGIN([hal]) + VLC_ADD_PLUGIN([probe_hal]) + VLC_ADD_LIBS([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([libvlc hal],[$HAL_LIBS]) + [AC_DEFINE(HAVE_HAL, 1, [Define if you have the HAL library]) + VLC_ADD_PLUGIN([hal]) + VLC_ADD_LIBS([libvlc hal],[$HAL_LIBS]) VLC_ADD_CFLAGS([libvlc hal],[$HAL_CFLAGS])], [AC_MSG_WARN(HAL library not found)]) ] @@ -880,21 +872,32 @@ then 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 libvlc],[$DBUS_LIBS]) + VLC_ADD_LIBS([screensaver libvlc],[$DBUS_LIBS]) VLC_ADD_CFLAGS([screensaver libvlc],[$DBUS_CFLAGS]) dnl Check for dbus control interface - AC_ARG_ENABLE(dbus-control, [ --disable-dbus-control D-BUS control interface (default enabled)]) + AC_ARG_ENABLE(dbus-control, [ --disable-dbus-control D-BUS control interface (default enabled)]) if test "${enable_dbus_control}" != "no" then - VLC_ADD_PLUGINS([dbus]) - VLC_ADD_LDFLAGS([dbus],[$DBUS_LIBS]) + VLC_ADD_PLUGIN([dbus]) + VLC_ADD_LIBS([dbus],[$DBUS_LIBS]) VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS]) - fi], - + fi + dnl Check for Telepathy + AC_ARG_ENABLE(telepathy, [ --enable-telepathy Telepathy Presence plugin through DBus(default enabled)]) + if test "${enable_telepathy}" != "no"; then + VLC_ADD_PLUGIN([telepathy]) + VLC_ADD_LIBS([telepathy],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([telepathy],[$DBUS_CFLAGS]) + fi + dnl Power Management Inhibiter + VLC_ADD_PLUGIN([inhibit]) + VLC_ADD_LIBS([inhibit],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([inhibit],[$DBUS_CFLAGS]) + ], if ${PKG_CONFIG} --exists dbus-1 then [AC_ARG_ENABLE(old-dbus, - [ --enable-old-dbus Deprecated D-Bus support (default disabled)])] + [ --enable-old-dbus Deprecated D-Bus support (default disabled)])] if test "${enable_old_dbus}" != "yes" then @@ -914,18 +917,18 @@ then [ 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_LIBS([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_LIBS([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_LIBS([screensaver],[$DBUS_LIBS]) VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])], [AC_MSG_WARN(DBUS library not found)]) ] @@ -959,16 +962,9 @@ if test "${ac_cv_c_ntohl_sys_param_h}" != "no"; then fi CFLAGS="${CFLAGS_save}" -RDC_PROG_CC_WFLAGS([all extra no-unused-parameter sign-compare undef pointer-arith bad-function-cast cast-align write-strings missing-prototypes volatile-register-var]) +RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast cast-align write-strings 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. -dnl Unfortunately, this sucks on FreeBSD (won't even link with -lc) -dnl RDC_PROG_LINK_FLAGS_IFELSE([-Wl,-z,defs], [ -dnl VLC_ADD_LDFLAGS([plugin],[-Wl,-z,defs]) -dnl ]) - dnl Check for various optimization flags AC_CACHE_CHECK([if \$CC accepts -Os], [ac_cv_c_os], @@ -1052,6 +1048,10 @@ if test "${ac_cv_c_omit_frame_pointer}" != "no"; then fi dnl Check for -fvisibility=hidden +dnl Don't test on mingw32, because it is going to work with just a warning +dnl even if it doesn't support it +if test "${SYS}" != "mingw32" +then AC_CACHE_CHECK([if \$CC accepts -fvisibility=hidden], [ac_cv_c_visibility_hidden], [CFLAGS="${CFLAGS_save} -fvisibility=hidden" @@ -1059,6 +1059,7 @@ AC_CACHE_CHECK([if \$CC accepts -fvisibility=hidden], if test "${ac_cv_c_visibility_hidden}" != "no"; then VLC_ADD_CFLAGS([libvlc plugin],[-fvisibility=hidden]) fi +fi AM_CONDITIONAL(HAVE_COMPILER_EXPORT, [test "$SYS" = "mingw32" -o "${ac_cv_c_visibility_hidden}" != "no"]) @@ -1107,20 +1108,6 @@ dnl VLC_ADD_LDFLAGS([plugin mozilla],[-shared]) dnl ]) dnl ]) -dnl Check for variadic macros -AC_CACHE_CHECK([for variadic cpp macros], - [ac_cv_cpp_variadic_macros], - [CFLAGS="${CFLAGS_save}" - AC_TRY_COMPILE( - [#include - #define a(b,c...) printf(b,##c)], - [a("foo");a("%s","bar");a("%s%s","baz","quux");], - ac_cv_cpp_variadic_macros=yes, - ac_cv_cpp_variadic_macros=no)]) -if test "${ac_cv_cpp_variadic_macros}" != "no"; then - AC_DEFINE(HAVE_VARIADIC_MACROS, 1, Support for variadic macros) -fi - dnl Checks for __attribute__(aligned()) directive AC_CACHE_CHECK([__attribute__ ((aligned ())) support], [ac_cv_c_attribute_aligned], @@ -1195,69 +1182,215 @@ test "${enable_cprof}" != "yes" && enable_cprof="no" dnl dnl default modules dnl -VLC_ADD_PLUGINS([dummy logger memcpy]) -VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta]) -VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf t140 dvbsub mpeg_audio lpcm a52 dts cinepak flac]) -VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving]) -VLC_ADD_PLUGINS([converter_fixed mono]) -VLC_ADD_PLUGINS([trivial_resampler ugly_resampler]) -VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer]) -VLC_ADD_PLUGINS([spatializer]) -VLC_ADD_PLUGINS([playlist export nsc xtag]) -VLC_ADD_PLUGINS([i420_rgb grey_yuv 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]) -VLC_ADD_PLUGINS([access_filter_bandwidth]) -VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) -VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) -VLC_ADD_PLUGINS([packetizer_vc1]) - +VLC_ADD_PLUGIN([dummy]) +VLC_ADD_PLUGIN([logger]) +VLC_ADD_PLUGIN([memcpy]) +dnl Demuxers: +VLC_ADD_PLUGIN([mpgv]) +VLC_ADD_PLUGIN([mpga]) +VLC_ADD_PLUGIN([m4v]) +VLC_ADD_PLUGIN([m4a]) +VLC_ADD_PLUGIN([h264]) +VLC_ADD_PLUGIN([vc1]) +VLC_ADD_PLUGIN([demux_cdg]) +VLC_ADD_PLUGIN([cdg]) +VLC_ADD_PLUGIN([ps]) +VLC_ADD_PLUGIN([pva]) +VLC_ADD_PLUGIN([avi]) +VLC_ADD_PLUGIN([asf]) +VLC_ADD_PLUGIN([mp4]) +VLC_ADD_PLUGIN([rawdv]) +VLC_ADD_PLUGIN([rawvid]) +VLC_ADD_PLUGIN([nsv]) +VLC_ADD_PLUGIN([real]) +VLC_ADD_PLUGIN([aiff]) +VLC_ADD_PLUGIN([mjpeg]) +VLC_ADD_PLUGIN([wav]) +VLC_ADD_PLUGIN([voc]) +VLC_ADD_PLUGIN([smf]) +VLC_ADD_PLUGIN([demuxdump]) +VLC_ADD_PLUGIN([flacsys]) +VLC_ADD_PLUGIN([tta]) +VLC_ADD_PLUGIN([subtitle]) +VLC_ADD_PLUGIN([vobsub]) +VLC_ADD_PLUGIN([a52sys]) +VLC_ADD_PLUGIN([dtssys]) +VLC_ADD_PLUGIN([au]) +VLC_ADD_PLUGIN([ty]) +VLC_ADD_PLUGIN([xa]) +VLC_ADD_PLUGIN([nuv]) +dnl Text codecs: +VLC_ADD_PLUGIN([cvdsub]) +VLC_ADD_PLUGIN([svcdsub]) +VLC_ADD_PLUGIN([spudec]) +VLC_ADD_PLUGIN([subsdec]) +VLC_ADD_PLUGIN([subsusf]) +VLC_ADD_PLUGIN([t140]) +VLC_ADD_PLUGIN([dvbsub]) +VLC_ADD_PLUGIN([cc]) +dnl Video codecs: +VLC_ADD_PLUGIN([cinepak]) +dnl Audio codecs: +VLC_ADD_PLUGIN([araw]) +VLC_ADD_PLUGIN([adpcm]) +VLC_ADD_PLUGIN([mpeg_audio]) +VLC_ADD_PLUGIN([lpcm]) +VLC_ADD_PLUGIN([a52]) +VLC_ADD_PLUGIN([dts]) +VLC_ADD_PLUGIN([flac]) +dnl Video filters: +VLC_ADD_PLUGIN([deinterlace]) +VLC_ADD_PLUGIN([invert]) +VLC_ADD_PLUGIN([adjust]) +VLC_ADD_PLUGIN([transform]) +VLC_ADD_PLUGIN([wave]) +VLC_ADD_PLUGIN([ripple]) +VLC_ADD_PLUGIN([psychedelic]) +VLC_ADD_PLUGIN([gradient]) +VLC_ADD_PLUGIN([motionblur]) +VLC_ADD_PLUGIN([rv32]) +VLC_ADD_PLUGIN([rotate]) +VLC_ADD_PLUGIN([noise]) +VLC_ADD_PLUGIN([grain]) +VLC_ADD_PLUGIN([extract]) +VLC_ADD_PLUGIN([sharpen]) +VLC_ADD_PLUGIN([seamcarving]) +VLC_ADD_PLUGIN([croppadd]) +VLC_ADD_PLUGIN([blendbench]) +VLC_ADD_PLUGIN([blend]) +VLC_ADD_PLUGIN([scale]) +VLC_ADD_PLUGIN([image]) +VLC_ADD_PLUGIN([vmem]) +VLC_ADD_PLUGIN([logo]) +VLC_ADD_PLUGIN([magnify]) +VLC_ADD_PLUGIN([puzzle]) +VLC_ADD_PLUGIN([colorthres]) +dnl Meta demuxers: +VLC_ADD_PLUGIN([playlist]) +VLC_ADD_PLUGIN([export]) +VLC_ADD_PLUGIN([nsc]) +VLC_ADD_PLUGIN([xtag]) +dnl Channel mixing audio filters: +VLC_ADD_PLUGIN([converter_fixed]) +VLC_ADD_PLUGIN([mono]) +VLC_ADD_PLUGIN([trivial_channel_mixer]) +dnl Resampling audio filters: +VLC_ADD_PLUGIN([trivial_resampler]) +VLC_ADD_PLUGIN([ugly_resampler]) +dnl Audio mixers: +VLC_ADD_PLUGIN([trivial_mixer]) +dnl Video chromas: +VLC_ADD_PLUGIN([i420_rgb]) +VLC_ADD_PLUGIN([grey_yuv]) +dnl Video codecs: +VLC_ADD_PLUGIN([rawvideo]) +dnl Access filters: +VLC_ADD_PLUGIN([access_filter_timeshift]) +VLC_ADD_PLUGIN([access_filter_record]) +VLC_ADD_PLUGIN([access_filter_dump]) +VLC_ADD_PLUGIN([access_filter_bandwidth]) + +ALIASES="${ALIASES} cvlc" + +dnl +dnl default modules that need g++ +dnl +AC_LANG_PUSH(C++) +VLC_ADD_PLUGIN([spatializer]) +AC_LANG_POP(C++) if test "${SYS}" != "mingwce"; then - 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 erase bluescreen alphamask gaussianblur]) - 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([converter_float a52tospdif dtstospdif audio_format]) + VLC_ADD_PLUGIN([gestures]) + VLC_ADD_PLUGIN([rc]) + VLC_ADD_PLUGIN([telnet]) + VLC_ADD_PLUGIN([hotkeys]) + VLC_ADD_PLUGIN([showintf]) + VLC_ADD_PLUGIN([marq]) + VLC_ADD_PLUGIN([podcast]) + VLC_ADD_PLUGIN([shout]) + VLC_ADD_PLUGIN([sap]) + VLC_ADD_PLUGIN([fake]) + VLC_ADD_PLUGIN([folder]) + VLC_ADD_PLUGIN([rss]) + VLC_ADD_PLUGIN([mosaic]) + VLC_ADD_PLUGIN([wall]) + VLC_ADD_PLUGIN([motiondetect]) + VLC_ADD_PLUGIN([clone]) + VLC_ADD_PLUGIN([crop]) + VLC_ADD_PLUGIN([erase]) + VLC_ADD_PLUGIN([bluescreen]) + VLC_ADD_PLUGIN([alphamask]) + VLC_ADD_PLUGIN([gaussianblur]) + VLC_ADD_PLUGIN([i420_yuy2]) + VLC_ADD_PLUGIN([i422_yuy2]) + VLC_ADD_PLUGIN([i420_ymga]) + VLC_ADD_PLUGIN([i422_i420]) + VLC_ADD_PLUGIN([yuy2_i422]) + VLC_ADD_PLUGIN([yuy2_i420]) + VLC_ADD_PLUGIN([chroma_chain]) + VLC_ADD_PLUGIN([aout_file]) + VLC_ADD_PLUGIN([linear_resampler]) + VLC_ADD_PLUGIN([bandlimited_resampler]) + VLC_ADD_PLUGIN([float32_mixer]) + VLC_ADD_PLUGIN([spdif_mixer]) + VLC_ADD_PLUGIN([simple_channel_mixer]) + VLC_ADD_PLUGIN([dolby_surround_decoder]) + VLC_ADD_PLUGIN([headphone_channel_mixer]) + VLC_ADD_PLUGIN([normvol]) + VLC_ADD_PLUGIN([equalizer]) + VLC_ADD_PLUGIN([param_eq]) + VLC_ADD_PLUGIN([converter_float]) + VLC_ADD_PLUGIN([a52tospdif]) + VLC_ADD_PLUGIN([dtstospdif]) + VLC_ADD_PLUGIN([audio_format]) + ALIASES="${ALIASES} rvlc" fi dnl dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - VLC_ADD_PLUGINS([screensaver motion]) + VLC_ADD_PLUGIN([screensaver]) + VLC_ADD_PLUGIN([motion]) + VLC_ADD_PLUGIN([dynamicoverlay]) elif test "${SYS}" != "mingwce"; then - VLC_ADD_PLUGINS([ntservice access_smb dmo msn]) - VLC_ADD_LDFLAGS([dmo],[-lole32]) + VLC_ADD_PLUGIN([ntservice]) + VLC_ADD_PLUGIN([access_smb]) + VLC_ADD_PLUGIN([dmo]) + VLC_ADD_PLUGIN([msn]) + VLC_ADD_LIBS([dmo],[-lole32 -luuid]) else - VLC_ADD_PLUGINS([win32text]) + VLC_ADD_PLUGIN([win32text]) fi if test "${SYS}" = "darwin"; then - VLC_ADD_PLUGINS([quartztext]) + VLC_ADD_PLUGIN([quartztext]) VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,Carbon,-framework,ApplicationServices]) fi dnl dnl Accelerated modules dnl -MMX_MODULES="memcpymmx i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx i420_ymga_mmx" -#MMX_MODULES="${MMX_MODULES} idctmmx motionmmx" -MMXEXT_MODULES="memcpymmxext" -#MMXEXT_MODULES="${MMXEXT_MODULES} idctmmxext motionmmxext" -THREEDNOW_MODULES="memcpy3dn" -SSE_MODULES="" -SSE2_MODULES="i420_rgb_sse2 i420_yuy2_sse2 i422_yuy2_sse2" -ALTIVEC_MODULES="memcpyaltivec i420_yuy2_altivec" -#ALTIVEC_MODULES="${ALTIVEC_MODULES} idctaltivec motionaltivec" - -dnl Check for fully workin MMX intrinsics +AC_ARG_WITH(,[]) +AC_ARG_WITH(,[Optimization options:]) + +dnl Check for fully working MMX intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) -AC_CACHE_CHECK([if \$CC groks MMX intrinsics], +AC_ARG_ENABLE(mmx, +[ --disable-mmx disable MMX optimizations (default auto)],,[ + case "${host_cpu}" in + i?86|x86_64) + enable_mmx="yes" + ;; + *) + enable_mmx="no" + ;; + esac +]) +AS_IF([test "${enable_mmx}" != "no"], [ + ARCH="${ARCH} mmx" + + AC_CACHE_CHECK([if $CC groks MMX intrinsics], [ac_cv_c_mmx_intrinsics], [CFLAGS="${CFLAGS_save} -O -mmmx" AC_TRY_COMPILE([#include @@ -1274,15 +1407,57 @@ AC_CACHE_CHECK([if \$CC groks MMX intrinsics], frobzor = (uint64_t)a;], [ac_cv_c_mmx_intrinsics=yes], [ac_cv_c_mmx_intrinsics=no])]) -if test "${ac_cv_c_mmx_intrinsics}" != "no"; then - AC_DEFINE(HAVE_MMX_INTRINSICS, 1, Define if MMX intrinsics are available.) - VLC_ADD_CFLAGS([${MMX_MODULES}],[-mmmx]) -fi + AS_IF([test "${ac_cv_c_mmx_intrinsics}" != "no"], [ + AC_DEFINE(HAVE_MMX_INTRINSICS, 1, + [Define to 1 if MMX intrinsics are available.]) + VLC_ADD_CFLAGS([memcpymmx i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx i420_ymga_mmx],[-mmmx]) + ]) + + AC_CACHE_CHECK([if $CC groks MMX inline assembly], + [ac_cv_mmx_inline], + [CFLAGS="${CFLAGS_save}" + AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));], + ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)]) + AS_IF([test "${ac_cv_mmx_inline}" != "no"], [ + AC_DEFINE(CAN_COMPILE_MMX, 1, + [Define to 1 inline MMX assembly is available.]) + VLC_ADD_PLUGIN([memcpymmx]) + VLC_ADD_PLUGIN([i420_rgb_mmx]) + VLC_ADD_PLUGIN([i420_yuy2_mmx]) + VLC_ADD_PLUGIN([i422_yuy2_mmx]) + VLC_ADD_PLUGIN([i420_ymga_mmx]) + ]) + + AC_CACHE_CHECK([if $CC groks MMX EXT inline assembly], + [ac_cv_mmxext_inline], + [CFLAGS="${CFLAGS_save}" + AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));], + ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)]) + AS_IF([test "${ac_cv_mmxext_inline}" != "no"], [ + AC_DEFINE(CAN_COMPILE_MMXEXT, 1, + [Define to 1 if MMX EXT inline assembly is available.]) + VLC_ADD_PLUGIN([memcpymmxext]) + ]) +]) dnl Check for fully workin SSE2 intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) -AC_CACHE_CHECK([if \$CC groks SSE2 intrinsics], +AC_ARG_ENABLE(sse, +[ --disable-sse disable SSE (1 and 2) optimizations (default auto)],, [ + case "${host_cpu}" in + i686|x86_64) + enable_sse=yes + ;; + *) + enable_sse=no + ;; + esac +]) +AS_IF([test "${enable_sse}" != "no"], [ + ARCH="${ARCH} sse sse2" + + AC_CACHE_CHECK([if $CC groks SSE2 intrinsics], [ac_cv_c_sse2_intrinsics], [CFLAGS="${CFLAGS_save} -O -msse2" AC_TRY_COMPILE([#include @@ -1299,83 +1474,77 @@ AC_CACHE_CHECK([if \$CC groks SSE2 intrinsics], frobzor = (uint64_t)_mm_movepi64_pi64(a);], [ac_cv_c_sse2_intrinsics=yes], [ac_cv_c_sse2_intrinsics=no])]) -if test "${ac_cv_c_sse2_intrinsics}" != "no"; then - AC_DEFINE(HAVE_SSE2_INTRINSICS, 1, Define if SSE2 intrinsics are available.) - VLC_ADD_CFLAGS([${SSE2_MODULES}],[-msse2]) -fi - -AC_CACHE_CHECK([if \$CC groks MMX inline assembly], - [ac_cv_mmx_inline], - [CFLAGS="${CFLAGS_save}" - AC_TRY_COMPILE(,[void *p;asm volatile("packuswb %%mm1,%%mm2"::"r"(p));], - ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)]) -if test "${ac_cv_mmx_inline}" != "no"; then - AC_DEFINE(CAN_COMPILE_MMX, 1, Define if \$CC groks MMX inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}" -fi - -AC_CACHE_CHECK([if \$CC groks MMX EXT inline assembly], - [ac_cv_mmxext_inline], - [CFLAGS="${CFLAGS_save}" - AC_TRY_COMPILE(,[void *p;asm volatile("maskmovq %%mm1,%%mm2"::"r"(p));], - ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)]) -if test "${ac_cv_mmxext_inline}" != "no"; then - AC_DEFINE(CAN_COMPILE_MMXEXT, 1, Define if \$CC groks MMX EXT inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}" -fi - -AC_CACHE_CHECK([if \$CC groks 3D Now! inline assembly], - [ac_cv_3dnow_inline], - [CFLAGS="${CFLAGS_save}" - AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));], - ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)]) -if test "${ac_cv_3dnow_inline}" != "no"; then - AC_DEFINE(CAN_COMPILE_3DNOW, 1, Define if \$CC groks 3D Now! inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${THREEDNOW_MODULES}" -fi + AS_IF([test "${ac_cv_c_sse2_intrinsics}" != "no"], [ + AC_DEFINE(HAVE_SSE2_INTRINSICS, 1, + [Define to 1 if SSE2 intrinsics are available.]) + VLC_ADD_CFLAGS([i420_rgb_sse2 i420_yuy2_sse2 i422_yuy2_sse2],[-msse2]) + ]) -AC_CACHE_CHECK([if \$CC groks SSE inline assembly], + AC_CACHE_CHECK([if $CC groks SSE inline assembly], [ac_cv_sse_inline], [CFLAGS="${CFLAGS_save}" AC_TRY_COMPILE(,[void *p;asm volatile("xorps %%xmm1,%%xmm2"::"r"(p));], ac_cv_sse_inline=yes, ac_cv_sse_inline=no)]) -if test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris"; then - AC_DEFINE(CAN_COMPILE_SSE, 1, Define if \$CC groks SSE inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${SSE_MODULES}" -fi + AS_IF([test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris"], [ + AC_DEFINE(CAN_COMPILE_SSE, 1, + [Define to 1 if SSE inline assembly is available.]) + ]) -AC_CACHE_CHECK([if \$CC groks SSE2 inline assembly], + AC_CACHE_CHECK([if $CC groks SSE2 inline assembly], [ac_cv_sse2_inline], [CFLAGS="${CFLAGS_save}" AC_TRY_COMPILE(,[void *p;asm volatile("punpckhqdq %%xmm1,%%xmm2"::"r"(p));], ac_cv_sse2_inline=yes, ac_cv_sse2_inline=no)]) -if test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris"; then - AC_DEFINE(CAN_COMPILE_SSE2, 1, Define if \$CC groks SSE2 inline assembly.) - ACCEL_MODULES="${ACCEL_MODULES} ${SSE2_MODULES}" -fi + AS_IF([test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris"], [ + AC_DEFINE(CAN_COMPILE_SSE2, 1, + [Define to 1 if SSE2 inline assembly is available.]) + VLC_ADD_PLUGIN([i420_rgb_sse2]) + VLC_ADD_PLUGIN([i420_yuy2_sse2]) + VLC_ADD_PLUGIN([i422_yuy2_sse2]) + ]) +]) -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then -AC_CACHE_CHECK([if \$CC groks AltiVec inline assembly], +AC_CACHE_CHECK([if $CC groks 3D Now! inline assembly], + [ac_cv_3dnow_inline], + [CFLAGS="${CFLAGS_save}" + AC_TRY_COMPILE(,[void *p;asm volatile("pfadd %%mm1,%%mm2"::"r"(p));], + ac_cv_3dnow_inline=yes, ac_cv_3dnow_inline=no)]) +AS_IF([test "${ac_cv_3dnow_inline}" != "no"], [ + AC_DEFINE(CAN_COMPILE_3DNOW, 1, + [Define to 1 if 3D Now! inline assembly is available.]) + VLC_ADD_PLUGIN([memcpy3dn]) +]) + +AC_ARG_ENABLE(altivec, +[ --disable-altivec disable AltiVec optimizations (default auto)],, [ + AS_IF([test "${host_cpu}" = "powerpc"], + [enable_altivec=yes], [enable_altivec=no]) +]) +AS_IF([test "${enable_altivec}" = "yes"], [ + ARCH="${ARCH} altivec"; + AC_CACHE_CHECK([if $CC groks AltiVec inline assembly], [ac_cv_altivec_inline], [CFLAGS="${CFLAGS_save}" AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], - ac_cv_altivec_inline=yes, + ac_cv_altivec_inline="yes", [CFLAGS="${CFLAGS_save} -Wa,-m7400" AC_TRY_COMPILE(,[asm volatile("vperm 0,1,2,3");], [ac_cv_altivec_inline="-Wa,-m7400"], ac_cv_altivec_inline=no) ])]) -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 - 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([libvlc],[${ac_cv_altivec_inline}]) - fi - ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" -fi + AS_IF([test "${ac_cv_altivec_inline}" != "no"], [ + AC_DEFINE(CAN_COMPILE_ALTIVEC, 1, + [Define to 1 if AltiVec inline assembly is available.]) + AS_IF([test "${ac_cv_altivec_inline}" != "yes"], [ + 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([libvlc],[${ac_cv_altivec_inline}]) + ]) + VLC_ADD_PLUGIN([memcpyaltivec]) + VLC_ADD_PLUGIN([i420_yuy2_altivec]) + ]) dnl The AltiVec C extensions dnl @@ -1387,7 +1556,7 @@ dnl - Linux PPC, gcc 3.4, 4.x: need which requires -maltivec dnl - Linux PPC, gcc 3.3: need and -maltivec -mabi=altivec dnl - Linux PPC, gcc 3.x: need and -fvec dnl - Others: test should fail -AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], + 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" @@ -1423,42 +1592,33 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C extensions], ]) CFLAGS="${CFLAGS_save}" ]) + AS_IF([test "${ac_cv_c_altivec}" != "no"], [ + CPPFLAGS="${CPPFLAGS_save} ${ac_cv_c_altivec}" + ]) -if test "${ac_cv_c_altivec}" != "no"; then - CPPFLAGS="${CPPFLAGS_save} ${ac_cv_c_altivec}" -fi - -AS_IF( test "${enable_altivec}" != "no", -[ AC_CHECK_HEADERS(altivec.h) 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.) + AS_IF([test "${ac_cv_c_altivec}" != "no"], [ + AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, + [Define to 1 if C AltiVec extensions are available.]) 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 - ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" - fi - fi -],[ - CPPFLAGS="${CPPFLAGS_save}" -]) + VLC_ADD_PLUGIN([memcpyaltivec]) + VLC_ADD_PLUGIN([i420_yuy2_altivec]) + ]) -AC_CACHE_CHECK([if linker needs -framework vecLib], + AC_CACHE_CHECK([if linker needs -framework vecLib], [ac_cv_ld_altivec], [LDFLAGS="${LDFLAGS_vlc} -Wl,-framework,vecLib" AC_TRY_LINK([],,ac_cv_ld_altivec=yes,ac_cv_ld_altivec=no) LDFLAGS="${LDFLAGS_save}" ]) -if test "${ac_cv_ld_altivec}" != "no"; then - VLC_ADD_LDFLAGS([libvlc idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib]) -fi -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" - -AC_ARG_WITH(,[]) -AC_ARG_WITH(,[Optimization options:]) + AS_IF([test "${ac_cv_ld_altivec}" != "no"], [ + VLC_ADD_LDFLAGS([libvlc idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib]) + ]) +]) dnl dnl Special arch tuning @@ -1471,7 +1631,7 @@ if test -n "${with_tuning}"; then CFLAGS_TUNING="-mtune=${with_tuning}" fi else - if test "${SYS}" = "darwin" -a "${host_cpu}" = "i686"; then + if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then CFLAGS_TUNING="-march=pentium-m -mtune=prescott" elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then CFLAGS_TUNING="-mtune=pentium2" @@ -1498,25 +1658,11 @@ AS_IF([test "${CFLAGS_TUNING}"], CFLAGS="${CFLAGS_save}" ]) -dnl -dnl x86 accelerations -dnl -if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}"="i486" -o "${host_cpu}" = "x86_64" -then - ARCH="${ARCH} mmx" - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) -fi -if test "${host_cpu}" = "i686" -o "${host_cpu}" = "x86_64" -then - ARCH="${ARCH} sse sse2" - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) -fi - dnl dnl Memory usage dnl AC_ARG_ENABLE(optimize-memory, -[ --enable-optimize-memory optimize memory usage over performance]) +[ --enable-optimize-memory optimize memory usage over performance]) if test "${enable_optimize_memory}" = "yes"; then AC_DEFINE(OPTIMIZE_MEMORY, 1, Define if you want to optimize memory usage over performance) fi @@ -1534,16 +1680,6 @@ if test "${enable_optimizations}" != "no"; then fi fi -dnl -dnl AltiVec acceleration -dnl -AC_ARG_ENABLE(altivec, -[ --disable-altivec disable AltiVec optimizations (default enabled on PPC)], -[ if test "${enable_altivec}" = "yes"; then ARCH="${ARCH} altivec"; - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ], -[ if test "${host_cpu}" = "powerpc"; then ARCH="${ARCH} altivec"; - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ]) - dnl dnl Debugging mode dnl @@ -1582,21 +1718,10 @@ dnl Stream output dnl AC_ARG_ENABLE(sout, [ --enable-sout Stream output modules (default enabled)]) -if test "${enable_sout}" != "no" -then - 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_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_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge stream_out_autodel]) - VLC_ADD_PLUGINS([stream_out_gather]) -# 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) -fi +AS_IF([test "${enable_sout}" != "no"], [ + AC_DEFINE(ENABLE_SOUT, 1, [Define to 1 for stream output support.]) +]) +AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"]) AC_ARG_ENABLE(switcher, [ --enable-switcher Stream-out switcher plugin (default disabled)]) @@ -1606,9 +1731,9 @@ AC_ARG_ENABLE(shout, [ --enable-shout libshout output plugin (default disabled)]) if test "${enable_shout}" = "yes"; then PKG_CHECK_MODULES(SHOUT, shout >= 2.1, - [AC_DEFINE(HAVE_SHOUT, [], [Define if you have the libshout library]) - VLC_ADD_PLUGINS([access_output_shout]) - VLC_ADD_LDFLAGS([access_output_shout],[$SHOUT_LIBS]) + [AC_DEFINE(HAVE_SHOUT, 1, [Define if you have the libshout library]) + VLC_ADD_PLUGIN([access_output_shout]) + VLC_ADD_LIBS([access_output_shout],[$SHOUT_LIBS]) VLC_ADD_CFLAGS([access_output_shout],[$SHOUT_CFLAGS])], [AC_MSG_WARN(libshout library not found)]) fi @@ -1624,31 +1749,31 @@ then AC_MSG_WARN([lua5.1 not found, trying lua >= 5.1 instead]) PKG_CHECK_MODULES(LUA, lua >= 5.1, [ have_lua=yes ], - [ + [ have_lua=yes - AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], - [], + AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], + [], [ have_lua=no ] ) - AC_CHECK_LIB( lua5.1 , luaL_newstate, + AC_CHECK_LIB( lua5.1 , luaL_newstate, [LUA_LIBS="-llua5.1"], - AC_CHECK_LIB( lua51 , luaL_newstate, + AC_CHECK_LIB( lua51 , luaL_newstate, [LUA_LIBS="-llua51"], - AC_CHECK_LIB( lua , luaL_newstate, - [LUA_LIBS="-llua"], - [ have_lua=no + AC_CHECK_LIB( lua , luaL_newstate, + [LUA_LIBS="-llua"], + [ have_lua=no AC_MSG_WARN([lua >= 5.1 not found!]) ]) - ) - ) + ) + ) ]) ]) if test "x${have_lua}" = "xyes" ; then - AC_DEFINE(HAVE_LUA, [], [Define if you have the lua library]) - VLC_ADD_PLUGINS([lua]) - VLC_ADD_LDFLAGS([lua],[$LUA_LIBS]) + AC_DEFINE(HAVE_LUA, 1, [Define if you have the lua library]) + VLC_ADD_LIBS([lua],[$LUA_LIBS]) VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS]) fi fi +AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"]) dnl dnl HTTP daemon @@ -1657,9 +1782,10 @@ AC_ARG_ENABLE(httpd, [ --enable-httpd HTTP daemon (default enabled)]) if test "${enable_httpd}" != "no" then - VLC_ADD_PLUGINS([http]) + VLC_ADD_PLUGIN([http]) AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support) fi +AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"]) dnl dnl VideoLAN manager @@ -1677,7 +1803,11 @@ dnl AC_ARG_ENABLE(growl, [ --enable-growl growl notification plugin (default enabled)]) AS_IF([test "${enable_growl}" != "no"], [ - VLC_ADD_PLUGINS([growl]) + VLC_ADD_PLUGIN([growl_udp]) + AC_CHECK_HEADERS(Growl/GrowlDefines.h, [ + VLC_ADD_PLUGIN([growl]) + VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit]) + ]) ] ) @@ -1690,12 +1820,12 @@ AC_ARG_ENABLE(notify, AS_IF([test "${enable_notify}" != "no" -a "${SYS}" != "mingw32"], [ PKG_CHECK_MODULES(NOTIFY, libnotify, [ - VLC_ADD_PLUGINS([notify]) + VLC_ADD_PLUGIN([notify]) VLC_ADD_CFLAGS(notify, [$NOTIFY_CFLAGS]) - VLC_ADD_LDFLAGS(notify, [$NOTIFY_LIBS]) + VLC_ADD_LIBS(notify, [$NOTIFY_LIBS]) ],[ - AS_IF([test "${enable_notify}" = "yes"],[ - AC_MSG_WARN( libnotify not found) ]) + AS_IF([test "${enable_notify}" = "yes"],[ + AC_MSG_WARN( libnotify not found) ]) ]) ]) @@ -1706,7 +1836,7 @@ dnl AC_ARG_ENABLE(audioscrobbler, [ --disable-audioscrobbler Last.fm submission plugin (default enabled)]) AS_IF([test "${enable_audioscrobbler}" != "no"], [ - VLC_ADD_PLUGINS([audioscrobbler]) + VLC_ADD_PLUGIN([audioscrobbler]) ]) dnl @@ -1716,9 +1846,9 @@ AC_ARG_ENABLE(musicbrainz, [ --enable-musicbrainz MusicBrainz support (default disabled) ]) AS_IF([test "${enable_musicbrainz}" = "yes"],[ PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz, - [ VLC_ADD_PLUGINS([musicbrainz]) - VLC_ADD_LDFLAGS([musicbrainz],[$MUSICBRAINZ_LIBS]) - VLC_ADD_CFLAGS([musicbrainz],[$MUSICBRAINZ_CFLAGS]) ], + [ VLC_ADD_PLUGIN([musicbrainz]) + VLC_ADD_LIBS([musicbrainz],[$MUSICBRAINZ_LIBS]) + VLC_ADD_CFLAGS([musicbrainz],[$MUSICBRAINZ_CFLAGS]) ], [AC_MSG_WARN(MusicBrainz library not found)]) ]) @@ -1731,8 +1861,8 @@ AC_ARG_ENABLE(taglib, AS_IF([test "${enable_taglib}" != "no"],[ PKG_CHECK_MODULES(TAGLIB, taglib, [ AC_DEFINE( HAVE_TAGLIB, 1, [Define if you have taglib plugin built] ) - VLC_ADD_PLUGINS([taglib]) - VLC_ADD_LDFLAGS([taglib],[$TAGLIB_LIBS -lz]) + VLC_ADD_PLUGIN([taglib]) + VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz]) VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ], [AC_MSG_WARN(TagLib library not found)]) ]) @@ -1782,18 +1912,18 @@ if test "${enable_live555}" != "no"; then VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}]) AC_CHECK_LIB(liveMedia_pic, main, [ # We have -lliveMedia_pic, build plugins - VLC_ADD_PLUGINS([live555]) - VLC_ADD_LDFLAGS([live555], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic]) + VLC_ADD_PLUGIN([live555]) + VLC_ADD_LIBS([live555], [-lliveMedia_pic -lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic]) ], [ AC_CHECK_LIB(liveMedia, main, [ # We only have -lliveMedia, do builtins - VLC_ADD_BUILTINS([live555]) - VLC_ADD_LDFLAGS([live555], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment]) + VLC_ADD_PLUGIN([live555]) + VLC_ADD_LIBS([live555], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment]) ]) ]) if test "${SYS}" = "mingw32"; then # add ws2_32 for closesocket, select, recv - VLC_ADD_LDFLAGS([live555],[-lws2_32]) + VLC_ADD_LIBS([live555],[-lws2_32]) fi ]) CPPFLAGS="${CPPFLAGS_save}" @@ -1809,17 +1939,17 @@ if test "${enable_live555}" != "no"; then if test -f "${real_live555_tree}/liveMedia/libliveMedia.a"; then AC_MSG_RESULT(${real_live555_tree}/liveMedia/libliveMedia.a) - VLC_ADD_BUILTINS([live555]) + VLC_ADD_PLUGIN([live555]) if test "${SYS}" = "mingw32"; then # add ws2_32 for closesocket, select, recv - VLC_ADD_LDFLAGS([live555],[-lws2_32]) + VLC_ADD_LIBS([live555],[-lws2_32]) fi - VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia]) - VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/BasicUsageEnvironment -lBasicUsageEnvironment]) - VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/groupsock -lgroupsock]) - VLC_ADD_LDFLAGS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment]) + VLC_ADD_LIBS([live555],[-L${real_live555_tree}/liveMedia -lliveMedia]) + VLC_ADD_LIBS([live555],[-L${real_live555_tree}/BasicUsageEnvironment -lBasicUsageEnvironment]) + VLC_ADD_LIBS([live555],[-L${real_live555_tree}/groupsock -lgroupsock]) + VLC_ADD_LIBS([live555],[-L${real_live555_tree}/UsageEnvironment -lUsageEnvironment]) VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/BasicUsageEnvironment/include]) VLC_ADD_CXXFLAGS([live555],[-I${real_live555_tree}/groupsock/include]) @@ -1842,15 +1972,15 @@ dnl dnl special access module for dc1394 input dnl AC_ARG_ENABLE(dc1394, - [ --enable-dc1394 dc1394 access module (default disabled)]) + [ --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]) + VLC_ADD_PLUGIN([dc1394]) + VLC_ADD_LIBS([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]) @@ -1888,8 +2018,8 @@ then then dnl Use ${with_dv_raw1394}/include/libraw1394/raw1394.h AC_MSG_RESULT(yes) - VLC_ADD_PLUGINS([access_dv]) - VLC_ADD_LDFLAGS([access_dv],[-L${with_dv_raw1394}/lib -lraw1394 -lpthread]) + VLC_ADD_PLUGIN([access_dv]) + VLC_ADD_LIBS([access_dv],[-L${with_dv_raw1394}/lib -lraw1394 -lpthread]) VLC_ADD_CPPFLAGS([access_dv],[-I${with_dv_raw1394}/include]) else dnl No libraw1394 could be found, sorry @@ -1898,8 +2028,8 @@ then fi else AC_CHECK_HEADERS(libraw1394/raw1394.h, - [ VLC_ADD_PLUGINS([access_dv]) - VLC_ADD_LDFLAGS([access_dv],[-lraw1394 -lavc1394]) + [ VLC_ADD_PLUGIN([access_dv]) + VLC_ADD_LIBS([access_dv],[-lraw1394 -lavc1394]) ],[ if test -n "${enable_dv}" then @@ -1924,7 +2054,7 @@ then dnl Use a custom libraw1394 AC_MSG_RESULT(${real_dv_raw1394_tree}/src/.libs/libraw1394.a) VLC_ADD_BUILTINS([access_dv]) - VLC_ADD_LDFLAGS([access_dv],[-L${real_dv_raw1394_tree}/src/.libs -lraw1394]) + VLC_ADD_LIBS([access_dv],[-L${real_dv_raw1394_tree}/src/.libs -lraw1394]) VLC_ADD_CPPFLAGS([access_dv],[-I${real_dv_raw1394_tree}]) else dnl The given libraw1394 wasn't built @@ -1949,7 +2079,7 @@ then then dnl Use ${with_dv_avc1394}/include/libavc1394/avc1394.h AC_MSG_RESULT(yes) - VLC_ADD_LDFLAGS([access_dv],[-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 -lpthread]) + VLC_ADD_LIBS([access_dv],[-L${with_dv_avc1394}/lib -lavc1394 -lrom1394 -lpthread]) VLC_ADD_CPPFLAGS([access_dv],[-I${with_avc1394}/include]) else dnl No libavc1394 could be found, sorry @@ -1958,7 +2088,7 @@ then fi else AC_CHECK_HEADERS(libavc1394/avc1394.h, - [ VLC_ADD_LDFLAGS([access_dv],[-lavc1394 -lrom1394 -lpthread]) + [ VLC_ADD_LIBS([access_dv],[-lavc1394 -lrom1394 -lpthread]) ],[ if test -n "${enable_dv}" then @@ -1982,7 +2112,7 @@ then then dnl Use a custom libavc1394 AC_MSG_RESULT(${real_dv_avc1394_tree}/src/.libs/libavc1394.a) - VLC_ADD_LDFLAGS([access_dv],[-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 -lpthread]) + VLC_ADD_LIBS([access_dv],[-L${real_dv_avc1394_tree}/src/.libs -lavc1394 -lrom1394 -lpthread]) VLC_ADD_CPPFLAGS([access_dv],[-I${real_dv_avc1394_tree}]) else dnl The given libavc1394 wasn't built @@ -2006,7 +2136,7 @@ then dnl Temporary hack (yeah, sure ;) if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then - VLC_ADD_LDFLAGS([dvdread],[-ldvdcss]) + VLC_ADD_LIBS([dvdread],[-ldvdcss]) fi if test -z "${with_dvdread}" @@ -2014,8 +2144,8 @@ 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}]) + [ VLC_ADD_PLUGIN([dvdread]) + VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}]) ],[ if test -n "${enable_dvdread}" then @@ -2036,7 +2166,7 @@ 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_LIBS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LIBS_dvdcss}]) VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}]) else dnl The given libdvdread wasn't built @@ -2050,8 +2180,8 @@ then 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_PLUGIN([dvdread]) + VLC_ADD_LIBS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LIBS_dvdcss}]) VLC_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include]) else dnl No libdvdread could be found, sorry @@ -2070,7 +2200,7 @@ 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]) + VLC_ADD_LIBS([dvdnav],[-ldvdcss]) fi DVDNAV_PATH="${PATH}" @@ -2083,9 +2213,9 @@ then AC_PATH_PROG(DVDNAV_CONFIG, dvdnav-config, no, ${DVDNAV_PATH}) if test "${DVDNAV_CONFIG}" != "no" then - VLC_ADD_PLUGINS([dvdnav]) + VLC_ADD_PLUGIN([dvdnav]) VLC_ADD_CFLAGS([dvdnav],[`${DVDNAV_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([dvdnav],[`${DVDNAV_CONFIG} --libs`]) + VLC_ADD_LIBS([dvdnav],[`${DVDNAV_CONFIG} --libs`]) fi fi @@ -2100,9 +2230,9 @@ then then AC_LANG_PUSH(C++) AC_CHECK_HEADERS(dshow.h, - [ VLC_ADD_PLUGINS([dshow]) + [ VLC_ADD_PLUGIN([dshow]) VLC_ADD_CXXFLAGS([dshow],[]) - VLC_ADD_LDFLAGS([dshow],[-lole32 -loleaut32 -luuid]) ]) + VLC_ADD_LIBS([dshow],[-lole32 -loleaut32 -luuid]) ]) AC_LANG_POP(C++) fi fi @@ -2111,15 +2241,15 @@ dnl dnl Windows DirectShow BDA access module dnl AC_ARG_ENABLE(bda, - [ --enable-bda Win32 DirectShow BDA support (default enabled on Win32)]) + [ --enable-bda Win32 DirectShow BDA support (default enabled on Win32)]) if test "${enable_bda}" != "no" then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" then AC_CHECK_HEADERS(dshow.h, - [ VLC_ADD_PLUGINS([bda]) + [ VLC_ADD_PLUGIN([bda]) VLC_ADD_CXXFLAGS([bda],[]) - VLC_ADD_LDFLAGS([bda],[-lstrmiids -lole32 -loleaut32 -luuid]) ]) + VLC_ADD_LIBS([bda],[-lstrmiids -lole32 -loleaut32 -luuid]) ]) fi fi @@ -2128,7 +2258,7 @@ dnl dnl OpenCV wrapper and example filters dnl AC_ARG_ENABLE(opencv, - [ --enable-opencv OpenCV (computer vision) filter (default disabled)]) + [ --enable-opencv OpenCV (computer vision) filter (default disabled)]) if test "${enable_opencv}" = "yes" -a "${CXX}" != ""; then AC_ARG_WITH(opencv-tree, @@ -2142,12 +2272,12 @@ then -a -f ${with_opencv_tree}/cvaux/include/cvaux.h -a -f ${with_opencv_tree}/otherlibs/highgui/highgui.h then AC_MSG_RESULT(yes) - VLC_ADD_PLUGINS([opencv_wrapper]) - VLC_ADD_LDFLAGS([opencv_wrapper],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui]) + VLC_ADD_PLUGIN([opencv_wrapper]) + VLC_ADD_LIBS([opencv_wrapper],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui]) VLC_ADD_CFLAGS([opencv_wrapper],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui]) AC_LANG_PUSH(C++) - VLC_ADD_PLUGINS([opencv_example]) - VLC_ADD_LDFLAGS([opencv_example],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui]) + VLC_ADD_PLUGIN([opencv_example]) + VLC_ADD_LIBS([opencv_example],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui]) VLC_ADD_CXXFLAGS([opencv_example],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui]) AC_LANG_POP(C++) else @@ -2169,13 +2299,13 @@ AC_ARG_ENABLE(smb, [ --enable-smb smb input module (default enabled)]) if test "${enable_smb}" != "no"; then AC_CHECK_HEADERS(libsmbclient.h, - [ VLC_ADD_PLUGINS([access_smb]) - VLC_ADD_LDFLAGS([access_smb],[-lsmbclient]) ], + [ VLC_ADD_PLUGIN([access_smb]) + VLC_ADD_LIBS([access_smb],[-lsmbclient]) ], [ if test -n "${enable_smb}"; then AC_MSG_ERROR([cannot find libsmbclient headers]) fi ]) AC_CHECK_MEMBER([struct _SMBCCTX.close_fn], - AC_DEFINE([HAVE__SMBCCTX_CLOSE_FN], [1], [Define if samba has _SMBCCTX.close_fn]),, + AC_DEFINE([HAVE__SMBCCTX_CLOSE_FN], 1, [Define if samba has _SMBCCTX.close_fn]),, [#include ]) fi @@ -2195,11 +2325,11 @@ then if test -z "${with_dvbpsi_tree}" then AC_CHECK_HEADERS(dvbpsi/dr.h, - [ VLC_ADD_PLUGINS([ts]) + [ VLC_ADD_PLUGIN([ts]) if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGINS([mux_ts]) + VLC_ADD_PLUGIN([mux_ts]) fi - VLC_ADD_LDFLAGS([mux_ts ts dvb],[-ldvbpsi]) ], + VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi]) ], [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], [#if defined( HAVE_STDINT_H ) # include @@ -2228,7 +2358,7 @@ then VLC_ADD_BUILTINS([mux_ts]) fi VLC_ADD_CPPFLAGS([mux_ts ts dvb],[-I${real_dvbpsi_tree}/src]) - VLC_ADD_LDFLAGS([mux_ts ts dvb],[${real_dvbpsi_tree}/src/.libs/libdvbpsi.a]) + VLC_ADD_LIBS([mux_ts ts dvb],[${real_dvbpsi_tree}/src/.libs/libdvbpsi.a]) else dnl The given libdvbpsi wasn't built AC_MSG_RESULT(no) @@ -2251,12 +2381,12 @@ then fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}" AC_CHECK_HEADERS([dvbpsi/dr.h],[ - VLC_ADD_PLUGINS([ts]) + VLC_ADD_PLUGIN([ts]) if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGINS([mux_ts]) + VLC_ADD_PLUGIN([mux_ts]) fi VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}]) - VLC_ADD_LDFLAGS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi]) + VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi]) ],[ if test -n "${enable_dvbpsi}" @@ -2269,7 +2399,7 @@ then esac AC_CHECK_LIB(dvbpsi, dvbpsi_GenSDTSections, [ AC_DEFINE(HAVE_DVBPSI_SDT, 1, [Define if you have dvbpsi_GenSDTSections.]) - ], [], [${LDFLAGS_ts}]) + ], [], [${LIBS_ts}]) fi @@ -2289,16 +2419,16 @@ then CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l}" AC_CHECK_HEADERS(linux/videodev.h, [ - VLC_ADD_PLUGINS([v4l]) + VLC_ADD_PLUGIN([v4l]) ],[]) CPPFLAGS="${CPPFLAGS_save}" fi dnl -dnl Video4Linux plugin +dnl Video4Linux2 plugin dnl AC_ARG_ENABLE(v4l2, - [ --enable-v4l2 Video4Linux2 input support (default disabled)]) + [ --enable-v4l2 Video4Linux2 input support (default disabled)]) if test "${enable_v4l2}" = "yes" then AC_ARG_WITH(v4l2, @@ -2308,9 +2438,22 @@ then VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include]) fi + AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false") + if test "${have_v4l2_alsa}" = "true" + then + CFLAGS="${CFLAGS_save}" + AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API + #define ALSA_PCM_NEW_SW_PARAMS_API + #include ], + [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_LDFLAGS([v4l2],[-lasound -lm -ldl]) + AC_DEFINE(HAVE_ALSA, 1, Define if ALSA is present.) + fi + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" AC_CHECK_HEADERS(linux/videodev2.h, [ - VLC_ADD_PLUGINS([v4l2]) + VLC_ADD_PLUGIN([v4l2]) ],[]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -2323,7 +2466,7 @@ AC_ARG_ENABLE(pvr, [ --enable-pvr PVR cards access module (default disabled)]) if test "${enable_pvr}" = "yes" then - VLC_ADD_PLUGINS([pvr]) + VLC_ADD_PLUGIN([pvr]) AC_ARG_WITH(videodev2, [ --with-videodev2=FILE Location of videodev2.h file (default /usr/include/linux/videodev2.h)],[],[]) if test "${with_videodev2}" != "no" -a -n "${with_videodev2}" @@ -2358,10 +2501,10 @@ AC_ARG_ENABLE(gnomevfs, if test "${enable_gnomevfs}" = "yes" then PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0, - VLC_ADD_LDFLAGS([access_gnomevfs],[$GNOMEVFS_LIBS]) + VLC_ADD_LIBS([access_gnomevfs],[$GNOMEVFS_LIBS]) VLC_ADD_CPPFLAGS([access_gnomevfs],[$GNOMEVFS_CPPFLAGS]) VLC_ADD_CFLAGS([access_gnomevfs],[$GNOMEVFS_CFLAGS]) - VLC_ADD_PLUGINS([access_gnomevfs]), + VLC_ADD_PLUGIN([access_gnomevfs]), AC_MSG_WARN([GnomeVFS support disabled because GnomeVFS development headers not found])) fi @@ -2376,13 +2519,13 @@ if test "${enable_libcdio}" != "no" then PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.78.2, have_libcdio=yes - AC_DEFINE(HAVE_LIBCDIO, [], + AC_DEFINE(HAVE_LIBCDIO, 1, [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.22, [have_libvcdinfo=yes - AC_DEFINE(HAVE_VCDINFO, [], + AC_DEFINE(HAVE_VCDINFO, 1, [Define if you have libvcdinfo 0.7.22 or greater installed])], [AC_MSG_WARN(VCD information library not found)]) fi @@ -2400,12 +2543,12 @@ if test "${enable_cddax}" = "yes" then if test "$have_libcdio" = "yes" then - AC_DEFINE(HAVE_CDDAX, [], [Define for the audio CD plugin using libcdio]) - VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS]) + AC_DEFINE(HAVE_CDDAX, 1, [Define for the audio CD plugin using libcdio]) + VLC_ADD_LIBS([cddax],[$LIBCDIO_LIBS]) VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS]) - VLC_ADD_PLUGINS([cddax]) + VLC_ADD_PLUGIN([cddax]) PKG_CHECK_MODULES(LIBCDIO_PARANOIA, libcdio_paranoia >= 0.72, [ - VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_CDDA_LIBS $LIBCDIO_CDDA_LIBS $LIBCDIO_PARANOIA_LIBS])], + VLC_ADD_LIBS([cddax],[$LIBCDIO_CDDA_LIBS $LIBCDIO_CDDA_LIBS $LIBCDIO_PARANOIA_LIBS])], AC_MSG_WARN([CD Paranoia support disabled because no libcdio >= 0.72 found])) else AC_MSG_WARN([cddax plugin disabled because ok libcdio library not found or disabled]) @@ -2415,8 +2558,8 @@ then if test "$enable_libcddb" != "no"; then PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [ HAVE_LIBCDDB=yes - AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed]) - VLC_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS]) + AC_DEFINE(HAVE_LIBCDDB, 1, [Define this if you have libcddb installed]) + VLC_ADD_LIBS([cddax],[$LIBCDDB_LIBS]) VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS]) ], [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) @@ -2432,7 +2575,7 @@ if test "${enable_vcdx}" = "yes" then if test "${have_libvcdinfo}" = "yes" then - VLC_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS]) + VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS]) VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS]) else AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found or disabled]) @@ -2440,18 +2583,18 @@ then fi PKG_CHECK_MODULES(LIBCDIO, libiso9660 >= 0.72, - [VLC_ADD_LDFLAGS([vcdx],[$LIBISO9660_LIBS]) + [VLC_ADD_LIBS([vcdx],[$LIBISO9660_LIBS]) VLC_ADD_CFLAGS([vcdx],[$LIBISO9660_CFLAGS])], [AC_MSG_WARN([vcdx plugin disabled because ok libiso9660 library not found]) HAVE_VCDX=no]) if test "$have_libvcdinfo" = "yes" then - AC_DEFINE(HAVE_VCDX, [], + AC_DEFINE(HAVE_VCDX, 1, [Define for the VCD plugin using libcdio/libvcdinfo]) - VLC_ADD_LDFLAGS([vcdx],[$VCDINFO_LIBS]) + VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS]) VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS]) - VLC_ADD_PLUGINS([vcdx]) + VLC_ADD_PLUGIN([vcdx]) else AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found]) HAVE_VCDX=no @@ -2472,7 +2615,8 @@ then AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h) AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[ AC_MSG_RESULT(yes) - VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGIN([vcd]) + VLC_ADD_PLUGIN([cdda]) ],[ AC_MSG_RESULT(no) ]) @@ -2480,7 +2624,8 @@ then AC_MSG_CHECKING(for scsireq in sys/scsiio.h) AC_EGREP_HEADER(scsireq,sys/scsiio.h,[ AC_MSG_RESULT(yes) - VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGIN([vcd]) + VLC_ADD_PLUGIN([cdda]) AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support) ],[ AC_MSG_RESULT(no) @@ -2489,7 +2634,8 @@ 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) - VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGIN([vcd]) + VLC_ADD_PLUGIN([cdda]) AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support) ],[ AC_MSG_RESULT(no) @@ -2497,21 +2643,23 @@ then if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32" then - VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGIN([vcd]) + VLC_ADD_PLUGIN([cdda]) fi if test "${SYS}" = "darwin" then - VLC_ADD_PLUGINS([vcd cdda]) + VLC_ADD_PLUGIN([vcd]) + VLC_ADD_PLUGIN([cdda]) VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-Wl,-framework,IOKit,-framework,CoreFoundation]) - VLC_ADD_LDFLAGS([vcdx cddax cdda],[-liconv]) + VLC_ADD_LIBS([vcdx cddax cdda],[-liconv]) fi if test "$enable_libcddb" != "no"; then PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [ HAVE_LIBCDDB=yes - AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed]) - VLC_ADD_LDFLAGS([cdda],[$LIBCDDB_LIBS]) + AC_DEFINE(HAVE_LIBCDDB, 1, [Define this if you have libcddb installed]) + VLC_ADD_LIBS([cdda],[$LIBCDDB_LIBS]) VLC_ADD_CFLAGS([cdda],[$LIBCDDB_CFLAGS]) ],: [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) @@ -2537,7 +2685,7 @@ then AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [ if test -z "${with_dvbpsi_tree}" then - VLC_ADD_PLUGINS([dvb]) + VLC_ADD_PLUGIN([dvb]) else VLC_ADD_BUILTINS([dvb]) fi @@ -2552,24 +2700,26 @@ 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],[-Wl,-framework,ApplicationServices]) + AC_CHECK_HEADERS(OpenGL/gl.h, [ + AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [ + VLC_ADD_PLUGIN([screen]) + VLC_ADD_LDFLAGS([screen],[-Wl,-framework,OpenGL,-framework,ApplicationServices]) + ]) ]) elif test "${SYS}" = "mingw32"; then - VLC_ADD_PLUGINS([screen]) - VLC_ADD_LDFLAGS([screen],[-lgdi32]) + VLC_ADD_PLUGIN([screen]) + VLC_ADD_LIBS([screen],[-lgdi32]) elif test "${SYS}" = "mingwce"; then CPPFLAGS="${CPPFLAGS_save}" elif test "${SYS}" = "beos"; then - VLC_ADD_PLUGINS([screen]) + VLC_ADD_PLUGIN([screen]) VLC_ADD_CXXFLAGS([screen],[]) - VLC_ADD_LDFLAGS([screen],[-lbe]) + VLC_ADD_LIBS([screen],[-lbe]) else CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" AC_CHECK_HEADERS(X11/Xlib.h, [ - VLC_ADD_PLUGINS([screen]) - VLC_ADD_LDFLAGS([screen],[${X_LIBS} ${X_PRE_LIBS} -lX11]) + VLC_ADD_PLUGIN([screen]) + VLC_ADD_LIBS([screen],[${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_CPPFLAGS([screen],[${X_CFLAGS}]) ]) CPPFLAGS="${CPPFLAGS_save}" @@ -2615,11 +2765,11 @@ then then dnl Use a custom ogg AC_MSG_RESULT(${real_ogg_tree}/src/.libs/libogg.a) - VLC_ADD_PLUGINS([ogg]) + VLC_ADD_PLUGIN([ogg]) if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGINS([mux_ogg]) + VLC_ADD_PLUGIN([mux_ogg]) fi - VLC_ADD_LDFLAGS([ogg mux_ogg speex vorbis],[${real_ogg_tree}/src/.libs/libogg.a]) + VLC_ADD_LIBS([ogg mux_ogg speex vorbis],[${real_ogg_tree}/src/.libs/libogg.a]) VLC_ADD_CFLAGS([ogg mux_ogg speex vorbis],[-I${real_ogg_tree}/include]) else dnl The given ogg wasn't built @@ -2629,11 +2779,11 @@ then else AC_CHECK_HEADERS(ogg/ogg.h, [ AC_CHECK_LIB( ogg, oggpack_read, [ - VLC_ADD_PLUGINS([ogg]) + VLC_ADD_PLUGIN([ogg]) if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGINS([mux_ogg]) + VLC_ADD_PLUGIN([mux_ogg]) fi - VLC_ADD_LDFLAGS([ogg mux_ogg],[-logg])]) + VLC_ADD_LIBS([ogg mux_ogg],[-logg])]) ],[]) fi fi @@ -2671,12 +2821,12 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then VLC_ADD_CXXFLAGS([mkv],[-O1]) fi AC_CHECK_LIB(ebml_pic, main, [ - VLC_ADD_PLUGINS([mkv]) - VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml_pic]) + VLC_ADD_PLUGIN([mkv]) + VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic]) ], AC_CHECK_LIB(ebml, main, [ - VLC_ADD_PLUGINS([mkv]) - VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml]) + VLC_ADD_PLUGIN([mkv]) + VLC_ADD_LIBS([mkv],[-lmatroska -lebml]) ]) ) ], @@ -2715,8 +2865,8 @@ then 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 -lstdc++]) + VLC_ADD_PLUGIN([mod]) + VLC_ADD_LIBS([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 @@ -2725,9 +2875,9 @@ then fi else AC_CHECK_HEADERS(libmodplug/modplug.h, [ - VLC_ADD_PLUGINS([mod]) + VLC_ADD_PLUGIN([mod]) VLC_ADD_CXXFLAGS([mod],[]) - VLC_ADD_LDFLAGS([mod],[-lmodplug -lstdc++])]) + VLC_ADD_LIBS([mod],[-lmodplug -lstdc++])]) fi fi @@ -2739,8 +2889,8 @@ AC_ARG_ENABLE(mpc, if test "${enable_mpc}" != "no" then AC_CHECK_HEADERS(mpcdec/mpcdec.h, [ - VLC_ADD_PLUGINS([mpc]) - VLC_ADD_LDFLAGS([mpc],[-lmpcdec])]) + VLC_ADD_PLUGIN([mpc]) + VLC_ADD_LIBS([mpc],[-lmpcdec])]) fi dnl @@ -2767,8 +2917,8 @@ then then dnl Use a custom gme AC_MSG_RESULT(${real_gme_tree}/gme/libgme.a) - VLC_ADD_PLUGINS([gme]) - VLC_ADD_LDFLAGS([gme],[${real_gme_tree}/gme/libgme.a]) + VLC_ADD_PLUGIN([gme]) + VLC_ADD_LIBS([gme],[${real_gme_tree}/gme/libgme.a]) VLC_ADD_CXXFLAGS([gme],[-I${real_gme_tree}/gme]) else dnl The given gme wasn't built @@ -2799,7 +2949,7 @@ then if test "${with_mad}" != "no" -a -n "${with_mad}" then VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include]) - VLC_ADD_LDFLAGS([mpgatofixed32],[-L${with_mad}/lib]) + VLC_ADD_LIBS([mpgatofixed32],[-L${with_mad}/lib]) fi AC_ARG_WITH(mad-tree, @@ -2819,11 +2969,11 @@ then then AC_MSG_RESULT(yes) VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}]) - VLC_ADD_LDFLAGS([mpgatofixed32],[-L${real_mad_tree}/.libs]) - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}" + VLC_ADD_LIBS([mpgatofixed32],[-L${real_mad_tree}/.libs]) + LDFLAGS="${LDFLAGS_save} ${LIBS_mpgatofixed32}" AC_CHECK_LIB(mad, mad_bit_init, [ VLC_ADD_BUILTINS([mpgatofixed32]) - VLC_ADD_LDFLAGS([mpgatofixed32],[-lmad]) + VLC_ADD_LIBS([mpgatofixed32],[-lmad]) ],[ AC_MSG_ERROR([the specified tree hasn't been compiled ]) ],[]) LDFLAGS="${LDFLAGS_save}" @@ -2833,12 +2983,12 @@ then fi else CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mpgatofixed32}" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}" + LDFLAGS="${LDFLAGS_save} ${LIBS_mpgatofixed32}" 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, [ - VLC_ADD_PLUGINS([mpgatofixed32]) - VLC_ADD_LDFLAGS([mpgatofixed32],[-lmad])], + VLC_ADD_PLUGIN([mpgatofixed32]) + VLC_ADD_LIBS([mpgatofixed32],[-lmad])], [ AC_MSG_ERROR([Cannot find libmad library...]) ]) CPPFLAGS="${CPPFLAGS_save}" LDFLAGS="${LDFLAGS_save}" @@ -2853,8 +3003,8 @@ AC_ARG_ENABLE( id3tag, AS_IF([test "${enable_id3tag}" != "no"], [ AC_CHECK_HEADERS(id3tag.h, [ AC_CHECK_HEADERS(zlib.h, [ - VLC_ADD_LDFLAGS([id3tag],[-lid3tag -lz]) - VLC_ADD_PLUGINS([id3tag]) + VLC_ADD_LIBS([id3tag],[-lid3tag -lz]) + VLC_ADD_PLUGIN([id3tag]) ]) ]) ]) @@ -2862,8 +3012,8 @@ AS_IF([test "${enable_id3tag}" != "no"], [ dnl dnl ffmpeg decoder/demuxer plugin dnl -dnl we try to find ffmpeg using : 1- given tree 2- ffmpeg-config, 3- pkg-config -dnl 4- default place, +dnl we try to find ffmpeg using : 1- given tree, 2- pkg-config +dnl 3- default place, AC_ARG_ENABLE(ffmpeg, [ --enable-ffmpeg ffmpeg codec (default enabled)]) @@ -2876,24 +3026,24 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo [ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support], [ if test "$with_ffmpeg_mp3lame" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) + VLC_ADD_LIBS([ffmpeg],[-lmp3lame]) fi]) AC_ARG_WITH(ffmpeg-faac, [ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support], [ if test "$with_ffmpeg_faac" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) + VLC_ADD_LIBS([ffmpeg],[-lfaac]) fi]) AC_ARG_WITH(ffmpeg-dts, [ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support], [ if test "$with_ffmpeg_dts" = "yes"; then - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg} ${LIBS_ffmpeg}" AC_CHECK_LIB(dts_pic, dts_free, - [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts_pic]) ], - [ VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ]) + [ VLC_ADD_LIBS([ffmpeg],[-ldts_pic]) ], + [ VLC_ADD_LIBS([ffmpeg],[-ldts]) ]) LDFLAGS="${LDFLAGS_save}" fi]) @@ -2901,56 +3051,56 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo [ --with-ffmpeg-vorbis specify if ffmpeg has been compiled with vorbis support], [ if test "$with_ffmpeg_vorbis" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lvorbisenc -lvorbis]) + VLC_ADD_LIBS([ffmpeg],[-lvorbisenc -lvorbis]) fi]) AC_ARG_WITH(ffmpeg-theora, [ --with-ffmpeg-theora specify if ffmpeg has been compiled with theora support], [ if test "$with_ffmpeg_theora" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-ltheora]) + VLC_ADD_LIBS([ffmpeg],[-ltheora]) fi]) AC_ARG_WITH(ffmpeg-ogg, [ --with-ffmpeg-ogg specify if ffmpeg has been compiled with ogg support], [ if test "$with_ffmpeg_ogg" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-logg]) + VLC_ADD_LIBS([ffmpeg],[-logg]) fi]) AC_ARG_WITH(ffmpeg-zlib, [ --with-ffmpeg-zlib specify if ffmpeg has been compiled with zlib support], [ if test "$with_ffmpeg_zlib" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lz]) + VLC_ADD_LIBS([ffmpeg],[-lz]) fi]) AC_ARG_WITH(ffmpeg-amrnb, [ --with-ffmpeg-amrnb specify if ffmpeg has been compiled with libamrnb support], [ if test "$with_ffmpeg_amrnb" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lamrnb]) + VLC_ADD_LIBS([ffmpeg],[-lamrnb]) fi]) AC_ARG_WITH(ffmpeg-amrwb, [ --with-ffmpeg-amrwb specify if ffmpeg has been compiled with libamrwb support], [ if test "$with_ffmpeg_amrwb" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lamrwb]) + VLC_ADD_LIBS([ffmpeg],[-lamrwb]) fi]) AC_ARG_WITH(ffmpeg-x264, - [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support], + [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libx264 support], [ if test "$with_ffmpeg_x264" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-lx264]) + VLC_ADD_LIBS([ffmpeg],[-lx264]) fi]) AC_ARG_WITH(ffmpeg-a52, - [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support], + [ --with-ffmpeg-a52 specify if ffmpeg has been compiled with liba52 support], [ if test "$with_ffmpeg_a52" = "yes"; then - VLC_ADD_LDFLAGS([ffmpeg],[-la52]) + VLC_ADD_LIBS([ffmpeg],[-la52]) fi]) dnl @@ -2974,77 +3124,65 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo fi if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then - VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec/libpostproc ${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a]) + VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec/libpostproc ${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a]) elif test -f "${real_ffmpeg_tree}/libpostproc/libpostproc.a"; then - VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a]) + VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a]) VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}]) else - dnl The given libavcodec wasn't built with --enable-pp + dnl The given libavcodec wasn't built with --enable-postproc AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find libpostproc.a in ${real_ffmpeg_tree}/[libavcodec/]libpostproc/. Make sure you configured ffmpeg with --enable-pp]) + AC_MSG_ERROR([cannot find libpostproc.a in ${real_ffmpeg_tree}/[libavcodec/]libpostproc/. Make sure you configured ffmpeg with --enable-postproc]) fi fi dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) - + dnl Use pkg-config to look for the ldflags in libav*-uninstalled.pc PKG_CONFIG_PATH_save="$PKG_CONFIG_PATH" PKG_CONFIG_LIBDIR_save="$PKG_CONFIG_LIBDIR" export PKG_CONFIG_PATH="" export PKG_CONFIG_LIBDIR="${real_ffmpeg_tree}" - - PKG_CHECK_MODULES( [FFMPEG],[libavcodec libavformat libpostproc], [ - VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS}) - VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})] - ,[]) + VLC_SAVE_FLAGS + + PKG_CHECK_MODULES( [FFMPEG],[libavformat libavcodec libpostproc], [ + VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS}) + VLC_ADD_LIBS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})] + AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.]) + ) + AS_IF([ test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"],[ + AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.]) + PKG_CHECK_MODULES( [SWSCALE],[libswscale], [ + VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}]) + VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[${SWSCALE_CFLAGS}])]) + ]) + CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS} ${SWSCALE_CFLAGS}" + CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS} ${SWSCALE_CFLAGS}" + + AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) + AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h) + AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h]) + + VLC_RESTORE_FLAGS AS_IF([test -n "${PKG_CONFIG_PATH_save}"],[ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH_save}" ],[ - unset PKG_CONFIG_PATH + unset PKG_CONFIG_PATH ]) - AS_IF([test -n "${PKG_CONFIG_LIBDIR_save}"],[ - export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR_save}" + AS_IF([test -n "${PKG_CONFIG_LIBDIR_save}"],[ + export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR_save}" ],[ unset PKG_CONFIG_LIBDIR ]) - + VLC_ADD_BUILTINS([ffmpeg]) if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes" ; then VLC_ADD_BUILTINS([stream_out_switcher]) 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 ) - - FFMPEG_PATH="${PATH}" - AC_ARG_WITH(ffmpeg-config-path, - [ --with-ffmpeg-config-path=PATH ffmpeg-config path (default search in \$PATH)], - [ if test "${with_ffmpeg_config_path}" != "no" - then - FFMPEG_PATH="${with_ffmpeg_config_path}" - fi ]) - AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH}) - if test "${FFMPEG_CONFIG}" != "no" - then - AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_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_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]) - fi - VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`]) - - else +else + dnl Trying with pkg-config PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], @@ -3052,82 +3190,73 @@ dnl Trying with pkg-config 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(ffmpeg/avcodec.h libavcodec/avcodec.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) + AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.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}]) + VLC_ADD_LIBS([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 - VLC_ADD_PLUGINS([ffmpeg]) - fi + AC_CHECK_HEADERS(postproc/postprocess.h) + VLC_ADD_PLUGIN([ffmpeg]) if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then - if test "${SYS}" = "darwin"; then - VLC_ADD_BUILTINS([stream_out_switcher]) - else - VLC_ADD_PLUGINS([stream_out_switcher]) - fi + VLC_ADD_PLUGIN([stream_out_switcher]) fi VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}]) - VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}]) + VLC_ADD_LIBS([ffmpeg stream_out_switcher],[${FFMPEG_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}]) + PKG_CHECK_MODULES(SWSCALE,[libswscale],[ + VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}]) + VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}]) AC_CHECK_LIB(swscale, sws_getContext, - [AC_CHECK_HEADERS(ffmpeg/swscale.h)],[]) + [AC_CHECK_HEADERS([ffmpeg/swscale.h libswscale/swscale.h])],[],[-lavutil -lm]) ],[ true ]) VLC_RESTORE_FLAGS ],[ - + dnl dnl last chance: at the default place dnl 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(ffmpeg/avformat.h) - AC_CHECK_HEADERS(ffmpeg/avutil.h) - AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg} ${LIBS_ffmpeg}" + AC_CHECK_HEADERS(ffmpeg/avcodec.h libavcodec/avcodec.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h) + AC_CHECK_HEADERS(ffmpeg/avutil.h libavutil/avutil.h) + AC_CHECK_HEADERS(postproc/postprocess.h) AC_CHECK_LIB(avutil, av_crc_init, [ - VLC_ADD_LDFLAGS([ffmpeg],[-lavutil]) + VLC_ADD_LIBS([ffmpeg],[-lavutil]) LDAVUTIL="-lavutil"]) AC_CHECK_LIB(avcodec, avcodec_init, [ VLC_ADD_BUILTINS([ffmpeg]) - VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec]) + VLC_ADD_LIBS([ffmpeg],[-lavcodec]) if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then VLC_ADD_BUILTINS([stream_out_switcher]) fi], [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (svn version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL]) - AC_CHECK_LIB(postproc, pp_postprocess, [ - VLC_ADD_LDFLAGS([ffmpeg],[-lpostproc])], - AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-pp.]), - [$LDAVUTIL]) + VLC_ADD_LIBS([ffmpeg],[-lpostproc])], + AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-postproc.]), + [$LDAVUTIL]) AC_CHECK_LIB(avformat, av_open_input_stream, [ - VLC_ADD_LDFLAGS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL]) + VLC_ADD_LIBS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL]) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" AC_CHECK_LIB(swscale, sws_getContext, [ - AC_CHECK_HEADERS(ffmpeg/swscale.h) - VLC_ADD_LDFLAGS([ffmpeg],[-lswscale]) ], [], [-lavcodec $LDAVUTIL]) + AC_CHECK_HEADERS(ffmpeg/swscale.h libswscale/swscale.h) + VLC_ADD_LIBS([ffmpeg],[-lswscale]) ], [], [-lavcodec $LDAVUTIL]) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" ]) fi - fi fi dnl @@ -3151,23 +3280,23 @@ then AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a, make sure you compiled libavcodecaltivec in ${with_ffmpeg_tree}]) fi if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a"; then - dnl The given libavcodecaltivec wasn't built with --enable-pp + dnl The given libavcodecaltivec wasn't built with --enable-postproc AC_MSG_RESULT(no) - AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp]) + AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-postproc]) fi dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodecaltivec.a) VLC_ADD_BUILTINS([ffmpegaltivec]) - VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavcodec -lavcodecaltivec]) + VLC_ADD_LIBS([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_TREE, 1, [Define if you have ffmpeg's libavformat.]) - VLC_ADD_LDFLAGS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavformat -lavformataltivec -lz]) + VLC_ADD_LIBS([ffmpegaltivec],[-L${real_ffmpeg_tree}/libavformat -lavformataltivec -lz]) VLC_ADD_CPPFLAGS([ffmpegaltivec],[-I${real_ffmpeg_tree}/libavformat]) fi - VLC_ADD_LDFLAGS([stream_out_switcher],[-L${real_ffmpeg_tree}/libavcodec]) + VLC_ADD_LIBS([stream_out_switcher],[-L${real_ffmpeg_tree}/libavcodec]) VLC_ADD_CPPFLAGS([stream_out_switcher],[-I${real_ffmpeg_tree}/libavcodec -I${real_ffmpeg_tree}/libavformat]) fi fi @@ -3196,7 +3325,7 @@ then dnl Use a custom faad AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a) VLC_ADD_BUILTINS([faad]) - VLC_ADD_LDFLAGS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a]) + VLC_ADD_LIBS([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 @@ -3205,15 +3334,15 @@ then fi else CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_faad}" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_faad}" + LDFLAGS="${LDFLAGS_save} ${LIBS_faad}" AC_CHECK_HEADERS(faad.h, , [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ]) AC_CHECK_LIB(faad, faacDecOpen, [ - VLC_ADD_PLUGINS([faad]) - VLC_ADD_LDFLAGS([faad],[-lfaad]) ], + VLC_ADD_PLUGIN([faad]) + VLC_ADD_LIBS([faad],[-lfaad]) ], AC_CHECK_LIB(faad, NeAACDecOpen, [ - VLC_ADD_PLUGINS([faad]) - VLC_ADD_LDFLAGS([faad],[-lfaad]) ], + VLC_ADD_PLUGIN([faad]) + VLC_ADD_LIBS([faad],[-lfaad]) ], [ AC_MSG_ERROR([Cannot find libfaad library...]) ])) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" @@ -3244,7 +3373,7 @@ then dnl Use a custom twolame AC_MSG_RESULT(${real_twolame_tree}/libtwolame/.libs/libtwolame.a) VLC_ADD_BUILTINS([twolame]) - VLC_ADD_LDFLAGS([twolame],[${real_twolame_tree}/libtwolame/.libs/libtwolame.a]) + VLC_ADD_LIBS([twolame],[${real_twolame_tree}/libtwolame/.libs/libtwolame.a]) VLC_ADD_CPPFLAGS([twolame],[-I${real_twolame_tree}/libtwolame -DLIBTWOLAME_STATIC]) else dnl The given libtwolame wasn't built @@ -3253,13 +3382,13 @@ then fi else CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_twolame} -DLIBTWOLAME_STATIC" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_twolame}" + LDFLAGS="${LDFLAGS_save} ${LIBS_twolame}" AC_CHECK_HEADERS(twolame.h, , [ AC_MSG_ERROR([Cannot find development header for libtwolame...]) ]) AC_CHECK_LIB(twolame, twolame_init, [ - VLC_ADD_PLUGINS([twolame]) + VLC_ADD_PLUGIN([twolame]) VLC_ADD_CPPFLAGS([twolame],[-DLIBTWOLAME_STATIC]) - VLC_ADD_LDFLAGS([twolame],[-ltwolame]) ], + VLC_ADD_LIBS([twolame],[-ltwolame]) ], [ AC_MSG_ERROR([Cannot find libtwolame library...]) ]) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" @@ -3278,7 +3407,7 @@ then VLC_ADD_BUILTINS([quicktime]) else AC_CHECK_HEADERS(QuickTime/QuickTime.h, - [ VLC_ADD_BUILTINS([quicktime]) + [ VLC_ADD_PLUGIN([quicktime]) VLC_ADD_LDFLAGS([quicktime],[-Wl,-framework,QuickTime,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find QuickTime headers]) ]) fi @@ -3290,7 +3419,7 @@ dnl AC_ARG_ENABLE(real, [ --enable-real Real audio module (default disabled)]) if test "${enable_real}" = "yes"; then - VLC_ADD_PLUGINS([realaudio]) + VLC_ADD_PLUGIN([realaudio]) fi dnl @@ -3299,18 +3428,18 @@ dnl AC_ARG_ENABLE(realrtsp, [ --enable-realrtsp Real RTSP module (default disabled)]) if test "${enable_realrtsp}" = "yes"; then - VLC_ADD_PLUGINS([access_realrtsp]) + VLC_ADD_PLUGIN([access_realrtsp]) fi dnl dnl MP4 module dnl AC_CHECK_HEADERS(zlib.h, [ - VLC_ADD_LDFLAGS([mp4 skins2 sap mkv gme],[-lz]) + VLC_ADD_LIBS([mp4 skins2 sap mkv gme],[-lz]) ] ) AC_CHECK_HEADERS(sysfs/libsysfs.h, [ - VLC_ADD_LDFLAGS([mp4 mkv],[-lsysfs]) + VLC_ADD_LIBS([mp4 mkv],[-lsysfs]) ] ) dnl @@ -3321,7 +3450,7 @@ AC_ARG_ENABLE(libtar, AS_IF([test "${enable_libtar}" != "no"],[ AC_CHECK_HEADERS(libtar.h, [ - VLC_ADD_LDFLAGS([skins2],[-ltar]) + VLC_ADD_LIBS([skins2],[-ltar]) ] ) ]) @@ -3351,16 +3480,16 @@ then then AC_MSG_RESULT(yes) VLC_ADD_CPPFLAGS([a52tofloat32],[-I${real_a52_tree}]) - VLC_ADD_LDFLAGS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs]) - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_a52tofloat32}" + VLC_ADD_LIBS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs]) + LDFLAGS="${LDFLAGS_save} ${LIBS_a52tofloat32}" AC_CHECK_LIB(a52, a52_free, [ VLC_ADD_BUILTINS([a52tofloat32]) VLC_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE]) - VLC_ADD_LDFLAGS([a52tofloat32],[-la52]) + VLC_ADD_LIBS([a52tofloat32],[-la52]) ],[ if test -f ${real_a52_tree}/liba52/.libs/liba52.a then - AC_MSG_ERROR([make sure you have at least a52dec-0.7.3]) + AC_MSG_ERROR([make sure you have at least a52dec-0.7.3 ($real_a52_tree)]) else AC_MSG_ERROR([the specified tree hasn't been compiled]) fi @@ -3380,11 +3509,11 @@ then CPPFLAGS_test="-I${with_a52}/include" fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test} ${CPPFLAGS_a52tofloat32}" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_test} ${LDFLAGS_a52tofloat32}" + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_test} ${LIBS_a52tofloat32}" AC_CHECK_HEADERS(a52dec/a52.h, [ AC_CHECK_LIB(a52, a52_free, [ - VLC_ADD_PLUGINS([a52tofloat32]) - VLC_ADD_LDFLAGS([a52tofloat32],[${LDFLAGS_test} -la52]) + VLC_ADD_PLUGIN([a52tofloat32]) + VLC_ADD_LIBS([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.]) @@ -3429,7 +3558,7 @@ AS_IF([test "${enable_dca}" != "no"], [ AC_MSG_CHECKING(for libdca in ${real_dca_tree}) AS_IF([test -f "${real_dca_tree}/libdca/.libs/libdca.a"], [ AC_MSG_RESULT(yes) - VLC_ADD_LDFLAGS([dtstofloat32],[${real_dca_tree}/libdca/.libs/libdca.a]) + VLC_ADD_LIBS([dtstofloat32],[${real_dca_tree}/libdca/.libs/libdca.a]) AS_IF([test -f "${real_dca_tree}/include/dca.h"], [ VLC_ADD_CPPFLAGS([dtstofloat32],[-I${real_dca_tree}/include]) ], [ @@ -3441,9 +3570,9 @@ AS_IF([test "${enable_dca}" != "no"], [ ]) ], [ PKG_CHECK_MODULES([DCA], [libdca >= 0.0.5], [ - VLC_ADD_PLUGINS([dtstofloat32]) + VLC_ADD_PLUGIN([dtstofloat32]) VLC_ADD_CPPFLAGS([dtstofloat32], [${DCA_CFLAGS}]) - VLC_ADD_LDFLAGS([dtstofloat32], [${DCA_LIBS}]) + VLC_ADD_LIBS([dtstofloat32], [${DCA_LIBS}]) ], [ AS_IF([test "x${enable_dca}" != "x"], [ AC_MSG_ERROR([${DCA_PKG_ERRORS}]) @@ -3475,7 +3604,7 @@ then then dnl Use a custom flac AC_MSG_RESULT(${real_flac_tree}/src/libFLAC/.libs/libFLAC.a) - VLC_ADD_LDFLAGS([flac],[${real_flac_tree}/src/libFLAC/.libs/libFLAC.a]) + VLC_ADD_LIBS([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 @@ -3485,7 +3614,7 @@ then fi else AC_CHECK_HEADERS(FLAC/stream_decoder.h, [ - VLC_ADD_LDFLAGS([flac],[-lFLAC -logg]) + VLC_ADD_LIBS([flac],[-lFLAC -logg]) ],[]) fi fi @@ -3514,7 +3643,7 @@ then dnl Use a custom libmpeg2 AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a) VLC_ADD_BUILTINS([libmpeg2]) - VLC_ADD_LDFLAGS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2]) + VLC_ADD_LIBS([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 @@ -3533,8 +3662,8 @@ then #endif #endif], [AC_MSG_RESULT([yes]) - VLC_ADD_PLUGINS([libmpeg2]) - VLC_ADD_LDFLAGS([libmpeg2],[-lmpeg2])], + VLC_ADD_PLUGIN([libmpeg2]) + VLC_ADD_LIBS([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.])])], @@ -3566,8 +3695,8 @@ then then dnl Use a custom vorbis AC_MSG_RESULT(${real_vorbis_tree}/lib/.libs/libvorbis.a) - VLC_ADD_PLUGINS([vorbis]) - VLC_ADD_LDFLAGS([vorbis],[${real_vorbis_tree}/lib/.libs/libvorbis.a ${real_vorbis_tree}/lib/.libs/libvorbisenc.a]) + VLC_ADD_PLUGIN([vorbis]) + VLC_ADD_LIBS([vorbis],[${real_vorbis_tree}/lib/.libs/libvorbis.a ${real_vorbis_tree}/lib/.libs/libvorbisenc.a]) VLC_ADD_CFLAGS([vorbis],[-I${real_vorbis_tree}/include]) else dnl The given vorbis wasn't built @@ -3576,11 +3705,11 @@ then fi else AC_CHECK_HEADERS(vorbis/codec.h, [ - VLC_ADD_PLUGINS([vorbis]) - VLC_ADD_LDFLAGS([vorbis],[-lvorbis -logg -lm]) ],[]) + VLC_ADD_PLUGIN([vorbis]) + VLC_ADD_LIBS([vorbis],[-lvorbis -logg -lm]) ],[]) AC_CHECK_HEADERS(vorbis/vorbisenc.h, [ - VLC_ADD_LDFLAGS([vorbis],[-lvorbisenc -lm]) ],[]) + VLC_ADD_LIBS([vorbis],[-lvorbisenc -lm]) ],[]) fi fi @@ -3592,8 +3721,8 @@ AC_ARG_ENABLE(tremor, if test "${enable_tremor}" = "yes" then AC_CHECK_HEADERS(tremor/ivorbiscodec.h, [ - VLC_ADD_PLUGINS([tremor]) - VLC_ADD_LDFLAGS([tremor],[-lvorbisidec -logg]) + VLC_ADD_PLUGIN([tremor]) + VLC_ADD_LIBS([tremor],[-lvorbisidec -logg]) ],[]) fi @@ -3620,8 +3749,8 @@ then then dnl Use a custom speex AC_MSG_RESULT(${real_speex_tree}/libspeex/.libs/libspeex.a) - VLC_ADD_PLUGINS([speex]) - VLC_ADD_LDFLAGS([speex],[${real_speex_tree}/libspeex/.libs/libspeex.a]) + VLC_ADD_PLUGIN([speex]) + VLC_ADD_LIBS([speex],[${real_speex_tree}/libspeex/.libs/libspeex.a]) VLC_ADD_CFLAGS([speex],[-I${real_speex_tree}/include]) else dnl The given speex wasn't built @@ -3630,10 +3759,10 @@ then fi else AC_CHECK_HEADERS(speex/speex.h, [ - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_speex}" + LDFLAGS="${LDFLAGS_save} ${LIBS_speex}" AC_CHECK_LIB(speex, speex_decode_int, [ - VLC_ADD_PLUGINS([speex]) - VLC_ADD_LDFLAGS([speex],[-lspeex]) ], + VLC_ADD_PLUGIN([speex]) + VLC_ADD_LIBS([speex],[-lspeex]) ], [ AC_MSG_RESULT([no]) AC_MSG_WARN([Your libspeex is too old, please get the development version.]) ],[]) @@ -3659,7 +3788,7 @@ then then 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]) + VLC_ADD_LIBS([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 @@ -3679,9 +3808,9 @@ if test "${enable_theora}" = "yes" then AC_CHECK_HEADERS(theora/theora.h, [ AC_CHECK_LIB(theora, theora_granule_time, [ - VLC_ADD_PLUGINS([theora]) + VLC_ADD_PLUGIN([theora]) theora_libs="-ltheora -logg" - VLC_ADD_LDFLAGS([theora],[${theora_libs}]) ],[ + VLC_ADD_LIBS([theora],[${theora_libs}]) ],[ AC_MSG_ERROR([libtheora doesn't appear to be installed on your system. You also need to check that you have a libogg posterior to the 1.0 release.])], [-logg]) @@ -3694,10 +3823,10 @@ dnl AC_ARG_ENABLE(dirac, [ --enable-dirac experimental dirac codec (default disabled)]) if test "${enable_dirac}" = "yes"; then - PKG_CHECK_MODULES(DIRAC,[dirac >= 0.6.0], [ - VLC_ADD_PLUGINS([dirac]) + PKG_CHECK_MODULES(DIRAC,[dirac >= 0.9.0], [ + VLC_ADD_PLUGIN([dirac]) VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS]) - VLC_ADD_LDFLAGS([dirac],[$DIRAC_LIBS -lstdc++]) ],[ + VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[ AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.]) ]) fi @@ -3711,14 +3840,16 @@ if test "${enable_png}" != "no"; then AC_CHECK_HEADERS(png.h, [ LDFLAGS="${LDFLAGS_save} -lz" AC_CHECK_LIB(png, png_set_rows, [ - VLC_ADD_LDFLAGS([png],[-lpng -lz]) - VLC_ADD_PLUGINS([png]) - VLC_ADD_PLUGINS([osdmenu]) - AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])], + VLC_ADD_LIBS([png],[-lpng -lz]) + VLC_ADD_PLUGIN([png]) + VLC_ADD_PLUGIN([osdmenu]) + VLC_ADD_PLUGIN([osd_parser]) + AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])], [],[-lz]) - LDFLAGS="${LDFLAGS_save}" + LDFLAGS="${LDFLAGS_save}" ]) fi +AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_png}" != "no"]) dnl dnl H264 encoder plugin (using libx264) @@ -3743,11 +3874,11 @@ if test "${enable_x264}" != "no"; then 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} ${THREAD_LIB}" - AC_CHECK_LIB(x264, x264_encoder_open, [ - VLC_ADD_BUILTINS([x264]) - VLC_ADD_LDFLAGS([x264],[-lx264]) + VLC_ADD_LIBS([x264],[-L${real_x264_tree}]) + PKG_CHECK_MODULES(X264,x264, [ + VLC_ADD_PLUGIN([x264]) + VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) + VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) ],[ AC_MSG_ERROR([the specified tree hasn't been compiled]) ]) @@ -3757,21 +3888,36 @@ if test "${enable_x264}" != "no"; then AC_MSG_ERROR([the specified tree doesn't have x264.h]) fi else - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}" - AC_CHECK_HEADERS(x264.h, [ - AC_CHECK_LIB(x264, x264_encoder_open, [ - VLC_ADD_PLUGINS([x264]) - VLC_ADD_LDFLAGS([x264],[-lx264]) + PKG_CHECK_MODULES(X264,x264, [ + VLC_ADD_PLUGIN([x264]) + VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) + VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) ],[ 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 libfluidsynth (MIDI synthetizer) plugin +dnl +AC_ARG_ENABLE(fluidsynth, + [ --enable-fluidsynth MIDI synthesisr with libfluidsynth (default enabled)]) +AS_IF([test "x${enable_fluidsynth}" != "xno"], [ + PKG_CHECK_MODULES(FLUIDSYNTH, fluidsynth, [ + VLC_ADD_PLUGIN(fluidsynth) + VLC_ADD_CFLAGS(fluidsynth, [${FLUIDSYNTH_CFLAGS}]) + VLC_ADD_LIBS(fluidsynth, [${FLUIDSYNTH_LIBS}]) + ], [ + AS_IF([test "x${enable_fluidsynth}" != "x"], [ + AC_MSG_ERROR([${FLUIDSYNTH_PKG_ERRORS}]) + ]) + ]) +]) + dnl dnl Teletext Modules dnl vbi decoder plugin (using libzbvi) @@ -3781,7 +3927,7 @@ dnl AC_ARG_ENABLE(zvbi, [ --enable-zvbi VBI (inc. Teletext) decoding support with libzvbi (default enabled)]) AC_ARG_ENABLE(telx, - [ --enable-telx, Teletext decoding module (conflicting with zvbi) (default disabled)]) + [ --enable-telx Teletext decoding module (conflicting with zvbi) (default disabled)]) AS_IF( [test "${enable_zvbi}" != "no"],[ AS_IF( [test "${enable_telx}" = "yes"],[ @@ -3790,9 +3936,9 @@ AS_IF( [test "${enable_zvbi}" != "no"],[ PKG_CHECK_MODULES(ZVBI, zvbi-0.2 >= 0.2.25, [ - VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS]) + VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS]) VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS]) - VLC_ADD_PLUGINS([zvbi]) + VLC_ADD_PLUGIN([zvbi]) AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) ],[ AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead) @@ -3801,7 +3947,41 @@ AS_IF( [test "${enable_zvbi}" != "no"],[ ]) ]) AS_IF( [test "${enable_telx}" = "yes"],[ - VLC_ADD_PLUGINS([telx]) + VLC_ADD_PLUGIN([telx]) + ]) + +dnl +dnl asa/csri subtitle rendering module +dnl +AC_ARG_ENABLE(csri, + [ --enable-csri Subtitle support using CSRI / asa (default disabled)]) +AS_IF( [test "${enable_csri}" = "yes"], [ + PKG_CHECK_MODULES(CSRI, + csri >= 0.1.0, + [ + VLC_ADD_LDFLAGS([csri],[$CSRI_LIBS]) + VLC_ADD_CFLAGS([csri],[$CSRI_CFLAGS]) + VLC_ADD_PLUGIN([csri]) + ],[ + AC_MSG_WARN([CSRI helper library not found]) + ]) + ]) + +dnl +dnl asa demuxer +dnl +AC_ARG_ENABLE(asademux, + [ --enable-asademux asa subtitle demuxing (default disabled)]) +AS_IF( [test "${enable_asademux}" = "yes"], [ + PKG_CHECK_MODULES(PCRE, + libpcre >= 6.5, + [ + VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS]) + VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS]) + VLC_ADD_PLUGIN([asademux]) + ],[ + AC_MSG_WARN([PCRE library not found (required for asademux)]) + ]) ]) dnl @@ -3811,8 +3991,37 @@ AC_ARG_ENABLE(cmml, [ --enable-cmml CMML support (default enabled)]) if test "${enable_cmml}" != "no" then - VLC_ADD_PLUGINS([cmml]) -fi + VLC_ADD_PLUGIN([cmml]) +fi + +dnl +dnl kate decoder plugin +dnl +AC_ARG_ENABLE(kate, +[ --enable-kate kate codec (default enabled)]) +AS_IF([test "${enable_kate}" != "no"], [ + PKG_CHECK_MODULES(KATE,[kate >= 0.1.1], [ + VLC_ADD_PLUGIN([kate]) + VLC_ADD_CFLAGS([kate],[$KATE_CFLAGS]) + VLC_ADD_LIBS([kate],[$KATE_LIBS]) ],[ + AC_CHECK_HEADERS(kate/kate.h, [ + AC_CHECK_LIB(kate, kate_decode_init, [ + VLC_ADD_PLUGIN([kate]) + kate_libs="-lkate -logg" + VLC_ADD_LDFLAGS([kate],[${kate_libs}]) ],[ + AS_IF([test "x${enable_kate}" != "x"], [ + AC_MSG_ERROR([libkate doesn't appear to be installed on your system. + You also need to check that you have a libogg posterior to the 1.0 release.]) + ]) + ], [-lkate -logg]) + ],[ + AS_IF([test "x${enable_kate}" != "x"], [ + AC_MSG_ERROR([libkate headers do not appear to be installed on your system. + You also need to check that you have a libogg posterior to the 1.0 release.]) + ]) + ]) + ]) +]) dnl @@ -3850,12 +4059,12 @@ if test "${enable_x11}" != "no" && test "${enable_x11}" = "yes"); then CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}" AC_CHECK_HEADERS(X11/Xlib.h, [ - VLC_ADD_PLUGINS([panoramix]) - VLC_ADD_LDFLAGS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11]) + VLC_ADD_PLUGIN([panoramix]) + VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}]) AC_CHECK_LIB(Xext, XShmAttach, [ - VLC_ADD_PLUGINS([x11]) - VLC_ADD_LDFLAGS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) + VLC_ADD_PLUGIN([x11]) + VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}]) ]) ]) @@ -3878,17 +4087,17 @@ 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 /usr/lib/libXv.so -o -f "${x_libraries}"/libXv.so; then - VLC_ADD_PLUGINS([xvideo]) + VLC_ADD_PLUGIN([xvideo]) VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) - VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) + VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) else AC_CHECK_LIB(Xv_pic,XvPutImage,[ - VLC_ADD_PLUGINS([xvideo]) + VLC_ADD_PLUGIN([xvideo]) VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) - VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv_pic]) + VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv_pic]) ],[ VLC_ADD_BUILTINS([xvideo]) - VLC_ADD_LDFLAGS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) + VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) ]) fi @@ -3914,8 +4123,8 @@ if test "${enable_glx}" != "no" && choke me #endif]]), [ - VLC_ADD_PLUGINS([glx]) - VLC_ADD_LDFLAGS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU]) + VLC_ADD_PLUGIN([glx]) + VLC_ADD_LIBS([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}" @@ -3923,17 +4132,17 @@ fi dnl dnl XVMC module -dnl (enabled by default except on win32) +dnl (disabled by default except on win32) dnl AC_ARG_ENABLE(xvmc, - [ --enable-xvmc XVMC support (default disabled)]) + [ --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_PLUGIN([xvmc]) + VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXvMCW -lXv -lXinerama]) VLC_ADD_CPPFLAGS([xvmc],[${X_CFLAGS}]) ]) CPPFLAGS="${CPPFLAGS_save}" @@ -3952,15 +4161,15 @@ if test "${enable_xvideo}" != "no" && test "${enable_xinerama}" != "no" && CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext" AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[ AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[ - VLC_ADD_LDFLAGS([xvideo],[-lXinerama_pic]) - VLC_ADD_LDFLAGS([x11],[-lXinerama_pic]) - VLC_ADD_LDFLAGS([glx],[-lXinerama_pic]) + VLC_ADD_LIBS([xvideo],[-lXinerama_pic]) + VLC_ADD_LIBS([x11],[-lXinerama_pic]) + VLC_ADD_LIBS([glx],[-lXinerama_pic]) ac_cv_have_xinerama="yes" ],[ AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[ - VLC_ADD_LDFLAGS([xvideo],[-lXinerama]) - VLC_ADD_LDFLAGS([x11],[-lXinerama]) - VLC_ADD_LDFLAGS([glx],[-lXinerama]) + VLC_ADD_LIBS([xvideo],[-lXinerama]) + VLC_ADD_LIBS([x11],[-lXinerama]) + VLC_ADD_LIBS([glx],[-lXinerama]) ac_cv_have_xinerama="yes" ]) ]) @@ -3979,15 +4188,17 @@ dnl CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext" AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,[ AC_CHECK_LIB(Xxf86vm_pic, XF86VidModeGetViewPort,[ - VLC_ADD_LDFLAGS([xvideo],[-lXxf86vm_pic]) - VLC_ADD_LDFLAGS([x11],[-lXxf86vm_pic]) - VLC_ADD_LDFLAGS([glx],[-lXxf86vm_pic]) + VLC_ADD_LIBS([xvideo],[-lXxf86vm_pic]) + VLC_ADD_LIBS([x11],[-lXxf86vm_pic]) + VLC_ADD_LIBS([glx],[-lXxf86vm_pic]) + VLC_ADD_LIBS([xvmc],[-lXxf86vm_pic]) ac_cv_have_xf86vidmode="yes" ],[ AC_CHECK_LIB(Xxf86vm, XF86VidModeGetViewPort,[ - VLC_ADD_LDFLAGS([xvideo],[-lXxf86vm]) - VLC_ADD_LDFLAGS([x11],[-lXxf86vm]) - VLC_ADD_LDFLAGS([glx],[-lXxf86vm]) + VLC_ADD_LIBS([xvideo],[-lXxf86vm]) + VLC_ADD_LIBS([x11],[-lXxf86vm]) + VLC_ADD_LIBS([glx],[-lXxf86vm]) + VLC_ADD_LIBS([xvmc],[-lXxf86vm]) ac_cv_have_xf86vidmode="yes" ]) ]) @@ -4014,17 +4225,17 @@ if test "${enable_opengl}" != "no" && test "${SYS}" != "beos" -a "${SYS}" != "mingwce"; then if test "${SYS}" != "darwin"; then AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [ - VLC_ADD_PLUGINS([opengl]) + VLC_ADD_PLUGIN([opengl]) if test "${SYS}" != "mingw32"; then - VLC_ADD_LDFLAGS([opengl],[${X_LIBS} -lGL -lGLU]) + VLC_ADD_LIBS([opengl],[${X_LIBS} -lGL -lGLU]) else - VLC_ADD_LDFLAGS([opengl],[-lopengl32 -lglu32]) + VLC_ADD_LIBS([opengl],[-lopengl32 -lglu32]) fi ]) else dnl OS X special case (no GL/gl.h but OpenGL/gl.h) - VLC_ADD_PLUGINS([opengl]) - VLC_ADD_LDFLAGS([opengl],[-Wl,-framework,OpenGL]) + VLC_ADD_PLUGIN([opengl]) + VLC_ADD_LIBS([opengl],[-Wl,-framework,OpenGL]) fi fi @@ -4034,7 +4245,7 @@ dnl AC_ARG_ENABLE(sdl, [ --enable-sdl SDL support (default enabled)]) AC_ARG_ENABLE(sdl-image, - [ --enable-sdl-image SDL image support (default enabled)]) + [ --enable-sdl-image SDL image support (default enabled)]) if test "${enable_sdl}" != "no" then SDL_PATH="${PATH}" @@ -4075,10 +4286,11 @@ then then # SDL on Darwin is heavily patched and can only run SDL_image if test "${SYS}" != "darwin" -a "${SYS}" != "mingw32"; then - VLC_ADD_PLUGINS([vout_sdl aout_sdl]) + VLC_ADD_PLUGIN([vout_sdl]) + VLC_ADD_PLUGIN([aout_sdl]) fi VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --cflags | sed 's,SDL,,'`]) - VLC_ADD_LDFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`]) + VLC_ADD_LIBS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} ${SDL_PREFIX} --libs | sed 's,-rdynamic,,'`]) CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_vout_sdl}" AC_CHECK_HEADERS(${SDL_HEADER}, AC_DEFINE_UNQUOTED(SDL_INCLUDE_FILE, <${SDL_HEADER}>, Indicate whether we should use SDL/SDL.h or SDL11/SDL.h), @@ -4091,14 +4303,14 @@ Please install it and try again. Alternatively you can also configure with AS_IF([ test "${enable_sdl_image}" != "no"],[ AC_CHECK_HEADERS(${SDL_IMAGE}, [AC_DEFINE_UNQUOTED(SDL_IMAGE_INCLUDE_FILE, <${SDL_IMAGE}>, Indicate the path of SDL_image.h) - VLC_ADD_PLUGINS([sdl_image]) + VLC_ADD_PLUGIN([sdl_image]) AC_CHECK_LIB(png, png_set_rows, - [VLC_ADD_LDFLAGS([sdl_image],[-lpng -lz])],[],[-lz]) + [VLC_ADD_LIBS([sdl_image],[-lpng -lz])],[],[-lz]) AC_CHECK_LIB(jpeg, jpeg_start_decompress, - [VLC_ADD_LDFLAGS([sdl_image],[-ljpeg])]) + [VLC_ADD_LIBS([sdl_image],[-ljpeg])]) AC_CHECK_LIB(tiff, TIFFClientOpen, - [VLC_ADD_LDFLAGS([sdl_image],[-ltiff])]) - VLC_ADD_LDFLAGS([sdl_image], [-lSDL_image])], + [VLC_ADD_LIBS([sdl_image],[-ltiff])]) + VLC_ADD_LIBS([sdl_image], [-lSDL_image])], [ AC_CHECK_HEADERS(SDL_image.h, AC_DEFINE(SDL_IMAGE_INCLUDE_FILE, , As a last resort we also test for SDL_image.h presence), [ AC_MSG_WARN([The development package for SDL_image is not installed. @@ -4130,55 +4342,36 @@ AC_ARG_ENABLE(fribidi, [ --enable-fribidi fribidi support (default enabled)]) if test "${enable_freetype}" != "no" then - FREETYPE_PATH="${PATH}" - AC_ARG_WITH(freetype-config-path, - [ --with-freetype-config-path=PATH freetype-config path (default search in \$PATH)], - [ if test "${with_freetype_config_path}" != "no" - then - FREETYPE_PATH="${with_freetype_config_path}:${PATH}" - fi ]) - AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no, ${FREETYPE_PATH}) - - if test "${FREETYPE_CONFIG}" != "no" - then - VLC_ADD_PLUGINS([freetype]) - VLC_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([freetype],[`${FREETYPE_CONFIG} --libs`]) - if test "${SYS}" = "mingw32"; then - VLC_ADD_LDFLAGS([freetype],[-lxml2])] - fi + PKG_CHECK_MODULES(FREETYPE, freetype2,[ + VLC_ADD_PLUGIN([freetype]) + have_freetype=yes + VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}]) + VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}]) + if test "${SYS}" = "mingw32"; then + VLC_ADD_LIBS([freetype skins2],[-lxml2]) + fi AC_CHECK_HEADERS(fontconfig/fontconfig.h, - [VLC_ADD_CFLAGS([freetype],[-DHAVE_FONTCONFIG]) - VLC_ADD_LDFLAGS([freetype],[-lfontconfig])]) + [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG]) + VLC_ADD_LIBS([freetype],[-lfontconfig])]) AC_CHECK_HEADERS(Carbon/Carbon.h, [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) - elif test "${enable_freetype}" = "yes" - then + ],[ + have_freetype=no + AS_IF([ test "${enable_freetype}" = "yes"],[ AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2 from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day. + ]) ]) - fi + ]) dnl fribidi support if test "${enable_fribidi}" != "no" then - FRIBIDI_PATH="${PATH}" - AC_ARG_WITH(fribidi-config-path, - [ --with-fribidi-config-path=PATH fribidi-config path (default search in \$PATH)], - [ if test "${with_fribidi_config_path}" != "no" - then - FRIBIDI_PATH="${with_fribidi_config_path}:${PATH}" - fi ]) - AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no, ${FRIBIDI_PATH}) - - if test "${FRIBIDI_CONFIG}" != "no" - then - VLC_ADD_CFLAGS([freetype], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI]) - VLC_ADD_CPPFLAGS([skins2], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI]) - VLC_ADD_LDFLAGS([freetype], [`${FRIBIDI_CONFIG} --libs`]) - VLC_ADD_LDFLAGS([skins2], [`${FRIBIDI_CONFIG} --libs`]) + PKG_CHECK_MODULES(FRIBIDI, fribidi, [ + VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI]) + VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}]) + ]) fi - fi fi dnl @@ -4197,13 +4390,13 @@ then AC_PATH_PROG(XML2_CONFIG, xml2-config, no, ${XML2_PATH}) if test "${XML2_CONFIG}" != "no"; then VLC_ADD_CPPFLAGS([xml],[`${XML2_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([xml],[`${XML2_CONFIG} --libs`]) + VLC_ADD_LIBS([xml],[`${XML2_CONFIG} --libs`]) dnl depends on the xmlTextReader extension CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xml}" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xml}" + LDFLAGS="${LDFLAGS_save} ${LIBS_xml}" AC_CHECK_LIB(xml2,xmlTextReaderConstName,[ AC_EGREP_HEADER(xmlTextReaderConstName,libxml/xmlreader.h,[ - VLC_ADD_PLUGINS([xml]) ],[ + VLC_ADD_PLUGIN([xml]) ],[ AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version]) if test "${enable_xml2}" = "yes"; then AC_MSG_ERROR([libxml2 missing the xmlTextReader extension]) @@ -4232,9 +4425,9 @@ then PKG_CHECK_MODULES(SVG, librsvg-2.0 >= 2.9.0, [ - VLC_ADD_LDFLAGS([svg],[$SVG_LIBS]) + VLC_ADD_LIBS([svg],[$SVG_LIBS]) VLC_ADD_CFLAGS([svg],[$SVG_CFLAGS]) - VLC_ADD_PLUGINS([svg]) ], + VLC_ADD_PLUGIN([svg]) ], [AC_MSG_WARN(SVG library not found)]) fi @@ -4245,7 +4438,7 @@ AC_ARG_ENABLE(snapshot, [ --enable-snapshot snapshot module (default disabled)]) if test "${enable_snapshot}" = "yes" then - VLC_ADD_PLUGINS([snapshot]) + VLC_ADD_PLUGIN([snapshot]) fi dnl @@ -4260,13 +4453,13 @@ then [ --with-qte=PATH Qt Embedded headers and libraries]) if test "${with_qte}" != "no" -a -n "${with_qte}" then - VLC_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) + VLC_ADD_LIBS([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 - VLC_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) + VLC_ADD_LIBS([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 - VLC_ADD_PLUGINS([qte]) + VLC_ADD_PLUGIN([qte]) NEED_QTE_MAIN=yes CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}" AC_CHECK_HEADERS(qt.h jpeglib.h, ,[ @@ -4283,14 +4476,14 @@ 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 VLC_ADD_PLUGINS([qt_video]) -dnl VLC_ADD_LDFLAGS([qt_video],[-L${QTDIR}/lib]) +dnl VLC_ADD_PLUGIN([qt_video]) +dnl VLC_ADD_LIBS([qt_video],[-L${QTDIR}/lib]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt_video}" dnl AC_CHECK_LIB(qt-mt,main,[ -dnl VLC_ADD_LDFLAGS([qt_video],[-lqt-mt]) +dnl VLC_ADD_LIBS([qt_video],[-lqt-mt]) dnl ],[ dnl AC_CHECK_LIB(qt,main,[ -dnl VLC_ADD_LDFLAGS([qt_video],[-lqt]) +dnl VLC_ADD_LIBS([qt_video],[-lqt]) dnl ]) dnl ]) dnl NEED_QTE_MAIN=yes @@ -4317,8 +4510,8 @@ if test "${enable_hd1000v}" != "no" -a "${CXX}" != "" && ]) if test "$can_build_roku" = "yes" then - VLC_ADD_PLUGINS([hd1000v]) - VLC_ADD_LDFLAGS([hd1000v],[-lCascade -ldvbpsi -lmad]) + VLC_ADD_PLUGIN([hd1000v]) + VLC_ADD_LIBS([hd1000v],[-lCascade -ldvbpsi -lmad]) fi AC_LANG_POP([C++]) fi @@ -4329,7 +4522,7 @@ dnl if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "cygwin" then - VLC_ADD_PLUGINS([panoramix]) + VLC_ADD_PLUGIN([panoramix]) fi AC_ARG_ENABLE(directx, @@ -4343,24 +4536,26 @@ then if test -z "${with_directx}" then AC_CHECK_HEADERS(ddraw.h, - [ VLC_ADD_PLUGINS([vout_directx aout_directx]) - VLC_ADD_LDFLAGS([vout_directx],[-lgdi32]) + [ VLC_ADD_PLUGIN([vout_directx]) + VLC_ADD_PLUGIN([aout_directx]) + VLC_ADD_LIBS([vout_directx],[-lgdi32]) ]) AC_CHECK_HEADERS(GL/gl.h, - [ VLC_ADD_PLUGINS([glwin32]) - VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32]) + [ VLC_ADD_PLUGIN([glwin32]) + VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32]) ]) AC_CHECK_HEADERS(d3d9.h, - [ VLC_ADD_PLUGINS([direct3d]) - VLC_ADD_LDFLAGS([direct3d],[-lgdi32]) + [ VLC_ADD_PLUGIN([direct3d]) + VLC_ADD_LIBS([direct3d],[-lgdi32]) ]) else AC_MSG_CHECKING(for directX headers in ${with_directx}) if test -f ${with_directx}/ddraw.h then - VLC_ADD_PLUGINS([vout_directx aout_directx]) + VLC_ADD_PLUGIN([vout_directx]) + VLC_ADD_PLUGIN([aout_directx]) VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}]) - VLC_ADD_LDFLAGS([vout_directx],[-lgdi32]) + VLC_ADD_LIBS([vout_directx],[-lgdi32]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -4378,7 +4573,7 @@ AC_ARG_ENABLE(fb, if test "${enable_fb}" != "no" then AC_CHECK_HEADERS(linux/fb.h, [ - VLC_ADD_PLUGINS([fb]) + VLC_ADD_PLUGIN([fb]) ]) fi @@ -4389,7 +4584,7 @@ AC_ARG_ENABLE(mga, [ --enable-mga Linux kernel Matrox support (default disabled)], [ if test "${enable_mga}" = "yes" then - VLC_ADD_PLUGINS([mga]) + VLC_ADD_PLUGIN([mga]) fi ]) dnl @@ -4399,8 +4594,8 @@ AC_ARG_ENABLE(svgalib, [ --enable-svgalib SVGAlib support (default disabled)]) if test "${enable_svgalib}" = "yes" then - VLC_ADD_PLUGINS([svgalib]) - VLC_ADD_LDFLAGS([svgalib],[-lvgagl -lvga]) + VLC_ADD_PLUGIN([svgalib]) + VLC_ADD_LIBS([svgalib],[-lvgagl -lvga]) fi dnl @@ -4416,18 +4611,18 @@ AC_ARG_WITH(directfb, if test "${enable_directfb}" = "yes"; then have_directfb="false" CPPFLAGS_mydirectfb= - LDFLAGS_mydirectfb= + LIBS_mydirectfb= if test "${with_directfb}" != "no" -a -n "${with_directfb}"; then dnl Trying the given location - CPPFLAGS_save=${CPPFLAGS} - LDFLAGS_save=${LDFLAGS} + CPPFLAGS_save="${CPPFLAGS}" + LIBS_save="${LIBS}" CPPFLAGS_new="-I${with_directfb}/include -D_REENTRANT -D_GNU_SOURCE" - LDFLAGS_new="-L${with_directfb}/lib/fusion/.libs/ -L${with_directfb}/lib/direct/.libs/" - LDFLAGS_new="${LDFLAGS_new} -L${with_directfb}/src/.libs/" + LIBS_new="-L${with_directfb}/lib/fusion/.libs/ -L${with_directfb}/lib/direct/.libs/" + LIBS_new="${LIBS_new} -L${with_directfb}/src/.libs/" CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_new}" - LDFLAGS="${LD_FLAGS} ${LDFLAGS_new}" + LIBS="${LIBS} ${LIBS_new}" dnl FIXME: too obscure AC_CHECK_HEADER([directfb.h], [ @@ -4440,10 +4635,10 @@ if test "${enable_directfb}" = "yes"; then dnl Restore flags CPPFLAGS="${CPPFLAGS_save}" - LDFLAGS="${LDFLAGS_save}" + LIBS="${LIBS_save}" if test "${have_directfb}" = "true"; then - LDFLAGS_mydirectfb="${LDFLAGS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread" + LIBS_mydirectfb="${LIBS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread" CPPFLAGS_mydirectfb="${CPPFLAGS_new}" fi else @@ -4451,21 +4646,21 @@ if test "${enable_directfb}" = "yes"; then AC_PATH_PROG(DIRECTFB_CONFIG, directfb-config, no, ${PATH}) if test "${DIRECTFB_CONFIG}" != "no"; then CPPFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --cflags`" - LDFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --libs`" + LIBS_mydirectfb="`${DIRECTFB_CONFIG} --libs`" have_directfb="true" else dnl Trying with pkg-config PKG_CHECK_MODULES(DIRECTFB, directfb, [ CPPFLAGS_mydirectfb="${DIRECTFB_CFLAGS}" - LDFLAGS_mydirectfb="${DIRECTFB_LIBS}" + LIBS_mydirectfb="${DIRECTFB_LIBS}" have_directfb="true" ], [have_directfb="false"]) fi fi if test "${have_directfb}" = "true"; then - VLC_ADD_PLUGINS([directfb]) + VLC_ADD_PLUGIN([directfb]) VLC_ADD_CPPFLAGS([directfb],[${CPPFLAGS_mydirectfb}]) - VLC_ADD_LDFLAGS([directfb],[${LDFLAGS_mydirectfb}]) + VLC_ADD_LIBS([directfb],[${LIBS_mydirectfb}]) else AC_MSG_ERROR([cannot find directfb headers and/or libraries ]) fi @@ -4480,14 +4675,14 @@ AC_ARG_ENABLE(ggi, [ --enable-ggi GGI support (default disabled)]) if test "${enable_ggi}" = "yes" then - VLC_ADD_PLUGINS([ggi]) - VLC_ADD_LDFLAGS([ggi],[-lggi]) + VLC_ADD_PLUGIN([ggi]) + VLC_ADD_LIBS([ggi],[-lggi]) AC_ARG_WITH(ggi, [ --with-ggi=PATH path to libggi], [ if test "${with_ggi}" != "no" -a -n "${with_ggi}" then VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include]) - VLC_ADD_LDFLAGS([ggi],[-L${with_ggi}/lib]) + VLC_ADD_LIBS([ggi],[-L${with_ggi}/lib]) fi ]) fi @@ -4504,13 +4699,13 @@ then [ if test "${with_glide}" != "no" -a -n "${with_glide}" then VLC_ADD_CPPFLAGS([glide],[-I${with_glide}/include]) - VLC_ADD_LDFLAGS([glide],[-L${with_glide}/lib]) + VLC_ADD_LIBS([glide],[-L${with_glide}/lib]) CFLAGS="$CFLAGS -I${with_glide}/include" fi ]) CFLAGS="$CFLAGS -I/usr/include/glide" AC_CHECK_HEADER(glide.h,[ - VLC_ADD_PLUGINS([glide]) - VLC_ADD_LDFLAGS([glide],[-lglide2x -lm]) + VLC_ADD_PLUGIN([glide]) + VLC_ADD_LIBS([glide],[-lglide2x -lm]) VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide]) ],[ AC_MSG_ERROR([You don't have libglide. Install it or do not use --enable-glide]) @@ -4528,8 +4723,8 @@ then AC_CHECK_HEADER(aalib.h,have_aa="true",have_aa="false") if test "${have_aa}" = "true" then - VLC_ADD_PLUGINS([aa]) - VLC_ADD_LDFLAGS([aa],[-laa]) + VLC_ADD_PLUGIN([aa]) + VLC_ADD_LIBS([aa],[-laa]) fi fi @@ -4550,9 +4745,16 @@ then AC_PATH_PROG(CACA_CONFIG, caca-config, no, ${CACA_PATH}) if test "${CACA_CONFIG}" != "no" then - VLC_ADD_PLUGINS([caca]) + VLC_ADD_PLUGIN([caca]) VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([caca],[`${CACA_CONFIG} --plugin-libs`]) + VLC_ADD_LIBS([caca],[`${CACA_CONFIG} --plugin-libs`]) + AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include + caca_event_t ev;]], + [[ev.type = 0;]] + )], + [], + [AC_DEFINE(CACA_EVENT_OPAQUE, [1], ["Define if struct caca_event is opaque and must not be accessed directly"])] + ) fi fi @@ -4563,11 +4765,12 @@ 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 - VLC_ADD_PLUGINS([wingdi]) - VLC_ADD_LDFLAGS([wingdi],[-lgdi32]) + VLC_ADD_PLUGIN([wingdi]) + VLC_ADD_LIBS([wingdi],[-lgdi32]) fi if test "${SYS}" = "mingwce"; then - VLC_ADD_PLUGINS([wingdi wingapi]) + VLC_ADD_PLUGIN([wingdi]) + VLC_ADD_PLUGIN([wingapi]) fi fi @@ -4588,8 +4791,8 @@ if test "${enable_oss}" != "no" && test "${enable_oss}" = "yes") then AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ - VLC_ADD_PLUGINS([oss]) - AC_CHECK_LIB(ossaudio,main,VLC_ADD_LDFLAGS([oss],[-lossaudio])) + VLC_ADD_PLUGIN([oss]) + AC_CHECK_LIB(ossaudio,main,VLC_ADD_LIBS([oss],[-lossaudio])) ]) fi @@ -4603,12 +4806,26 @@ AC_ARG_ENABLE(esd, AC_PATH_PROG(ESD_CONFIG, esd-config, no) if test "${ESD_CONFIG}" != "no" then - VLC_ADD_PLUGINS([esd]) + VLC_ADD_PLUGIN([esd]) VLC_ADD_CFLAGS([esd],[`${ESD_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([esd],[`${ESD_CONFIG} --libs`]) + VLC_ADD_LIBS([esd],[`${ESD_CONFIG} --libs`]) fi fi]) +dnl +dnl Pulseaudio module +dnl +AC_ARG_ENABLE(pulse, + [ --enable-pulse Pulseaudio support (default enabled)]) + if test "${enable_pulse}" != "no" + then + PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.8, + [ VLC_ADD_PLUGIN([pulse]) + VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}]) + VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS}])], + [AC_MSG_WARN(pulsaudio library not found)]) + fi + dnl dnl Portaudio module dnl @@ -4616,12 +4833,12 @@ AC_ARG_ENABLE(portaudio, [ --enable-portaudio Portaudio library support (default disabled)], [if test "${enable_portaudio}" = "yes" then - VLC_ADD_PLUGINS([portaudio]) + VLC_ADD_PLUGIN([portaudio]) VLC_ADD_CXXFLAGS([portaudio],[]) if test "${SYS}" = "mingw32"; then - VLC_ADD_LDFLAGS([portaudio],[-lportaudio -lwinmm -lole32]) + VLC_ADD_LIBS([portaudio],[-lportaudio -lwinmm -lole32]) else - VLC_ADD_LDFLAGS([portaudio],[-lportaudio]) + VLC_ADD_LIBS([portaudio],[-lportaudio]) fi fi]) @@ -4635,9 +4852,9 @@ AC_ARG_ENABLE(arts, AC_PATH_PROG(ARTS_CONFIG, artsc-config, no) if test "${ARTS_CONFIG}" != "no" then - VLC_ADD_PLUGINS([arts]) + VLC_ADD_PLUGIN([arts]) VLC_ADD_CFLAGS([arts],[`${ARTS_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([arts],[`${ARTS_CONFIG} --libs `]) + VLC_ADD_LIBS([arts],[`${ARTS_CONFIG} --libs `]) fi fi]) @@ -4657,8 +4874,8 @@ then #include ], [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]) + VLC_ADD_PLUGIN([alsa]) + VLC_ADD_LIBS([alsa],[-lasound -lm -ldl]) else if test "${enable_alsa}" = "yes"; then AC_MSG_ERROR([Could not find ALSA development headers]) @@ -4673,11 +4890,11 @@ 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 - VLC_ADD_PLUGINS([waveout]) - VLC_ADD_LDFLAGS([waveout],[-lwinmm]) + VLC_ADD_PLUGIN([waveout]) + VLC_ADD_LIBS([waveout],[-lwinmm]) fi if test "${SYS}" = "mingwce"; then - VLC_ADD_PLUGINS([waveout]) + VLC_ADD_PLUGIN([waveout]) fi fi @@ -4690,7 +4907,7 @@ if test "${enable_macosx-audio}" != "no" && (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes") then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, - [ VLC_ADD_BUILTINS([auhal]) + [ VLC_ADD_PLUGIN([auhal]) VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -4706,8 +4923,8 @@ if test "${enable_hd1000a}" != "no" -a "${CXX}" != "" && then AC_LANG_PUSH([C++]) AC_CHECK_HEADERS(deschutes/libraries/hdmachinex225/PCMAudioPlayer.h, [ - VLC_ADD_PLUGINS([hd1000a]) - AC_CHECK_LIB(HDMachineX225,main,VLC_ADD_LDFLAGS([hd1000a],[-lHDMachineX225])) ]) + VLC_ADD_PLUGIN([hd1000a]) + AC_CHECK_LIB(HDMachineX225,main,VLC_ADD_LIBS([hd1000a],[-lHDMachineX225])) ]) AC_LANG_POP([C++]) fi @@ -4720,8 +4937,9 @@ AC_ARG_ENABLE(jack, AS_IF([test "${enable_jack}" != "no"], [ AC_CHECK_HEADERS(jack/jack.h, [ - VLC_ADD_PLUGINS([access_jack jack]) - VLC_ADD_LDFLAGS([access_jack jack],[-ljack]) + VLC_ADD_PLUGIN([access_jack]) + VLC_ADD_PLUGIN([jack]) + VLC_ADD_LIBS([access_jack jack],[-ljack]) ],[AC_MSG_ERROR([cannot find JACK headers])]) ]) @@ -4750,7 +4968,7 @@ AC_ARG_ENABLE(cyberlink, CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_cyberlink}" AC_CHECK_HEADERS([cybergarage/upnp/MediaServer.h], [ VLC_ADD_CXXFLAGS([upnp_cc], [${CPPFLAGS_cyberlink}]) - VLC_ADD_PLUGINS([upnp_cc]) + VLC_ADD_PLUGIN([upnp_cc]) ],[ AC_MSG_ERROR([cannot find CyberLink for C++ headers]) ]) @@ -4787,7 +5005,7 @@ class testclass : public SearchResponseListener, public MediaPlayer AS_IF([test "${LIBS_cclink}" = "no"], [AC_MSG_FAILURE([cannot find XML parser for CyberLink])]) AC_MSG_RESULT([${LIBS_cclink}]) - VLC_ADD_LDFLAGS([upnp_cc], [${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink}]) + VLC_ADD_LIBS([upnp_cc], [${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink}]) ], [ AC_MSG_RESULT(no) AC_MSG_ERROR([cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}]) @@ -4801,7 +5019,7 @@ dnl dnl UPnP Plugin (Intel SDK) dnl AC_ARG_ENABLE(upnp, - [ --enable-upnp Intel UPnP SDK (default auto)]) + [ --enable-upnp Intel UPnP SDK (default enabled)]) VLC_ADD_CXXFLAGS([upnp_intel], [ ]) AS_IF([test "x${enable_upnp}" != "xno"], [ @@ -4810,14 +5028,14 @@ 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 -lixml]) + VLC_ADD_LIBS([upnp_intel], [-lupnp -lixml]) ]) ], [ has_upnp="no" ]) AS_IF([test "${has_upnp}" = "yes"], [ - VLC_ADD_PLUGINS([upnp_intel]) + VLC_ADD_PLUGIN([upnp_intel]) ]) @@ -4846,10 +5064,7 @@ if test "${enable_skins2}" = "yes" || skins2_missing_lib="no" dnl freetype - if test "${FREETYPE_CONFIG}" != "no"; then - VLC_ADD_CPPFLAGS([skins2],[`${FREETYPE_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([skins2],[`${FREETYPE_CONFIG} --libs`]) - else + if test "${have_freetype}" != "yes"; then skins2_missing_lib="yes" if test "${enable_skins2}" = "yes"; then AC_MSG_ERROR([Could not find freetype (required for skins2)]) @@ -4857,28 +5072,28 @@ if test "${enable_skins2}" = "yes" || fi if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"); then - VLC_ADD_PLUGINS([skins2]) + VLC_ADD_PLUGIN([skins2]) ALIASES="${ALIASES} svlc" 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]) + VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32]) else if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "darwin"); then - VLC_ADD_PLUGINS([skins2]) + VLC_ADD_PLUGIN([skins2]) ALIASES="${ALIASES} svlc" VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) VLC_ADD_LDFLAGS([skins2],[-Wl,-framework,Carbon]) else if test "${skins2_missing_lib}" = "no"; then - VLC_ADD_PLUGINS([skins2]) + VLC_ADD_PLUGIN([skins2]) ALIASES="${ALIASES} svlc" VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) - VLC_ADD_LDFLAGS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11]) + VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11]) fi fi fi fi - +AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) dnl dnl dnl dnl Gtk+ module @@ -4909,10 +5124,10 @@ dnl AC_MSG_ERROR([Your development package for Gtk+ is too old, you need a dnl fi dnl if test "${SYS}" != "mingw32"; then dnl VLC_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk gthread`]) -dnl VLC_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`]) +dnl VLC_ADD_LIBS([gtk],[`${GTK_CONFIG} --libs gtk gthread | sed 's,-rdynamic,,'`]) dnl else dnl VLC_ADD_CFLAGS([gtk],[`${GTK_CONFIG} --cflags gtk`]) -dnl VLC_ADD_LDFLAGS([gtk],[`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`]) +dnl VLC_ADD_LIBS([gtk],[`${GTK_CONFIG} --libs gtk | sed 's,-rdynamic,,'`]) dnl fi dnl # now look for the gtk.h header dnl CPPFLAGS="${CPPFLAGS_save} ${CFLAGS_gtk}" @@ -4923,7 +5138,7 @@ dnl echo "Cannot find gtk development headers." dnl ]) dnl if test "${ac_cv_gtk_headers}" = "yes" dnl then -dnl VLC_ADD_PLUGINS([gtk]) +dnl VLC_ADD_PLUGIN([gtk]) dnl if test "${SYS}" != "mingw32"; then dnl NEED_GTK_MAIN=yes dnl fi @@ -4942,8 +5157,8 @@ dnl if test "${enable_gtk2}" = "yes" dnl then dnl PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0]) dnl VLC_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}]) -dnl VLC_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}]) -dnl VLC_ADD_PLUGINS([gtk2]) +dnl VLC_ADD_LIBS([gtk2],[${GTK2_LIBS}]) +dnl VLC_ADD_PLUGIN([gtk2]) dnl if test "${SYS}" != "mingw32"; then dnl NEED_GTK2_MAIN=yes dnl fi @@ -4958,14 +5173,16 @@ if test "${enable_pda}" = "yes" then PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0]) VLC_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}]) - VLC_ADD_LDFLAGS([gtk2],[${GTK2_LIBS}]) + VLC_ADD_LIBS([gtk2],[${GTK2_LIBS}]) VLC_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}]) - VLC_ADD_LDFLAGS([pda],[${GTK2_LIBS} ${LDFLAGS_pda}]) - VLC_ADD_PLUGINS([pda]) + VLC_ADD_LIBS([pda],[${LDFLAGS_pda}]) + VLC_ADD_LIBS([pda],[${GTK2_LIBS}]) + VLC_ADD_PLUGIN([pda]) if test "${SYS}" != "mingw32"; then NEED_GTK2_MAIN=yes fi fi +AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"]) dnl dnl dnl dnl Gnome module @@ -4978,12 +5195,12 @@ dnl AC_PATH_PROG(GNOME_CONFIG, gnome-config, no) dnl if test -x ${GNOME_CONFIG} dnl then dnl VLC_ADD_CFLAGS([gnome],[`${GNOME_CONFIG} --cflags gtk gnomeui`]) -dnl VLC_ADD_LDFLAGS([gnome],[`${GNOME_CONFIG} --libs gnomeui | sed 's,-rdynamic,,'`]) +dnl VLC_ADD_LIBS([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 VLC_ADD_PLUGINS([gnome]) +dnl VLC_ADD_PLUGIN([gnome]) dnl NEED_GTK_MAIN=yes dnl NEED_GNOME_MAIN=yes dnl ALIASES="${ALIASES} gnome-vlc" @@ -5010,8 +5227,8 @@ dnl if test "${enable_gnome2}" = "yes" dnl then dnl PKG_CHECK_MODULES(GNOME2, [libgnomeui-2.0]) dnl VLC_ADD_CFLAGS([gnome2],[${GNOME2_CFLAGS}]) -dnl VLC_ADD_LDFLAGS([gnome2],[${GNOME2_LIBS}]) -dnl VLC_ADD_PLUGINS([gnome2]) +dnl VLC_ADD_LIBS([gnome2],[${GNOME2_LIBS}]) +dnl VLC_ADD_PLUGIN([gnome2]) dnl if test "${SYS}" != "mingw32"; then dnl NEED_GNOME2_MAIN=yes dnl fi @@ -5060,7 +5277,7 @@ then if test "${ac_cv_cxx_fpermissive}" = "yes"; then VLC_ADD_CXXFLAGS([wxwidgets],-fpermissive) fi - VLC_ADD_LDFLAGS([wxwidgets],[`${WX_CONFIG} --libs`]) + VLC_ADD_LIBS([wxwidgets],[`${WX_CONFIG} --libs`]) VLC_ADD_CXXFLAGS([wxwidgets],[`${WX_CONFIG} --cxxflags`]) # check if we must link against gtk2 libs # if __WXGTK20__ && __WXGTK__ are defined @@ -5072,7 +5289,7 @@ then #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`]) + ${PKG_CONFIG} --exists gtk+-2.0 && VLC_ADD_LIBS([wxwidgets],[`$PKG_CONFIG --libs gtk+-2.0`]) fi if ${WX_CONFIG} --unicode then @@ -5084,7 +5301,7 @@ then fi if test "$have_libcdio" = "yes" then - VLC_ADD_LDFLAGS([wxwidgets],[$LIBCDIO_LIBS]) + VLC_ADD_LIBS([wxwidgets],[$LIBCDIO_LIBS]) VLC_ADD_CXXFLAGS([wxwidgets],[$LIBCDIO_CFLAGS]) else AC_MSG_WARN([Probe disc disabled because ok libcdio library not found]) @@ -5092,7 +5309,7 @@ then if test "$have_libvcdinfo" = "yes" then - VLC_ADD_LDFLAGS([wxwidgets],[$VCDINFO_LIBS]) + VLC_ADD_LIBS([wxwidgets],[$VCDINFO_LIBS]) VLC_ADD_CXXFLAGS([wxwidgets],[$VCDINFO_CFLAGS]) else AC_MSG_WARN([VCD information on Probe disc disabled because ok libvcdinfo not found]) @@ -5107,7 +5324,8 @@ then ]) if test "${ac_cv_wx_headers}" = "yes" then - VLC_ADD_PLUGINS([wxwidgets]) + VLC_ADD_PLUGIN([wxwidgets]) + AC_DEFINE([HAVE_WX], 1, [Define to 1 if you have WxWidgets library.]) ALIASES="${ALIASES} wxvlc" fi CPPFLAGS="${CPPFLAGS_save}" @@ -5126,19 +5344,24 @@ AC_ARG_ENABLE(qt4, AS_IF([test "${enable_qt4}" != "no" && (test "${SYS}" != "darwin" || test "${enable_qt4}" = "yes")], [ PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.2.0], - [ VLC_ADD_PLUGINS([qt4]) + [ VLC_ADD_PLUGIN([qt4]) + AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.]) ALIASES="${ALIASES} qvlc" enableqt4=true - VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS]) - VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS]) + if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"; then + VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11]) + else + VLC_ADD_LIBS([qt4],[$QT4_LIBS]) + fi + VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"]) AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) ], AS_IF([test "${enable_qt4}" = "yes"],[ - AC_MSG_ERROR(QT4 library not found) + AC_MSG_ERROR(QT4 library not found) ],[ - AC_MSG_WARN(QT4 library not found) + AC_MSG_WARN(QT4 library not found) ]) ) ]) @@ -5147,17 +5370,21 @@ AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true") dnl dnl WinCE GUI module dnl -if test "${SYS}" = "mingwce"; then - VLC_ADD_BUILTINS([wince]) - VLC_ADD_CXXFLAGS([wince],[]) - VLC_ADD_LDFLAGS([wince],[-lcommctrl -lcommdlg -laygshell]) - dnl Gross hack - VLC_ADD_LDFLAGS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) -elif test "${SYS}" = "mingw32"; then - VLC_ADD_CXXFLAGS([wince],[]) - VLC_ADD_LDFLAGS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) - dnl Gross hack - VLC_ADD_LDFLAGS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) +AC_ARG_ENABLE(wince, + [ --enable-wince Windows CE interface (default enabled with MinGW)]) +if test "${enable_wince}" != "no"; then + if test "${SYS}" = "mingwce"; then + VLC_ADD_BUILTINS([wince]) + VLC_ADD_CXXFLAGS([wince],[]) + VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell]) + dnl Gross hack + VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) + elif test "${SYS}" = "mingw32"; then + VLC_ADD_CXXFLAGS([wince],[]) + VLC_ADD_LIBS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32]) + dnl Gross hack + VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o]) + fi fi dnl @@ -5177,15 +5404,15 @@ dnl dnl dnl AC_ARG_ENABLE(qt, dnl [ --enable-qt Qt interface support (default disabled)], dnl [if test "${enable_qt}" = "yes"; then -dnl VLC_ADD_PLUGINS([qt]) +dnl VLC_ADD_PLUGIN([qt]) dnl ALIASES="${ALIASES} qvlc" -dnl VLC_ADD_LDFLAGS([qt],[-L${QTDIR}/lib]) +dnl VLC_ADD_LIBS([qt],[-L${QTDIR}/lib]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt}" dnl AC_CHECK_LIB(qt-mt,main,[ -dnl VLC_ADD_LDFLAGS([qt],[-lqt-mt]) +dnl VLC_ADD_LIBS([qt],[-lqt-mt]) dnl ],[ dnl AC_CHECK_LIB(qt,main,[ -dnl VLC_ADD_LDFLAGS([qt],[-lqt]) +dnl VLC_ADD_LIBS([qt],[-lqt]) dnl ]) dnl ]) dnl LDFLAGS="${LDFLAGS_save}" @@ -5204,21 +5431,21 @@ dnl dnl dnl AC_ARG_ENABLE(kde, dnl [ --enable-kde KDE interface support (default disabled)], dnl [if test "${enable_kde}" = "yes"; then -dnl VLC_ADD_PLUGINS([kde]) +dnl VLC_ADD_PLUGIN([kde]) dnl ALIASES="${ALIASES} kvlc" -dnl VLC_ADD_LDFLAGS([kde],[-L${KDEDIR}/lib]) +dnl VLC_ADD_LIBS([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 VLC_ADD_LDFLAGS([kde],[-lkfile]) +dnl VLC_ADD_LIBS([kde],[-lkfile]) dnl ]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" dnl AC_CHECK_LIB(kdeui,main,[ -dnl VLC_ADD_LDFLAGS([kde],[-lkdeui]) +dnl VLC_ADD_LIBS([kde],[-lkdeui]) dnl ]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_kde}" dnl AC_CHECK_LIB(kio,main,[ -dnl VLC_ADD_LDFLAGS([kde],[-lkio]) +dnl VLC_ADD_LIBS([kde],[-lkio]) dnl ]) dnl LDFLAGS="${LDFLAGS_save}" dnl VLC_ADD_CXXFLAGS([kde],[-I/usr/include/kde -I/usr/include/qt3 -I/usr/include/qt]) @@ -5241,10 +5468,10 @@ AC_ARG_ENABLE(opie, [ --with-qte=PATH Qt Embedded headers and libraries]) if test "${with_qte}" != "no" -a -n "${with_qte}" then - VLC_ADD_LDFLAGS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte]) + VLC_ADD_LIBS([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 - VLC_ADD_LDFLAGS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`]) + VLC_ADD_LIBS([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}" @@ -5253,9 +5480,9 @@ AC_ARG_ENABLE(opie, ] ) CPPFLAGS="${CPPFLAGS_save}" - VLC_ADD_PLUGINS([opie]) + VLC_ADD_PLUGIN([opie]) NEED_QTE_MAIN=yes - VLC_ADD_LDFLAGS([opie],[-lqpe ${LDFLAGS_qte}]) + VLC_ADD_LIBS([opie],[-lqpe ${LDFLAGS_qte}]) VLC_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}]) if test "${with_qte}" != "no" -a -n "${with_qte}" then @@ -5266,32 +5493,35 @@ AC_ARG_ENABLE(opie, fi]) dnl -dnl MacOS X module +dnl MacOS X video output/gui modules dnl -ORIGCFLAGS=$CFLAGS -CFLAGS="$CFLAGS -x objective-c" AC_ARG_ENABLE(macosx, - [ --enable-macosx MacOS X support (default enabled on MacOS X)], - [if test "${enable_macosx}" = "yes" - then - VLC_ADD_PLUGINS([access_eyetv]) - VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation]) - VLC_ADD_LDFLAGS([minimal_macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL]) - VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit]) - VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] ) - VLC_ADD_OBJCFLAGS( [minimal_macosx],[-fobjc-exceptions] ) - fi], - [AC_CHECK_HEADERS(Cocoa/Cocoa.h, - [VLC_ADD_PLUGINS([access_eyetv]) - VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation]) - VLC_ADD_BUILTINS([macosx]) - VLC_ADD_BUILTINS([minimal_macosx]) - VLC_ADD_LDFLAGS([minimal_macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL]) - VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit]) - VLC_ADD_OBJCFLAGS([macosx],[-fobjc-exceptions]) - VLC_ADD_OBJCFLAGS([minimal_macosx],[-fobjc-exceptions]) - ])]) -CFLAGS=$ORIGCFLAGS + [ --enable-macosx MacOS X support (default enabled on MacOS X)]) +if test "x${enable_macosx}" = "xyes" +then +# VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation]) + VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,Cocoa]) + VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,OpenGL]) + VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon]) + VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL]) + VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) + VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QuickTime]) + VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QTKit]) + VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit]) + VLC_ADD_LDFLAGS([opengllayer], [-Wl,-framework,QuartzCore]) + VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] ) + +# VLC_ADD_PLUGIN([access_eyetv]) + VLC_ADD_PLUGIN([macosx]) + VLC_ADD_PLUGIN([minimal_macosx]) + + ORIGCFLAGS=$CFLAGS + CFLAGS="$CFLAGS -x objective-c" + AC_CHECK_HEADER(QuartzCore/CALayer.h, + [VLC_ADD_PLUGIN([opengllayer]) + VLC_ADD_OBJCFLAGS([opengllayer], [-isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5])]) + CFLAGS=$ORIGCFLAGS +fi dnl dnl QNX RTOS module @@ -5301,8 +5531,8 @@ AC_ARG_ENABLE(qnx, if test "${enable_qnx}" != "no" then AC_CHECK_HEADERS(Ph.h, [ - VLC_ADD_PLUGINS([qnx]) - VLC_ADD_LDFLAGS([qnx],[-lasound -lph]) + VLC_ADD_PLUGIN([qnx]) + VLC_ADD_LIBS([qnx],[-lasound -lph]) ]) fi @@ -5310,21 +5540,41 @@ dnl dnl ncurses module dnl AC_ARG_ENABLE(ncurses, - [ --disable-ncurses ncurses interface support (default enabled)], + [ --disable-ncurses ncurses interface support (default enabled)], [if test "${enable_ncurses}" != "no"; then - AC_CHECK_HEADERS(ncursesw/curses.h, - [AC_CHECK_LIB( ncursesw, mvprintw, - [VLC_ADD_PLUGINS([ncurses]) - VLC_ADD_LDFLAGS([ncurses],[-lncursesw])]) - ], - [AC_CHECK_HEADER(curses.h, - [AC_CHECK_LIB(ncurses, mvprintw, - [VLC_ADD_PLUGINS([ncurses]) - VLC_ADD_LDFLAGS([ncurses],[-lncurses])] - )] - )] - ) - fi]) + AC_CHECK_HEADER(ncurses.h, + [AC_CHECK_LIB(ncursesw, mvprintw, + [VLC_ADD_PLUGIN([ncurses]) + VLC_ADD_LIBS([ncurses],[-lncursesw]) + ALIASES="${ALIASES} nvlc" + AC_DEFINE([HAVE_NCURSESW], 1, [Define to 1 if you have libncursesw.]) + AC_CHECK_LIB(ncursesw, tgetent, [], + AC_CHECK_LIB(tinfow, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfow])], + [AC_CHECK_LIB(tinfo, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfo])], + [AS_IF([test "x${enable_ncurses}" != "x"], + [AC_MSG_ERROR([tgetent not found in ncursesw tinfow tinfo] + )])]) + ] + ) + ) + ], + [AC_CHECK_LIB( ncurses, mvprintw, + [VLC_ADD_PLUGIN([ncurses]) + ALIASES="${ALIASES} nvlc" + VLC_ADD_LIBS([ncurses],[-lncurses]) + AC_CHECK_LIB(ncurses, tgetent, [], + [AC_CHECK_LIB(tinfo, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfo])], + [AS_IF([test "x${enable_ncurses}" != "x"], + [AC_MSG_ERROR([tgetent not found in ncurses tinfo])])] + )] + )], + [AS_IF([test "x${enable_ncurses}" != "x"], [ + AC_MSG_ERROR([libncurses not found])])] + )] + )] + ) + fi] +) dnl dnl XOSD plugin @@ -5343,11 +5593,23 @@ then AC_DEFINE(HAVE_XOSD_VERSION_0, 1, Define if is pre-1.0.0)))) if test "${have_xosd}" = "true" then - VLC_ADD_PLUGINS([xosd]) - VLC_ADD_LDFLAGS([xosd],[-lxosd]) + VLC_ADD_PLUGIN([xosd]) + VLC_ADD_LIBS([xosd],[-lxosd]) fi fi +dnl +dnl Framebuffer (overlay) plugin +dnl +AC_ARG_ENABLE(fbosd, + [ --enable-fbosd fbosd interface support (default disabled)]) +if test "${enable_fbosd}" = "yes" +then + AC_CHECK_HEADERS(linux/fb.h, [ + VLC_ADD_PLUGIN([fbosd]) + ]) +fi + dnl dnl Visualisation plugin dnl @@ -5355,7 +5617,7 @@ AC_ARG_ENABLE(visual, [ --enable-visual visualisation plugin (default enabled)]) if test "${enable_visual}" != "no" then - VLC_ADD_PLUGINS([visual]) + VLC_ADD_PLUGIN([visual]) fi dnl @@ -5366,11 +5628,11 @@ AC_ARG_ENABLE(galaktos, if test "${enable_galaktos}" = "yes" then AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [ - VLC_ADD_PLUGINS([galaktos]) + VLC_ADD_PLUGIN([galaktos]) if test "${SYS}" != "mingw32"; then - VLC_ADD_LDFLAGS([galaktos],[${X_LIBS} -lGL -lGLU]) + VLC_ADD_LIBS([galaktos],[${X_LIBS} -lGL -lGLU]) else - VLC_ADD_LDFLAGS([galaktos],[-lopengl32]) + VLC_ADD_LIBS([galaktos],[-lopengl32]) fi ]) fi @@ -5398,8 +5660,8 @@ then fi if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a) - VLC_ADD_BUILTINS([goom]) - VLC_ADD_LDFLAGS([goom],[-L${real_goom_tree}/src/.libs -lgoom2]) + VLC_ADD_PLUGIN([goom]) + VLC_ADD_LIBS([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 @@ -5407,8 +5669,8 @@ then 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) - VLC_ADD_BUILTINS([goom]) - VLC_ADD_LDFLAGS([goom],[-L${real_goom_tree} -lgoom]) + VLC_ADD_PLUGIN([goom]) + VLC_ADD_LIBS([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 @@ -5418,10 +5680,10 @@ then fi else AC_CHECK_HEADERS(goom/goom.h, [ - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_goom}" + LDFLAGS="${LDFLAGS_save} ${LIBS_goom}" AC_CHECK_LIB(goom2, goom_init, [ - VLC_ADD_PLUGINS([goom]) - VLC_ADD_LDFLAGS([goom],[-lgoom2]) + VLC_ADD_PLUGIN([goom]) + VLC_ADD_LIBS([goom],[-lgoom2]) ],[ AC_MSG_ERROR([Could not find goom on your system: you may get it from http://www.ios-software.com/.]) ]) @@ -5430,6 +5692,19 @@ then fi fi +dnl +dnl AtmoLight (homebrew AmbiLight) +dnl +if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then + AC_ARG_ENABLE(atmo, +[ --disable-atmo AtmoLight (homebrew philips ambilight) (default enabled)]) + if test "${enable_atmo}" != "no"; then + AC_LANG_PUSH(C++) + VLC_ADD_PLUGIN([atmo]) + AC_LANG_POP(C++) + fi +fi + dnl dnl Bonjour services discovery dnl @@ -5439,11 +5714,11 @@ if test "${enable_bonjour}" != "no" then PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.3, [PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.6, - [AC_DEFINE(HAVE_AVAHI_06, [], [Define if you have avahi-client 0.6 or greater])],) - AC_DEFINE(HAVE_AVAHI_CLIENT, [], [Define if you have the avahi-client library]) - VLC_ADD_LDFLAGS([bonjour access_output_http],[$BONJOUR_LIBS]) + [AC_DEFINE(HAVE_AVAHI_06, 1, [Define if you have avahi-client 0.6 or greater])],) + AC_DEFINE(HAVE_AVAHI_CLIENT, 1, [Define if you have the avahi-client library]) + VLC_ADD_LIBS([bonjour access_output_http],[$BONJOUR_LIBS]) VLC_ADD_CFLAGS([bonjour access_output_http],[$BONJOUR_CFLAGS]) - VLC_ADD_PLUGINS([bonjour]) ], + VLC_ADD_PLUGIN([bonjour]) ], [AC_MSG_WARN(avahi-client library not found)]) fi @@ -5457,14 +5732,47 @@ 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 - VLC_ADD_PLUGINS([lirc]) - VLC_ADD_LDFLAGS([lirc],[-llirc_client]) + VLC_ADD_PLUGIN([lirc]) + VLC_ADD_LIBS([lirc],[-llirc_client]) fi fi AC_ARG_WITH(,[Misc options:]) +dnl +dnl libgcrypt +dnl +AC_ARG_ENABLE(libgcrypt, + [ --enable-libgcrypt libgcrypts support (default enabled)]) + +GCRYPT_PATH="${PATH}" +AC_ARG_WITH(libgcrypt-config-path, +[ --with-libgcrypt-config-path=PATH libgcrypt-config path (default search in \$PATH)], + [ if test "${with_libgcrypt_config_path}" != "no" + then + GCRYPT_PATH="${with_libgcrypt_config_path}:${PATH}" + fi ]) + +if test "${enable_libgcrypt}" != "no" +then + dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect + dnl it and looks for libgcrypt headers in the wrong place. + if test "${host_cpu}" = "${build_cpu}" + then + AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"]) + else + AC_CHECK_HEADERS(gcrypt.h,have_libgcrypt="yes",have_libgcrypt="no") + fi +fi +AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"]) +AS_IF([test "${have_libgcrypt}" = "yes"],[ + # look for libgcrypt-config + AC_PATH_PROG(GCRYPT_CONFIG, "libgcrypt-config", no, ${GCRYPT_PATH}) + GCRYPT_CFLAGS=`${GCRYPT_CONFIG} --cflags` + GCRYPT_LIBS=`${GCRYPT_CONFIG} --libs` +]) + dnl dnl TLS/SSL dnl @@ -5472,20 +5780,19 @@ AC_ARG_ENABLE(gnutls, [ --enable-gnutls gnutls TLS/SSL support (default enabled)]) AS_IF([test "${enable_gnutls}" != "no"], [ - PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.2.9], [have_gnutls="yes"], [have_gnutls="no"]) - - AS_IF([test "${have_gnutls}" = "yes"], [ - VLC_ADD_PLUGINS([gnutls]) + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.3.3], [ + VLC_ADD_PLUGIN([gnutls]) VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS]) AS_IF([test "${SYS}" = "mingw32"], [ dnl pkg-config --libs gnutls omits these - VLC_ADD_LDFLAGS([gnutls], [-lz]) - VLC_ADD_LDFLAGS([gnutls], [${LTLIBINTL}]) + VLC_ADD_LIBS([gnutls], [-lz]) + VLC_ADD_LIBS([gnutls], [${LTLIBINTL}]) ]) - AC_CHECK_LIB([gcrypt], [gcry_control], [ - VLC_ADD_LDFLAGS([gnutls], [-lgcrypt -lgpg-error]) - ], [], [-lgpg-error]) - VLC_ADD_LDFLAGS([gnutls], [$GNUTLS_LIBS]) + AS_IF([test "${have_libgcrypt}" = "yes"],[ + VLC_ADD_LIBS([gnutls], ${GCRYPT_LIBS}) + VLC_ADD_CFLAGS([gnutls], ${GCRYPT_CFLAGS}) + ], [-lgpg-error]) + VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS]) ], [ AS_IF([test "${enable_gnutls}" = "yes"], [ AC_MSG_ERROR([gnutls not present or too old (version 1.2.9 required)]) @@ -5494,23 +5801,20 @@ AS_IF([test "${enable_gnutls}" != "no"], [ ]) dnl -dnl libgcrypt +dnl update checking system dnl -AC_ARG_ENABLE(libgcrypt, - [ --enable-libgcrypt libgcrypts support (default enabled)]) -if test "${enable_libgcrypt}" != "no" -a "${enable_gnutls}" != "no"i +AC_ARG_ENABLE(update-check, + [ --enable-update-check update checking system (default disabled)]) +if test "${enable_update_check}" = "yes" then - dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect - dnl it and looks for libgcrypt headers in the wrong place. - if test "${host_cpu}" = "${build_cpu}" + if test "${have_libgcrypt}" != "yes" then - AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"]) - else - AC_CHECK_HEADERS(gcrypt.h,have_libgcrypt="yes",have_libgcrypt="no") + AC_MSG_ERROR([libgcrypt is required for update checking system]) fi + VLC_ADD_LIBS([libvlc], ${GCRYPT_LIBS}) + VLC_ADD_CFLAGS([libvlc], ${GCRYPT_CFLAGS}) + AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism]) fi -AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"]) - dnl dnl Endianness check, AC_C_BIGENDIAN doesn't work if we are cross-compiling @@ -5579,15 +5883,24 @@ 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]) + [ VLC_ADD_PLUGIN([dmo]) VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/libs/loader]) - VLC_ADD_LDFLAGS([dmo],[../../../libs/loader/libloader.la -lpthread]) + VLC_ADD_LIBS([dmo],[../../../libs/loader/libloader.la -lpthread]) VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/libs/loader]) - VLC_ADD_LDFLAGS([quicktime],[../../libs/loader/libloader.la -lpthread]) + VLC_ADD_LIBS([quicktime],[../../libs/loader/libloader.la -lpthread]) VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/libs/loader -DLOADER]) - VLC_ADD_LDFLAGS([realaudio],[../../libs/loader/libloader.la -ldl -lpthread]) + VLC_ADD_LIBS([realaudio],[../../libs/loader/libloader.la]) ]) +AC_ARG_WITH(,[Components:]) + +dnl +dnl the VLC binary +dnl +AC_ARG_ENABLE(vlc, + [ --enable-vlc build the VLC media player (default enabled)]) +AM_CONDITIONAL(BUILD_VLC, [test "${enable_vlc}" != "no"]) + dnl dnl Microsoft ActiveX support dnl @@ -5613,7 +5926,7 @@ then [AC_CHECK_HEADERS(olectl.h, [ VLC_ADD_CPPFLAGS([activex],[-DUNICODE -D_UNICODE -D_MIDL_USE_GUIDDEF_]) VLC_ADD_CXXFLAGS([activex],[-fno-exceptions]) - VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) + VLC_ADD_LIBS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) AC_CHECK_HEADERS(objsafe.h, VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),, [ @@ -5695,11 +6008,13 @@ then MOZILLA_CONFIG_H="${firefox_include}/mozilla-config.h" fi if grep '^#define MOZ_X11 1' ${MOZILLA_CONFIG_H} 2>&1 > /dev/null ; then - VLC_ADD_LDFLAGS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt]) + AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h])) + VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm]) fi VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}]) - VLC_ADD_LDFLAGS([mozilla],[${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} ${MOZILLA_LDFLAGS}]) - VLC_ADD_PLUGINS([mozilla]) + VLC_ADD_LDFLAGS([mozilla],[${MOZILLA_LDFLAGS}]) + VLC_ADD_LIBS([mozilla],[${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS}]) + VLC_ADD_PLUGIN([mozilla]) MOZILLA_CONFIG= CPPFLAGS="${CPPFLAGS_save}" ], @@ -5731,11 +6046,12 @@ then AC_CHECK_LIB(Xt,XtStrings, [ VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}]) - VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE]) + VLC_ADD_LIBS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE -lXpm]) ], [], - [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE] + [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE -lXpm] ]) + AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h])) LDFLAGS="${LDFLAGS_save}" fi @@ -5744,9 +6060,9 @@ then dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) if ${need_xpcom_libs}; then - VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`]) + VLC_ADD_LIBS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`]) else - VLC_ADD_LDFLAGS([mozilla],[`${MOZILLA_CONFIG} --libs plugin`]) + VLC_ADD_LIBS([mozilla],[`${MOZILLA_CONFIG} --libs plugin`]) fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}" MOZILLA_REQUIRED_HEADERS=1 @@ -5796,12 +6112,12 @@ then PLUGINS_BINDINGS="${PLUGINS_BINDINGS} 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]) + VLC_ADD_LIBS([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]) + VLC_ADD_LIBS([mozilla],[-lembedstring]) fi fi fi @@ -5816,19 +6132,19 @@ fi AC_LANG_POP(C++) AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) - dnl Tests for Osso and Xsp +dnl Tests for Osso and Xsp if test "${enable_x11}" != "no" && (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || test "${enable_x11}" = "yes"); then AC_CHECK_LIB(osso, osso_display_blanking_pause,[ PKG_CHECK_MODULES(GLIB2, glib-2.0, [ VLC_ADD_CPPFLAGS([x11],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}]) - VLC_ADD_LDFLAGS([x11],[-losso]) + VLC_ADD_LIBS([x11],[-losso]) ]) ]) AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[ VLC_ADD_CPPFLAGS([x11],[-DHAVE_XSP]) - VLC_ADD_LDFLAGS([x11],[-lXsp]) + VLC_ADD_LIBS([x11],[-lXsp]) ]) fi @@ -5836,12 +6152,18 @@ dnl dnl Mediacontrol Python bindings dnl AC_ARG_ENABLE(python-bindings, - [ --enable-python-bindings Enable Python bindings (default disabled)]) -dnl TODO: look for python dev headers -AS_IF([test "${enable_python_bindings}" = "yes"], - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} python" - ) - + [ --enable-python-bindings Enable Python bindings (default disabled)]) + +if test "${enable_python_bindings}" = "yes"; then + AC_PATH_PROG(PYTHON_CONFIG, python-config, no) + CFLAGS="${CFLAGS_save} `${PYTHON_CONFIG} --cflags`" + AC_CHECK_HEADER([Python.h], + PLUGINS_BINDINGS="${PLUGINS_BINDINGS} python", + AC_MSG_ERROR([You have to install python-dev to build the bindings]), + [] + ) + CFLAGS="${CFLAGS_save}" +fi AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"]) dnl @@ -5851,17 +6173,16 @@ AC_ARG_ENABLE(java-bindings, [ --enable-java-bindings Enable Java bindings (default disabled)]) if test "${enable_java_bindings}" = "yes" then - AS_IF([test "x${JAVA_HOME}" == "x"], - [AC_MSG_ERROR([Please set the JAVA_HOME variable to your JDK environment])]) - AC_PROG_JAVAC - AC_PROG_JAVA - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} java" - if test "${JAVAC}" == "javac${EXEEXT}" - then - JAVAC="javac${EXEEXT} -cp ./ " - fi + echo "" + echo "****** WARNING **** WARNING ***** WARNING *************" + echo "*** To compile the java bindings go to the " + echo "*** bindings/java folder and run mvn install. " + echo "*** You need maven2 installed. " + echo "*** This configuration will continue, so you will be " + echo "*** able to compile VideoLAN as usual. " + echo "*******************************************************" + echo "" fi -AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"]) dnl dnl test plugins @@ -5876,9 +6197,12 @@ then VLC_ADD_CXXFLAGS([test2],[]) VLC_ADD_OBJCFLAGS([test3],[]) dnl this one is needed until automake knows what to do - VLC_ADD_LDFLAGS([test3],[-lobjc]) + VLC_ADD_LIBS([test3],[-lobjc]) - VLC_ADD_PLUGINS([${TESTS}]) + VLC_ADD_PLUGIN([test1]) + VLC_ADD_PLUGIN([test2]) + VLC_ADD_PLUGIN([test3]) + VLC_ADD_PLUGIN([test4]) fi dnl @@ -5896,21 +6220,21 @@ dnl gtk_main plugin dnl if test "${NEED_GTK_MAIN}" != "no" then - VLC_ADD_PLUGINS([gtk_main]) + VLC_ADD_PLUGIN([gtk_main]) VLC_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk}]) VLC_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk}]) fi if test "${NEED_GNOME_MAIN}" != "no" then - VLC_ADD_PLUGINS([gnome_main]) + VLC_ADD_PLUGIN([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 - VLC_ADD_PLUGINS([gtk2_main]) + VLC_ADD_PLUGIN([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}]) @@ -5919,7 +6243,7 @@ fi if test "${NEED_GNOME2_MAIN}" != "no" then - VLC_ADD_PLUGINS([gnome2_main]) + VLC_ADD_PLUGIN([gnome2_main]) VLC_ADD_CFLAGS([gnome2_main],[${CFLAGS_gtk2} ${CFLAGS_gnome2}]) VLC_ADD_LDFLAGS([gnome2_main],[${LDFLAGS_gtk2} ${LDFLAGS_gnome2}]) fi @@ -5929,7 +6253,7 @@ dnl qte_main plugin dnl if test "${NEED_QTE_MAIN}" != "no" then - VLC_ADD_PLUGINS([qte_main]) + VLC_ADD_PLUGIN([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}]) @@ -5956,25 +6280,26 @@ AS_IF([test "${enable_shared}" = "no"], [ AS_IF([test "${plugin_support}" != "no"], [ AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins) ]) - AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"]) dnl Temporary(?) hack for plugins/builtins transition -VLC_ADD_PLUGINS([${BUILTINS}]) -BUILTINS="" +dnl VLC_ADD_PLUGIN([${BUILTINS}]) +dnl BUILTINS="" dnl dnl Pic and shared libvlc stuff dnl AS_IF([test "${SYS}" = "mingw32"], [ FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll" + FILE_LIBVLC_CONTROL_DLL="!define LIBVLC_CONTROL_DLL libvlc-control.dll" ]) dnl dnl Stuff used by the program dnl AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string]) -AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2007 the VideoLAN team", [Copyright string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) ${COPYRIGHT_YEARS} the VideoLAN team", [Copyright string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years]) AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number]) @@ -5984,23 +6309,21 @@ AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_REVISION) AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) -AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure]) +if test "${build_os}" = "cygwin" +then + AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure]) +else + AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s`", [host which ran configure]) +fi AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) -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}" -AC_SUBST(VLC_ENTRY) - dnl dnl Handle substvars that use $(top_srcdir) dnl VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config" AC_SUBST(VLC_CONFIG) -CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include" +CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include -I\$(top_builddir)/include" dnl dnl Restore *FLAGS @@ -6027,33 +6350,30 @@ AC_SUBST(MOZILLA_SDK_PATH) AC_SUBST(WINE_SDK_PATH) AC_SUBST(LIBEXT) AC_SUBST(AM_CPPFLAGS) -AC_SUBST(ALL_LINGUAS) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(FILE_LIBVLC_DLL) +AC_SUBST(FILE_LIBVLC_CONTROL_DLL) dnl Create vlc-config.in VLC_OUTPUT_VLC_CONFIG_IN AC_CONFIG_FILES([ - vlc.win32.nsi + extras/package/win32/vlc.win32.nsi Makefile - activex/Makefile - activex/axvlc.inf - bindings/Makefile - bindings/java/Makefile - bindings/java/src/Makefile + projects/activex/Makefile + projects/activex/axvlc.inf bindings/python/Makefile doc/Makefile - intl/Makefile - ipkg/Makefile + extras/package/ipkg/Makefile libs/loader/Makefile libs/srtp/Makefile modules/Makefile - mozilla/Makefile + projects/mozilla/Makefile m4/Makefile po/Makefile.in share/Makefile src/Makefile + test/Makefile ]) AC_CONFIG_FILES([ @@ -6064,6 +6384,8 @@ AC_CONFIG_FILES([ modules/access/mms/Makefile modules/access/cdda/Makefile modules/access/rtsp/Makefile + modules/access/rtmp/Makefile + modules/access/v4l2/Makefile modules/access/vcd/Makefile modules/access/vcdx/Makefile modules/access/screen/Makefile @@ -6109,6 +6431,7 @@ AC_CONFIG_FILES([ modules/misc/notify/Makefile modules/misc/testsuite/Makefile modules/misc/playlist/Makefile + modules/misc/osd/Makefile modules/misc/xml/Makefile modules/misc/probe/Makefile modules/mux/Makefile @@ -6120,6 +6443,8 @@ AC_CONFIG_FILES([ modules/stream_out/transrate/Makefile modules/video_chroma/Makefile modules/video_filter/Makefile + modules/video_filter/atmo/Makefile + modules/video_filter/dynamicoverlay/Makefile modules/video_output/Makefile modules/video_output/msw/Makefile modules/video_output/qte/Makefile @@ -6146,15 +6471,20 @@ dnl for a in `./vlc-config --target plugin` ; do echo $a; done | sed -e 's,modul dnl Shortcut to nice compile message rm -f compile echo '#! /bin/sh' >compile - -echo "PATH=$PATH LANG=C make \$@ 2>&1| \\" >> compile -echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/make.pl' >> compile +echo rm -f .error\$\$ >>compile +echo ERROR=0 >>compile +echo export PATH=$PATH LANG=C >>compile +echo "(make \$@ 2>&1 || touch .error\$\$)| \\" >>compile +echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >>compile +echo test -f .error\$\$ \&\& ERROR=1 >>compile +echo rm -f .error\$\$ >>compile +echo exit \$ERROR >>compile chmod a+x compile printf " -vlc configuration +libvlc configuration -------------------- -vlc version : ${VERSION} +version : ${VERSION} system : ${SYS} architecture : ${ARCH} build flavour : " @@ -6163,13 +6493,24 @@ test "${enable_cprof}" = "yes" && printf "cprof " test "${enable_gprof}" = "yes" && printf "gprof " test "${enable_optimizations}" = "yes" && printf "optim " test "${enable_release}" = "yes" && printf "release " || printf "devel " -echo " -vlc aliases :${ALIASES} -plugins/bindings :${PLUGINS_BINDINGS} +echo "" +if test "${enable_vlc}" != "no"; then +echo "vlc aliases :${ALIASES}" +else +echo "build vlc executable : no" +fi +echo "plugins/bindings :${PLUGINS_BINDINGS} You can check which modules have been enabled with \`./vlc-config --list plugin'. You can tune the compiler flags in vlc-config. To build vlc and its plugins, type \`./compile' or \`make'. " - +if test "x$ac_ld_does_not_support_text_reloc" = "xyes"; then + echo "" + echo "Warning: Due to a bug in ld, mmx/sse support has been" + echo " turned off." + echo " FFmpeg will be REALLY slow." + echo " VLC WILL NOT PERFORM AS EXPECTED." + echo "" +fi