enable_xvideo="no"
echo " Assuming --disable-xvideo"
- enable_libtool="no"
- echo " Assuming --disable-libtool"
- echo ""
fi
;;
*mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
AC_CHECK_TOOL(WINDRES, windres, :)
- enable_libtool="no"
case "${host_os}" in
*mingw32*)
if test "${SYS}" = "mingw32"; then
# add ws2_32 for closesocket, select, recv
- CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
VLC_ADD_LDFLAGS([libvlc],[-lws2_32 -lnetapi32 -lwinmm])
- VLC_ADD_LDFLAGS([vlc activex mozilla],[-mwindows])
- VLC_ADD_LDFLAGS([cdda vcdx cddax],[-lwinmm])
- VLC_ADD_LDFLAGS([access_http access_mms access_udp access_tcp access_ftp access_output_udp sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync growl flac ts audioscrobbler],[-lws2_32])
+ 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])
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
- CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
VLC_ADD_CPPFLAGS([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])
dnl It's very bad, but our former custom system was worst
dnl -- Courmisch
dnl
+
+dnl override platform specific check for dependent libraries
+dnl otherwise libtool linking of shared libraries will
+dnl fail on anything other than pass_all.
+AC_CACHE_VAL(lt_cv_deplibs_check_method,
+ [lt_cv_deplibs_check_method=pass_all])
+
AC_DISABLE_STATIC
AC_LIBTOOL_DLOPEN
-dnl AC_LIBTOOL_WIN32_DLL - couldn't get libtool to work on Win32 so far
+AC_LIBTOOL_WIN32_DLL
m4_undefine([AC_PROG_F77])
m4_defun([AC_PROG_F77],[])
AC_PROG_LIBTOOL
-AC_ARG_ENABLE(libtool,
- [ --enable-libtool use libtool (default enabled)])
-AS_IF([test "x{enable_libtool}" = "xno"], [
- AC_MSG_WARN([Disabling libtool is strongly discouraged. There are known bugs.])
-])
-AM_CONDITIONAL(USE_LIBTOOL, [test "x${enable_libtool}" != "xno"] )
+m4_undefine([AC_DEPLIBS_CHECK_METHOD])
+m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
+
+lt_cv_deplibs_check_method=pass_all
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.11.5)
+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"
- AS_IF([test "${enable_libtool}" != "no"], [
- INCLUDED_LIBINTL="${LTLIBINTL}"
- ],[
- INCLUDED_LIBINTL="${LIBINTL}"
- ])
], [
- AS_IF([test "${enable_libtool}" != "no"], [
- VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}])
- ], [
- VLC_ADD_LDFLAGS([libvlc vlc], [${LIBINTL}])
- ])
+ VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}])
])
-AC_SUBST(INCLUDED_LIBINTL)
dnl
dnl Iconv stuff
dnl
-if test "${SYS}" != "mingwce"; then
AS_IF([test "$am_cv_func_iconv" != "yes"],
[AC_MSG_ERROR([libiconv is needed for VLC to work properly])])
-fi
VLC_ADD_CFLAGS([libvlc],[${INCICONV}])
-AS_IF([test "${enable_libtool}" != "no"], [
- VLC_ADD_LDFLAGS([libvlc vlc],[${LIBICONV}])
-],[
- VLC_ADD_LDFLAGS([libvlc vlc],[${LTLIBICONV}])
-])
+VLC_ADD_LDFLAGS([libvlc],[${LTLIBICONV}])
dnl Check for the need to include the mingwex lib for mingw32
if test "${SYS}" = "mingw32"
VLC_SYMBOL_PREFIX
AC_SUBST(SYMPREF)
-AS_IF([test "${enable_libtool}" = "no"], [
-case "${SYS}" in
- mingw32|cygwin)
- VLC_ADD_CFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special}])
- VLC_ADD_CXXFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special} ${CXXFLAGS_mingw32_special}])
- VLC_ADD_OBJCFLAGS([pic plugin mozilla activex],[${CFLAGS_mingw32_special}])
- ;;
- mingwce)
- ;;
- *)
- VLC_ADD_CFLAGS([pic plugin mozilla],[-fpic -fPIC])
- VLC_ADD_CXXFLAGS([pic plugin mozilla],[-fpic -fPIC])
- VLC_ADD_OBJCFLAGS([pic plugin mozilla],[-fpic -fPIC])
- VLC_ADD_LDFLAGS([plugin mozilla],[-fpic -fPIC])
- ;;
-esac
-])
-
dnl The -DSYS_FOO flag
CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"; CPPFLAGS="${CPPFLAGS_save}"
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],[-lm])
+ VLC_ADD_LDFLAGS([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 param_eq libvlc vorbis freetype mod mpc dmo quicktime realaudio galaktos opengl],[-lm])
AC_MSG_RESULT(no)])
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)
+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])
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
VLC_ADD_CFLAGS([libvlc plugin],[-fvisibility=hidden])
fi
+AM_CONDITIONAL(HAVE_COMPILER_EXPORT, [test "$SYS" = "mingw32" -o "${ac_cv_c_visibility_hidden}" != "no"])
+
dnl Check for -fvisibility-inlines-hidden (breaks x86_64 linkers)
dnl AC_LANG_PUSH(C++)
dnl AC_CACHE_CHECK([if \$CXX accepts -fvisibility-inlines-hidden],
dnl AC_LANG_POP(C++)
dnl Check for -mdynamic-no-pic
-AC_CACHE_CHECK([if \$CC accepts -mdynamic-no-pic],
- [ac_cv_c_dynamic_no_pic],
- [CFLAGS="${CFLAGS_save} -mdynamic-no-pic"
- AC_TRY_COMPILE([],,ac_cv_c_dynamic_no_pic=yes, ac_cv_c_dynamic_no_pic=no)])
-AS_IF([test "${enable_libtool}" = "no" && test "${ac_cv_c_dynamic_no_pic}" != "no"], [
- VLC_ADD_CFLAGS([builtin],[-mdynamic-no-pic])
- VLC_ADD_CFLAGS([libvlc],[-mdynamic-no-pic])
-])
+dnl AC_CACHE_CHECK([if \$CC accepts -mdynamic-no-pic],
+dnl [ac_cv_c_dynamic_no_pic],
+dnl [CFLAGS="${CFLAGS_save} -mdynamic-no-pic"
+dnl AC_TRY_COMPILE([],,ac_cv_c_dynamic_no_pic=yes, ac_cv_c_dynamic_no_pic=no)])
+dnl AS_IF([test "${ac_cv_c_dynamic_no_pic}" != "no"], [
+dnl VLC_ADD_CFLAGS([builtin],[-mdynamic-no-pic])
+dnl VLC_ADD_CFLAGS([libvlc],[-mdynamic-no-pic])
+dnl ])
dnl Check for Darwin plugin linking flags
AC_CACHE_CHECK([if \$CC accepts -bundle -undefined error],
dnl Check for standard plugin linking flags
dnl BeOS' gcc needs -nostart instead of -shared, even if -shared isn't harmful (just a warning)
-AS_IF([test "${enable_libtool}" = "no"], [
- AS_IF([test "${SYS}" = "beos"], [
- VLC_ADD_LDFLAGS([plugin mozilla],[-nostart])
- ], [
- AC_CACHE_CHECK([if \$CC accepts -shared],
- [ac_cv_ld_plugins],
- [CFLAGS="${CFLAGS_save} -shared"
- AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
- AS_IF([test "${ac_cv_ld_plugins}" != "no"], [
- VLC_ADD_LDFLAGS([plugin mozilla],[-shared])
- ])
- ])
-])
+dnl AS_IF([test "${SYS}" = "beos"], [
+dnl VLC_ADD_LDFLAGS([plugin mozilla],[-nostart])
+dnl ], [
+dnl AC_CACHE_CHECK([if \$CC accepts -shared],
+dnl [ac_cv_ld_plugins],
+dnl [CFLAGS="${CFLAGS_save} -shared"
+dnl AC_TRY_COMPILE([],, ac_cv_ld_plugins=yes, ac_cv_ld_plugins=no)])
+dnl AS_IF([test "${ac_cv_ld_plugins}" != "no"], [
+dnl VLC_ADD_LDFLAGS([plugin mozilla],[-shared])
+dnl ])
+dnl ])
dnl Check for variadic macros
AC_CACHE_CHECK([for variadic cpp macros],
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 dvbsub mpeg_audio lpcm a52 dts cinepak flac])
-VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise extract sharpen])
+VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen])
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
])
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([luaplaylist luameta])
+ VLC_ADD_LDFLAGS([luaplaylist luameta],[$LUA_LIBS])
+ VLC_ADD_CFLAGS([luaplaylist luameta],[$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)])
])
if test "${with_videodev2}" != "no" -a -n "${with_videodev2}"
then
AC_DEFINE_UNQUOTED(VIDEODEV2_H_FILE, "${with_videodev2}", [Location of videodev2.h])
- else
- AC_DEFINE(VIDEODEV2_H_FILE, <linux/videodev2.h>, [Location of videodev2.h])
fi
AC_CACHE_CHECK([for new linux/videodev2.h],
[new_linux_videodev2_h],
- [AC_TRY_COMPILE([#include <sys/types.h>
- #include VIDEODEV2_H_FILE],
+ [AC_TRY_COMPILE([
+ #include <sys/types.h>
+ # ifdef VIDEODEV2_H_FILE
+ # include VIDEODEV2_H_FILE
+ # else
+ # include <linux/videodev2.h>
+ # endif
+ ],
[struct v4l2_ext_controls ctrls; ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG; ],
new_linux_videodev2_h=yes,
new_linux_videodev2_h=no)])
fi
else
AC_CHECK_HEADERS(FLAC/stream_decoder.h, [
- VLC_ADD_LDFLAGS([flac],[-lFLAC])
+ VLC_ADD_LDFLAGS([flac],[-lFLAC -logg])
],[])
fi
fi
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])])
AS_IF([test "${have_gnutls}" = "yes"], [
VLC_ADD_PLUGINS([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}])
+ ])
+ AC_CHECK_LIB([gcrypt], [gcry_control], [
+ VLC_ADD_LDFLAGS([gnutls], [-lgcrypt -lgpg-error])
+ ], [], [-lgpg-error])
VLC_ADD_LDFLAGS([gnutls], [$GNUTLS_LIBS])
], [
AS_IF([test "${enable_gnutls}" = "yes"], [
AC_MSG_ERROR([gnutls not present or too old (version 1.2.9 required)])
])
])
- AC_CHECK_LIB([gcrypt], [gcry_control], [
- VLC_ADD_LDFLAGS([gnutls], [-lgcrypt])
- ])
])
dnl
dnl latest gecko sdk does not have embedstring
if test -d "${real_mozilla_sdk}/embedstring/bin"
then
- VLC_ADD_LDFLAGS([mozilla],[-lembedstring -Wl,--kill-at])
+ VLC_ADD_LDFLAGS([mozilla],[-lembedstring])
fi
fi
fi
AC_LANG_POP(C++)
AM_CONDITIONAL(BUILD_MOZILLA,${mozilla})
-dnl Tests for Osso and Xsp
-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])
+ 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])
+ ])
])
-])
-AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
- VLC_ADD_CPPFLAGS([x11],[-DHAVE_XSP])
- VLC_ADD_LDFLAGS([x11],[-lXsp])
-])
+ AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[
+ VLC_ADD_CPPFLAGS([x11],[-DHAVE_XSP])
+ VLC_ADD_LDFLAGS([x11],[-lXsp])
+ ])
+fi
dnl
dnl Mediacontrol Python bindings
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([${plugin_support}], [
+AS_IF([test "${enable_shared}" = "no"], [
+ plugin_support=no
+])
+
+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
-AS_IF([test "${SYS}" = "mingw32" || test "${enable_libtool}" != "no"], [
- AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
- VLC_ADD_PLUGINS([${BUILTINS}])
- AS_IF([test "${SYS}" = "mingw32"], [
- FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"
- VLC_ADD_CPPFLAGS([libvlc],[-DDLL_EXPORT])
- ])
- BUILTINS=""
-], [
- LDFLAGS_vlc="${LDFLAGS_vlc} ${LDFLAGS_libvlc}"
- FILE_LIBVLC_DLL=""
+AS_IF([test "${SYS}" = "mingw32"], [
+ FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"
])
dnl
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