AC_CACHE_VAL(lt_cv_deplibs_check_method,
[lt_cv_deplibs_check_method=pass_all])
-AC_DISABLE_STATIC
-dnl AC_DISABLE_FAST_INSTALL
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
-m4_undefine([AC_PROG_F77])
-m4_defun([AC_PROG_F77],[])
-AC_PROG_LIBTOOL
+LT_INIT([dlopen win32-dll shared disable-static])
+LT_LANG([C++])
+LT_LANG([Windows Resource])
m4_undefine([AC_DEPLIBS_CHECK_METHOD])
m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
lt_cv_deplibs_check_method=pass_all
-AS_IF([test "${enable_shared}" = "no"], [
+AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [
AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.])
])
+AM_CONDITIONAL(HAVE_SHARED_PLUGINS, [test "${enable_shared}" != "no"])
+
dnl
dnl Gettext stuff
dnl
AM_GNU_GETTEXT_VERSION([0.18.1])
AM_GNU_GETTEXT([external])
-VLC_ADD_LIBS([libvlccore vlc], [${LTLIBINTL}])
dnl
dnl Iconv stuff
dnl
AM_ICONV
-VLC_ADD_CFLAGS([libvlccore],[${INCICONV}])
-VLC_ADD_LIBS([libvlccore],[${LTLIBICONV}])
dnl Check for broken versions of mingw-runtime compatability library
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
])
LIBS="$LIBS_save"
AS_IF([test -n "$SOCKET_LIBS"], [
- VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[${SOCKET_LIBS}])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[${SOCKET_LIBS}])
])
AC_SUBST(SOCKET_LIBS)
AC_SUBST(GNUGETOPT_LIBS)
AC_CHECK_LIB(m,cos,[
- VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate libvlccore freetype mod mpc dmo quicktime realvideo qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264],[-lm])
+ VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mod mpc dmo quicktime realvideo qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264],[-lm])
LIBM="-lm"
], [
LIBM=""
])
dnl Check for dynamic plugins
-ac_cv_have_plugins=no
-
-# Win32 style
-if test "${ac_cv_have_plugins}" = "no"; then
- if test "${SYS}" = "mingw32" ; then
- AC_CHECK_LIB(kernel32, main,
- [VLC_ADD_LIBS([libvlccore],[-lkernel32])
- ac_cv_have_plugins=yes])
- fi
-fi
+LIBDL="no"
+LIBS_save="$LIBS"
+AC_SEARCH_LIBS(dlopen, [dl svld], [
+ AS_IF([test "$ac_cv_search_dlopen" != "none required"], [
+ LIBDL="$ac_cv_search_dlopen"
+ ])
+])
+LIBS="$LIBS_save"
-# WinCE style
-if test "${ac_cv_have_plugins}" = "no"; then
- if test "${SYS}" = "mingwce"; then
- ac_cv_have_plugins=yes
- fi
-fi
+# Windows
+AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
+ LIBDL=""
+])
-# Only test for dlopen() if the others didn't work
-LIBDL=""
-if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then
- AC_CHECK_HEADERS(dlfcn.h sys/dl.h)
- ac_cv_my_have_dlopen=no
- AC_CHECK_FUNC(dlopen, [
- ac_cv_my_have_dlopen=yes
- ], [
- AC_CHECK_LIB(dl, dlopen, [
- ac_cv_my_have_dlopen=yes
- LIBDL="-ldl"
- ], [
- AC_CHECK_LIB(svld, dlopen, [
- ac_cv_my_have_dlopen=yes
- LIBDL="-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
- VLC_ADD_LIBS([libvlccore realvideo lua],[$LIBDL])
- fi
-fi
+AS_IF([test "$LIBDL" != "no"], [
+ AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1,
+ [Define to 1 if dynamic plugins are supported.])
+], [
+ dnl Clear $LIBDL so as not to break linking
+ LIBDL=""
+])
AC_SUBST(LIBDL)
+VLC_ADD_LIBS([realvideo lua],[$LIBDL])
+dnl Check for thread library
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
dnl Check for pthreads - borrowed from XMMS
THREAD_LIB=error
MINIZIP_LIBS="-lminizip -lz"
], [
have_minizip=no
- MINIZIP_CFLAGS="-I\\\${top_srcdir}/libs/unzip"
- MINIZIP_LIBS="\\\${top_builddir}/libs/unzip/libunzip.la"
+ MINIZIP_CFLAGS="-I\\\${top_srcdir}/modules/access/zip/unzip"
+ MINIZIP_LIBS="\\\${top_builddir}/modules/access/zip/unzip/libunzip.la"
])
])
VLC_ADD_CPPFLAGS([skins2],[$MINIZIP_CFLAGS])
- VLC_ADD_CFLAGS([zip],[$MINIZIP_CFLAGS])
- VLC_ADD_LIBS([skins2 zip],[$MINIZIP_LIBS])
- VLC_ADD_PLUGIN([unzip zip])
+ VLC_ADD_LIBS([skins2],[$MINIZIP_LIBS])
fi
AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
AS_IF([test "${enable_loader}" = "yes"],
[ VLC_ADD_PLUGIN([dmo])
- VLC_ADD_CPPFLAGS([dmo quicktime realvideo],[-I\\\${top_srcdir}/libs/loader])
- VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/libs/loader/libloader.la])
+ VLC_ADD_CPPFLAGS([dmo quicktime realvideo],[-I\\\${top_srcdir}/modules/codec/loader])
+ VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/modules/codec/loader/libloader.la])
VLC_ADD_CPPFLAGS([realvideo], [-DLOADER])
VLC_ADD_LIBS([dmo quicktime], [-lpthread])
])
AM_CONDITIONAL(BUILD_VLC, [test "${enable_vlc}" != "no"])
-dnl
-dnl Plugin and builtin checks
-dnl
-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
-AS_IF([test "${ac_cv_have_plugins}" = "no"], [
- AC_MSG_WARN([*** No plugin support! Building statically! ***])
- plugin_support=no
-])
-
-AS_IF([test "${plugin_support}" != "no"], [
- AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, [Define if dynamic plugins are supported])
-])
-
dnl
dnl Pic and shared libvlc stuff
dnl
AC_CONFIG_FILES([
Makefile
doc/Makefile
- libs/loader/Makefile
- libs/srtp/Makefile
- libs/unzip/Makefile
modules/Makefile
m4/Makefile
po/Makefile.in
compat/Makefile
src/Makefile
src/test/Makefile
+ lib/Makefile
bin/Makefile
test/Makefile
modules/access/Makefile
modules/access/vcdx/Makefile
modules/access/screen/Makefile
modules/access/zip/Makefile
+ modules/access/zip/unzip/Makefile
modules/access_output/Makefile
modules/audio_filter/Makefile
modules/audio_mixer/Makefile
modules/codec/Makefile
modules/codec/avcodec/Makefile
modules/codec/dmo/Makefile
+ modules/codec/loader/Makefile
modules/codec/omxil/Makefile
modules/codec/shine/Makefile
modules/codec/spudec/Makefile
projects / vlc / blobdiff