AC_TRY_COMPILE([],,ac_cv_c_omit_frame_pointer=yes, ac_cv_c_omit_frame_pointer=no)])
if test "${ac_cv_c_omit_frame_pointer}" != "no"; then
CFLAGS_OPTIM_NODEBUG="${CFLAGS_OPTIM_NODEBUG} -fomit-frame-pointer"
- # these plugins do not compile without -fomit-frame-pointer, damn gcc!
- VLC_ADD_CFLAGS([i420_yuy2_mmx i420_yuy2_sse2],[-fomit-frame-pointer])
fi
dnl Check for -fvisibility=hidden
VLC_ADD_PLUGINS([converter_fixed mono])
VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
-VLC_ADD_PLUGINS([playlist export sgimb nsc xtag])
-VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo magnify puzzle colorthres])
+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([converter_float a52tospdif dtstospdif audio_format])
fi
-dnl
-dnl Switch to enable a version of VLC where most modules will be builtin
-dnl
-AC_ARG_ENABLE(mostly-builtin,
-[ --enable-mostly-builtin most modules will be built-in (default disabled)])
-if test "${enable_mostly_builtin}" = "yes"; then
- VLC_ADD_BUILTINS([${PLUGINS}])
- PLUGINS=""
-fi
-
dnl
dnl Some plugins aren't useful on some platforms
dnl
#MMXEXT_MODULES="${MMXEXT_MODULES} idctmmxext motionmmxext"
THREEDNOW_MODULES="memcpy3dn"
SSE_MODULES=""
-SSE2_MODULES="i420_rgb_sse2 i420_yuy2_sse2"
+SSE2_MODULES="i420_rgb_sse2 i420_yuy2_sse2 i422_yuy2_sse2"
ALTIVEC_MODULES="memcpyaltivec i420_yuy2_altivec"
#ALTIVEC_MODULES="${ALTIVEC_MODULES} idctaltivec motionaltivec"
[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([i420_rgb_mmx],[-mmmx])
+ VLC_ADD_CFLAGS([${MMX_MODULES}],[-mmmx])
fi
dnl Check for fully workin SSE2 intrinsics
[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([i420_rgb_sse2],[-msse2])
+ VLC_ADD_CFLAGS([${SSE2_MODULES}],[-msse2])
fi
AC_CACHE_CHECK([if \$CC groks MMX inline assembly],
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_BUILTINS([${ACCEL_MODULES}])
+ VLC_ADD_PLUGINS([${ACCEL_MODULES}])
fi
if test "${host_cpu}" = "i686" -o "${host_cpu}" = "x86_64"
then
ARCH="${ARCH} sse sse2"
- VLC_ADD_BUILTINS([${ACCEL_MODULES}])
+ VLC_ADD_PLUGINS([${ACCEL_MODULES}])
fi
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_BUILTINS([${ACCEL_MODULES}]) fi ],
+ VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ],
[ if test "${host_cpu}" = "powerpc"; then ARCH="${ARCH} altivec";
- VLC_ADD_BUILTINS([${ACCEL_MODULES}]) fi ])
+ VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ])
dnl
dnl Debugging mode
[AC_MSG_WARN(libshout library not found)])
fi
-dnl Lua playlist demux
-AC_ARG_ENABLE(luaplaylist,
- [ --enable-lua lua playlist demux plugin (default enabled)])
+dnl Lua modules
+AC_ARG_ENABLE(lua,
+ [ --enable-lua lua playlist and metafetcher plugins (default enabled)])
if test "${enable_lua}" != "no"
then
PKG_CHECK_MODULES(LUA, lua5.1,
])
if test "x${have_lua}" = "xyes" ; then
AC_DEFINE(HAVE_LUA, [], [Define if you have the lua library])
- VLC_ADD_PLUGINS([luaplaylist])
- VLC_ADD_LDFLAGS([luaplaylist],[$LUA_LIBS])
- VLC_ADD_CFLAGS([luaplaylist],[$LUA_CFLAGS])
+ VLC_ADD_PLUGINS([lua])
+ VLC_ADD_LDFLAGS([lua],[$LUA_LIBS])
+ VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS])
fi
fi
dnl Taglibplugin
dnl
AC_ARG_ENABLE(taglib,
- [ --enable-taglib Taglib support (default disabled) ])
- AS_IF([test "${enable_taglib}" = "yes"],[
+ [ --disable-taglib Taglib support (default enabled) ])
+ AS_IF([test "${enable_taglib}" != "no"],[
PKG_CHECK_MODULES(TAGLIB, taglib,
- [ VLC_ADD_PLUGINS([taglib])
- VLC_ADD_LDFLAGS([taglib],[$TAGLIB_LIBS])
+ [ 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_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ],
[AC_MSG_WARN(TagLib library not found)])
])
dnl
dnl libid3tag support (FIXME!!! doesn't work with new input)
dnl
-AC_CHECK_HEADERS(id3tag.h, [
- AC_CHECK_HEADERS(zlib.h, [
- VLC_ADD_LDFLAGS([id3tag],[-lid3tag -lz])
- VLC_ADD_PLUGINS([id3tag])]) ])
+AC_ARG_ENABLE( id3tag,
+ [ --disable-id3tag id3tag metadata reader plugin (default enabled)])
+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])
+ ])
+ ])
+])
dnl
dnl ffmpeg decoder/demuxer plugin
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
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
[VLC_ADD_CFLAGS([freetype],[-DHAVE_FONTCONFIG])
VLC_ADD_LDFLAGS([freetype],[-lfontconfig])])
dnl
dnl DirectFB module
+dnl try to find using: 1 - given location; 2 - directfb-config; 3 - pkg-config
+dnl TODO: support for static linking
dnl
AC_ARG_ENABLE(directfb,
[ --enable-directfb DirectFB support (default disabled)])
-if test "${enable_directfb}" = "yes"
-then
- if test "${with_directfb}" = "no"
- then
- AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false")
- if test "${have_directfb}"= "true"
- then
+AC_ARG_WITH(directfb,
+ [ --with-directfb=PATH path to DirectFB headers and libraries])
+
+if test "${enable_directfb}" = "yes"; then
+ have_directfb="false"
+ CPPFLAGS_mydirectfb=
+ LDFLAGS_mydirectfb=
+ if test "${with_directfb}" != "no" -a -n "${with_directfb}"; then
+ dnl Trying the given location
+ CPPFLAGS_save=${CPPFLAGS}
+ LDFLAGS_save=${LDFLAGS}
+
+ 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/"
+
+ CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_new}"
+ LDFLAGS="${LD_FLAGS} ${LDFLAGS_new}"
+
+ dnl FIXME: too obscure
+ AC_CHECK_HEADER([directfb.h], [
+ AC_CHECK_LIB([direct],[direct_initialize], [
+ AC_CHECK_LIB([fusion], [fusion_enter], [
+ AC_CHECK_LIB([directfb], [DirectFBInit], have_directfb="true", have_directfb="false")
+ ], have_directfb="false")
+ ], have_directfb="false")
+ ], have_directfb="false")
+
+ dnl Restore flags
+ CPPFLAGS="${CPPFLAGS_save}"
+ LDFLAGS="${LDFLAGS_save}"
+
+ if test "${have_directfb}" = "true"; then
+ LDFLAGS_mydirectfb="${LDFLAGS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread"
+ CPPFLAGS_mydirectfb="${CPPFLAGS_new}"
+ fi
+ else
+ dnl Look for directfb-config
+ 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`"
+ have_directfb="true"
+ else
+ dnl Trying with pkg-config
+ PKG_CHECK_MODULES(DIRECTFB, directfb, [
+ CPPFLAGS_mydirectfb="${DIRECTFB_CFLAGS}"
+ LDFLAGS_mydirectfb="${DIRECTFB_LIBS}"
+ have_directfb="true"
+ ], [have_directfb="false"])
+ fi
+ fi
+ if test "${have_directfb}" = "true"; then
VLC_ADD_PLUGINS([directfb])
- VLC_ADD_LDFLAGS([directfb],[-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl])
- VLC_ADD_CPPFLAGS([directfb],[-I/usr/include/directfb -D_REENTRANT])
- else
- AC_MSG_ERROR([cannot find /usr/include/directfb headers, make sure directfb is installed on your system or use --disable-directfb])
+ VLC_ADD_CPPFLAGS([directfb],[${CPPFLAGS_mydirectfb}])
+ VLC_ADD_LDFLAGS([directfb],[${LDFLAGS_mydirectfb}])
+ else
+ AC_MSG_ERROR([cannot find directfb headers and/or libraries ])
fi
- else
- CPPFLAGS_save="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} -I${with_directfb}/include"
- AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false")
- CPPFLAGS="${CPPFLAGS_save}"
- AC_ARG_WITH(directfb,
- [ --with-directfb=PATH path to directfb],
- [ if test "${with_directfb}" != "no" -a -n "${with_directfb}"
- then
- VLC_ADD_PLUGINS([directfb])
- VLC_ADD_CPPFLAGS([directfb],[-I${with_directfb}/include -D_REENTRANT])
- VLC_ADD_LDFLAGS([directfb],[-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl])
- fi ],
- [ AC_MSG_ERROR([cannot find directfb headers in ${with_directfb}/include]) ])
- fi
fi
+
+
dnl
dnl GGI module
VLC_ADD_LDFLAGS([test3],[-lobjc])
VLC_ADD_PLUGINS([${TESTS}])
- #VLC_ADD_BUILTINS([${TESTS}])
fi
dnl
dnl
dnl Plugin and builtin checks
dnl
-builtin_support=false
-plugin_support=:
-
-dnl Support for plugins - this must be AT THE END
-AC_ARG_ENABLE(plugins,
- [ --disable-plugins make all plugins built-in (default plugins enabled)],
- [if test "${enable_plugins}" = "no"
- then
- plugin_support=false
- fi])
+plugin_support=yes
dnl Automagically disable plugins if there is no system support for
dnl dynamically loadable files (.so, .dll, .dylib).
dnl don't forget vlc-win32 still can load .dll as plugins
-if test "${ac_cv_have_plugins}" = "no"
-then
- echo "*** Your system doesn't have plugin support. All plugins will be built"
- echo "statically."
- plugin_support=false
-fi
+AS_IF([test "${ac_cv_have_plugins}" = "no"], [
+ AC_MSG_WARN([*** No plugin support! Building statically! ***])
+ plugin_support=no
+])
+
+AS_IF([test "${enable_shared}" = "no"], [
+ plugin_support=no
+])
-AS_IF([${plugin_support}], [
+AS_IF([test "${plugin_support}" != "no"], [
AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins)
-], [
- VLC_ADD_BUILTINS([${PLUGINS}])
- PLUGINS=""
])
+AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"])
+
+dnl Temporary(?) hack for plugins/builtins transition
+VLC_ADD_PLUGINS([${BUILTINS}])
+BUILTINS=""
+
dnl
dnl Pic and shared libvlc stuff
dnl
-VLC_ADD_PLUGINS([${BUILTINS}])
AS_IF([test "${SYS}" = "mingw32"], [
FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"
])
-BUILTINS=""
dnl
dnl Stuff used by the program
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 Old definitions for version-dependant plugins
-dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`"
-dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions])
-dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
-
dnl New definitions with value matching 0.9.0 release
module_symbol="0_9_0b"
AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])
modules/codec/cmml/Makefile
modules/codec/dmo/Makefile
modules/codec/ffmpeg/Makefile
+ modules/codec/subtitles/Makefile
modules/codec/spudec/Makefile
modules/codec/xvmc/Makefile
modules/control/Makefile
modules/meta_engine/Makefile
modules/misc/Makefile
modules/misc/dummy/Makefile
+ modules/misc/lua/Makefile
modules/misc/memcpy/Makefile
modules/misc/notify/Makefile
modules/misc/testsuite/Makefile
projects / vlc / blobdiff