X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=4f20abedc868ddbfdacc53be1729d0acd462179b;hb=4189e7a558bc9380d2aa6df4789607f626092e6e;hp=418c230f9b36a74a0cf1b084e46b5d8312d3bf10;hpb=13aa82b7cd03e8d45b9675551123222573663d47;p=vlc diff --git a/configure.ac b/configure.ac index 418c230f9b..4f20abedc8 100644 --- a/configure.ac +++ b/configure.ac @@ -320,8 +320,8 @@ case "${host_os}" in *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) - AC_DEFINE([_WIN32_WINNT], 0x0600, [Define to '0x0600' for Windows Vista APIs.]) - AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01 (and shell) APIs.]) + AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows XP SP2 APIs.]) + AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.]) case "${host_os}" in *wince* | *mingwce* | *mingw32ce*) @@ -452,20 +452,16 @@ 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 -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.]) ]) @@ -474,14 +470,11 @@ 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"], [ @@ -569,8 +562,8 @@ need_libc=false dnl Check for usual libc functions AC_CHECK_DECLS([nanosleep],,,[#include ]) -AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale]) -AC_REPLACE_FUNCS([asprintf atof atoll dirfd flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) +AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale]) +AC_REPLACE_FUNCS([asprintf atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) @@ -619,7 +612,7 @@ AC_SEARCH_LIBS(connect, [socket], [ ]) 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) @@ -683,7 +676,7 @@ AC_CHECK_FUNC(getopt_long,, [ 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="" @@ -696,50 +689,38 @@ AC_CHECK_LIB(m,lrintf, [ ]) 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 - -# WinCE style -if test "${ac_cv_have_plugins}" = "no"; then - if test "${SYS}" = "mingwce"; then - ac_cv_have_plugins=yes - fi -fi - -# 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" - ]) - ]) +have_dynamic_objects="no" +LIBS_save="$LIBS" +AC_SEARCH_LIBS(dlopen, [dl svld], [ + AS_IF([test "$ac_cv_search_dlopen" != "none required"], [ + LIBDL="$ac_cv_search_dlopen" ]) - 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 + have_dynamic_objects="yes" +]) +LIBS="$LIBS_save" + +# Windows +AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ + LIBDL="" + have_dynamic_objects="yes" #assume we can use shared objects +]) + +test "${enable_shared}" = "no" && have_dynamic_objects=no + +AS_IF([test "${have_dynamic_objects}" != "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="" +]) +AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"]) + 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 @@ -846,14 +827,12 @@ then 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" ]) @@ -2152,6 +2131,21 @@ then fi fi +dnl +dnl Linux DVB +dnl +AC_CACHE_CHECK([for Linux DVB version 5], [ac_cv_linux_s2api], [ + AC_PREPROC_IFELSE([AC_LANG_PROGRAM([ +[#include +#if (DVB_API_VERSION < 5) +EXPLODE +#endif]])], [ + ac_cv_linux_s2api=yes +], [ + ac_cv_linux_s2api=no +])]) +AM_CONDITIONAL([HAVE_LINUX_DVB], [test "$ac_cv_linux_s2api" = "yes"]) + dnl dnl libdvbpsi check for ts mux/demux dnl @@ -4201,8 +4195,8 @@ AC_ARG_ENABLE(loader, 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]) ]) @@ -4217,23 +4211,6 @@ AC_ARG_ENABLE(vlc, 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 @@ -4302,9 +4279,6 @@ AC_SUBST(FILE_LIBVLC_DLL) AC_CONFIG_FILES([ Makefile doc/Makefile - libs/loader/Makefile - libs/srtp/Makefile - libs/unzip/Makefile modules/Makefile m4/Makefile po/Makefile.in @@ -4312,6 +4286,7 @@ AC_CONFIG_FILES([ compat/Makefile src/Makefile src/test/Makefile + lib/Makefile bin/Makefile test/Makefile modules/access/Makefile @@ -4324,6 +4299,7 @@ AC_CONFIG_FILES([ 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 @@ -4331,6 +4307,7 @@ AC_CONFIG_FILES([ 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