X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=781db98319bb00323cbcaedc13c37f45ffaf8c01;hb=b00db8ce608789faa8e37b48ead95f99a34ae13a;hp=f2b777f601f0de667e43cb8a6e362ccc4569f20c;hpb=0d648eeea4101aa92f7b02d6ad114c6d086c9f82;p=vlc diff --git a/configure.ac b/configure.ac index f2b777f601..781db98319 100644 --- a/configure.ac +++ b/configure.ac @@ -239,11 +239,11 @@ case "${host_os}" in CPPFLAGS_save="${CPPFLAGS_save} ${ARCH_flag}"; CPPFLAGS="${CPPFLAGS_save}" OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"; OBJCFLAGS="${OBJCFLAGS_save}" LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names ${ARCH_flag}"; LDFLAGS="${LDFLAGS_save}" - VLC_ADD_LDFLAGS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation]) - VLC_ADD_LDFLAGS([libvlc vlc],[-Wl,-undefined,dynamic_lookup]) - VLC_ADD_LDFLAGS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress]) + VLC_ADD_LIBS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation]) + VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup]) + VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress]) VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings]) - VLC_ADD_LDFLAGS([libvlccore],[-Wl,-framework,CoreFoundation]) + VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation]) AC_ARG_ENABLE(macosx-defaults, AS_HELP_STRING([--enable-macosx-defaults],[Build the default configuration on Mac OS X (default enabled)])) if test "x${enable_macosx_defaults}" != "xno" @@ -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], 0x0501, [Define to '0x0501' for Windows XP 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*) @@ -343,13 +343,10 @@ case "${host_os}" in esac if test "${SYS}" = "mingw32"; then - # add ws2_32 for closesocket, select, recv - VLC_ADD_LIBS([libvlccore],[-lws2_32 -lnetapi32 -lwinmm]) + VLC_ADD_LIBS([libvlccore],[-lnetapi32 -lwinmm]) VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([win32text],[-lgdi32]) VLC_ADD_LIBS([cdda vcdx sdl_image vout_sdl],[-lwinmm]) - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap stream_out_standard stream_out_select 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],[-lws2_32]) - VLC_ADD_LIBS([filesystem], [-lshlwapi]) dnl dnl DEP and ASLR options dnl @@ -379,8 +376,6 @@ case "${host_os}" in fi if test "${SYS}" = "mingwce"; then - # add ws2 for closesocket, select, recv - VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap netsync audioscrobbler growl rtp stream_out_standard stream_out_select stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2]) VLC_ADD_LIBS([libvlccore],[-lmmtimer]) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) ac_default_prefix="`pwd`/_wince" @@ -457,36 +452,31 @@ 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.]) ]) +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"], [ @@ -540,22 +530,6 @@ if test "${SYS}" = "mingw32" ; then CFLAGS="${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" fi -dnl Check for fvtable-thunks support for mingw32 -if test "${SYS}" = "mingw32" -a "${CXX}" != "" ; then - AC_LANG_PUSH(C++) - AC_CACHE_CHECK([if \$CXX accepts -fvtable-thunks], - [ac_cv_cxx_fvtable_thunks], - [CXXFLAGS="${CXXFLAGS_save} -Wall -Werror -fvtable-thunks" - AC_TRY_COMPILE([],,ac_cv_cxx_fvtable_thunks=yes, - ac_cv_cxx_fvtable_thunks=no)]) - if test "${ac_cv_cxx_fvtable_thunks}" = "yes"; then - CXXFLAGS_mingw32_special="-fvtable-thunks" - fi - - CXXFLAGS_save="${CXXFLAGS_save} ${CXXFLAGS_mingw32_special}"; CXXFLAGS="${CXXFLAGS_save}" - AC_LANG_POP(C++) -fi - dnl dnl Buggy glibc prevention. Purposedly not cached. dnl See sourceware.org bugs 5058 and 5443. @@ -585,9 +559,6 @@ dnl Plugin compilation stuff VLC_LIBRARY_SUFFIX -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 @@ -607,21 +578,45 @@ AC_CHECK_FUNCS([accept4 pipe2 eventfd vmsplice sched_getaffinity]) AH_BOTTOM([#include ]) -SOCKET_LIBS="" -AC_CHECK_FUNCS(connect,,[ - AC_CHECK_LIB(socket,connect,[ - VLC_ADD_LIBS([libvlccore cdda],-lsocket) - SOCKET_LIBS="-lsocket" +dnl Check for poll +AC_SEARCH_LIBS(poll, [poll], [ + AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS has poll().]) +], [ + AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ + AC_MSG_ERROR([poll() is required.]) ]) ]) -AC_SUBST(SOCKET_LIBS) -AC_CHECK_FUNCS(send,,[ - AC_CHECK_LIB(socket,send,[ - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp sap access_output_udp access_output_rtmp stream_out_standard growl_udp remoteosd netsync],[-lsocket]) - ]) +dnl Check for struct pollfd +AC_CHECK_TYPES([struct pollfd],,, +[#include +#if HAVE_POLL +# include +#elif defined (WIN32) +# include +#endif ]) +dnl Check for connect +LIBS_save="$LIBS" +SOCKET_LIBS="" +AC_SEARCH_LIBS(connect, [socket], [ + AS_IF([test "$ac_cv_search_connect" != "none required"], [ + SOCKET_LIBS="$ac_cv_search_connect" + ]) +], [ + AS_IF([test "${SYS}" = "mingw32"], [ + SOCKET_LIBS="-lws2_32" + ]) + AS_IF([test "${SYS}" = "mingwce"], [ + SOCKET_LIBS="-lws2" + ]) +]) +LIBS="$LIBS_save" +AS_IF([test -n "$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) dnl Check for socklen_t AH_TEMPLATE(socklen_t, [Define to `int' if does not define.]) @@ -667,26 +662,6 @@ LIBS_save="${LIBS}" AC_SEARCH_LIBS([getaddrinfo], [nsl],,, [${SOCKET_LIBS}]) LIBS="${LIBS_save}" -dnl Check for va_copy -AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy, - AC_TRY_LINK( - [#include ], - [va_list ap1, ap2; va_copy(ap1,ap2);], - [ac_cv_c_va_copy="yes"], - [ac_cv_c_va_copy="no"])) -if test "${ac_cv_c_va_copy}" = "yes"; then - AC_DEFINE(HAVE_VA_COPY, 1, [Define if defines va_copy.]) -fi -AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy, - AC_TRY_LINK( - [#include ], - [va_list ap1, ap2; __va_copy(ap1,ap2);], - [ac_cv_c___va_copy="yes"], - [ac_cv_c___va_copy="no"])) -if test "${ac_cv_c___va_copy}" = "yes"; then - AC_DEFINE(HAVE___VA_COPY, 1, [Define if defines __va_copy.]) -fi - AC_CHECK_FUNCS(inet_aton,,[ AC_CHECK_LIB(resolv,inet_aton,[ VLC_ADD_LIBS([libvlccore],[-lresolv]) @@ -703,7 +678,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 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="" @@ -716,52 +691,31 @@ 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_DEFINE(HAVE_DL_WINDOWS, 1, [Define if you have Windows' LoadLibrary]) - 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_DEFINE(HAVE_DL_WINDOWS, 1, [Define if you have Windows' LoadLibrary]) - 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 @@ -833,14 +787,6 @@ AC_CHECK_TYPE(ssize_t,, [ AC_DEFINE(ssize_t, int) ]) -dnl Check for poll -AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])], [ -if test ${SYS} != "mingw32" -a ${SYS} != "mingwce" -then - AC_MSG_WARN([Your platform does not support poll(). VLC has it's own poll() implementation, but it is only intended to be used on Windows. VLC might crash or be insecure when you see this message. Either switch to an OS with a proper poll() implementation, or implement one for your OS in VLC]) -fi -]) - dnl Check for threads library if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(pthread.h) @@ -876,14 +822,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" ]) @@ -1253,7 +1197,7 @@ elif test "${SYS}" != "mingwce"; then VLC_ADD_LIBS([dmo],[-lole32 -luuid]) fi if test "${SYS}" = "darwin"; then - VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,ApplicationServices]) + VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices]) fi dnl @@ -1584,7 +1528,7 @@ dnl - Others: test should fail LDFLAGS="${LDFLAGS_save}" ]) AS_IF([test "${ac_cv_ld_altivec}" != "no"], [ - VLC_ADD_LDFLAGS([libvlccore memcpyaltivec],[-Wl,-framework,vecLib]) + VLC_ADD_LIBS([libvlccore memcpyaltivec],[-Wl,-framework,vecLib]) ]) ]) AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"]) @@ -1741,7 +1685,7 @@ AS_IF([test "${enable_growl}" != "no"], [ VLC_ADD_PLUGIN([growl_udp]) AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl/Growl.framework/Versions/A/Headers/GrowlDefines.h, [ VLC_ADD_PLUGIN([growl]) - VLC_ADD_LDFLAGS([growl], [-F${CONTRIB_DIR}/Growl -Wl,-framework,Growl,-framework,CoreFoundation]) + VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR}/Growl -Wl,-framework,Growl,-framework,CoreFoundation]) VLC_ADD_OBJCFLAGS([growl], [-F${CONTRIB_DIR}/Growl]) VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] ) ]) @@ -2034,22 +1978,14 @@ dnl Video4Linux2 plugin dnl AC_ARG_ENABLE(v4l2, [AS_HELP_STRING([--disable-v4l2], - [do not support Video4Linux version 2 (default auto)])]) -AC_ARG_WITH(v4l2, - [AS_HELP_STRING([--with-v4l2=PATH], [path to a V4L2-enabled kernel tree])]) -if test "${enable_v4l2}" != "no" -then - if test "${with_v4l2}" != "no" -a -n "${with_v4l2}" - then - VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include]) - fi - - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" - AC_CHECK_HEADERS(linux/videodev2.h sys/videoio.h, [ - VLC_ADD_PLUGIN([v4l2]) - ],[]) - CPPFLAGS="${CPPFLAGS_save}" -fi + [disable Video4Linux2 support (default auto)])]) +have_v4l2="no" +AS_IF([test "${enable_v4l2}" != "no"], [ + AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [ + have_v4l2="yes" + ]) +]) +AM_CONDITIONAL(HAVE_V4L2, [test "${have_v4l2}" != "no"]) dnl dnl libv4l2 support for video4linux. @@ -2060,7 +1996,7 @@ AC_ARG_ENABLE(libv4l2, if test "${enable_libv4l2}" != "no" -a "${enable_v4l2}" != "no" then PKG_CHECK_MODULES( LIBV4L2, libv4l2, [ - VLC_ADD_LDFLAGS([v4l2],[${LIBV4L2_LIBS}]) + VLC_ADD_LIBS([v4l2],[${LIBV4L2_LIBS}]) VLC_ADD_CFLAGS([v4l2],[${LIBV4L2_CFLAGS}]) AC_DEFINE(HAVE_LIBV4L2, 1, Define if libv4l2 is available)], AC_MSG_WARN([LibV4L2 support disabled because libv4l2 development headers were not found]) @@ -2174,7 +2110,7 @@ then if test "${SYS}" = "darwin" then VLC_ADD_PLUGIN([vcd cdda]) - VLC_ADD_LDFLAGS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation]) + VLC_ADD_LIBS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation]) VLC_ADD_LIBS([vcdx cdda],[-liconv]) fi @@ -2208,7 +2144,7 @@ if test "${enable_screen}" != "no"; then 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]) + VLC_ADD_LIBS([screen],[-Wl,-framework,OpenGL,-framework,ApplicationServices]) ]) ]) elif test "${SYS}" = "mingw32"; then @@ -2534,7 +2470,7 @@ AS_IF([test "${enable_avcodec}" != "no"], [ VLC_ADD_PLUGIN([avcodec]) VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LDFLAGS([avcodec],[-Wl,-Bsymbolic]) + VLC_ADD_LIBS([avcodec],[-Wl,-Bsymbolic]) ]) VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) VLC_RESTORE_FLAGS @@ -2653,7 +2589,7 @@ then VLC_ADD_LIBS([avformat access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS]) VLC_ADD_CFLAGS([avformat access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LDFLAGS([avformat access_avio],[-Wl,-Bsymbolic]) + VLC_ADD_LIBS([avformat access_avio],[-Wl,-Bsymbolic]) ]) ], [ VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS]) @@ -2684,7 +2620,7 @@ then VLC_ADD_LIBS([swscale],[$SWSCALE_LIBS]) VLC_ADD_CFLAGS([swscale],[$SWSCALE_CFLAGS]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LDFLAGS([swscale],[-Wl,-Bsymbolic]) + VLC_ADD_LIBS([swscale],[-Wl,-Bsymbolic]) ]) VLC_RESTORE_FLAGS ],[ @@ -2779,7 +2715,7 @@ if test "${enable_quicktime}" = "yes"; then else AC_CHECK_HEADERS(QuickTime/QuickTime.h, [ VLC_ADD_PLUGIN([quicktime]) - VLC_ADD_LDFLAGS([quicktime],[-Wl,-framework,QuickTime,-framework,Carbon]) + VLC_ADD_LIBS([quicktime],[-Wl,-framework,QuickTime,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find QuickTime headers]) ]) fi fi @@ -2930,7 +2866,7 @@ PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto]) dnl dnl schroedinger decoder plugin (for dirac format video) dnl -PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.6], [dirac decoder using schroedinger], [auto]) +PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.10], [dirac decoder and encoder using schroedinger], [auto]) dnl dnl PNG decoder module @@ -2975,7 +2911,7 @@ if test "${enable_x264}" != "no"; then 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_LIBS([x264],[${X264_LIBS}]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB]) @@ -2994,7 +2930,7 @@ if test "${enable_x264}" != "no"; then VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [ - VLC_ADD_LDFLAGS([x264],[-Wl,-Bsymbolic]) + VLC_ADD_LIBS([x264],[-Wl,-Bsymbolic]) ]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) @@ -3015,6 +2951,11 @@ dnl libfluidsynth (MIDI synthetizer) plugin dnl PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto]) +dnl +dnl libsamplerate plugin +dnl +PKG_ENABLE_MODULES_VLC([SAMPLERATE], [], [samplerate], [Resampler with libsamplerate], [auto]) + dnl dnl Teletext Modules dnl vbi decoder plugin (using libzbvi) @@ -3085,8 +3026,7 @@ AS_IF([test "${enable_kate}" != "no"], [ 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}]) ],[ + VLC_ADD_LIBS([kate],[-lkate -logg]) ],[ 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.]) @@ -3267,7 +3207,7 @@ if test "${enable_freetype}" != "no"; then VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}]) AC_CHECK_HEADERS(Carbon/Carbon.h, - [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) + [VLC_ADD_LIBS([freetype],[-Wl,-framework,Carbon])]) dnl fontconfig support if test "${SYS}" != "mingw32"; then @@ -3329,7 +3269,7 @@ if test "${enable_ios_vout}" = "yes" then VLC_ADD_PLUGIN([vout_ios]) VLC_ADD_CFLAGS([vout_ios], [-DUSE_OPENGL_ES=1]) - VLC_ADD_LDFLAGS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation]) + VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation]) fi dnl @@ -3341,7 +3281,7 @@ if test "x${enable_macosx_quartztext}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_quartztext}" = "yes") then VLC_ADD_PLUGIN([quartztext]) - VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,ApplicationServices]) + VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices]) fi dnl @@ -3381,18 +3321,19 @@ dnl dnl Windows Direct2D plugin dnl AC_ARG_ENABLE(direct2d, - [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)]) -if test "${enable_direct2d}" != "no"; then - if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" - then - AC_CHECK_HEADERS(d2d1.h, - [ - VLC_ADD_PLUGIN([direct2d]) - VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32]) - ], [AC_MSG_WARN([Cannot find Direct2D headers!])] - ) - fi -fi + [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)],, [ + AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ + enable_direct2d="no" + ]) +]) +AS_IF([test "${enable_direct2d}" != "no"], [ + AC_CHECK_HEADERS(d2d1.h, [ + VLC_ADD_PLUGIN([direct2d]) + VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32]) + ], [ + AC_MSG_WARN([Cannot find Direct2D headers!]) + ]) +]) dnl dnl win32 GDI plugin @@ -3622,7 +3563,7 @@ if test "x${enable_macosx_audio}" != "xno" && then AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, [ VLC_ADD_PLUGIN([auhal]) - VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) + VLC_ADD_LIBS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) fi @@ -3634,7 +3575,7 @@ AC_ARG_ENABLE(audioqueue, if test "${enable_audioqueue}" = "yes" then VLC_ADD_PLUGIN([audioqueue]) - VLC_ADD_LDFLAGS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation]) + VLC_ADD_LIBS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation]) fi dnl @@ -3701,7 +3642,7 @@ AS_IF([test "${enable_skins2}" = "yes"], [ ], [test "${SYS}" = "darwin"], [ VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS]) VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti]) - VLC_ADD_LDFLAGS([skins2],[-Wl,-framework,Carbon]) + VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon]) ], [ PKG_CHECK_MODULES([XPM], [xpm]) @@ -3782,7 +3723,7 @@ AS_IF([test "${enable_qt4}" != "no"], [ VLC_ADD_LIBS([qt4],[-lole32]) ]) AS_IF([test "${SYS}" = "darwin" ],[ - VLC_ADD_LDFLAGS([qt4], [-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([qt4], [-Wl,-framework,Cocoa]) ]) AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin) AC_PATH_PROG(RCC, rcc, rcc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin) @@ -3813,20 +3754,20 @@ AC_ARG_ENABLE(macosx, if test "x${enable_macosx}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx}" = "yes") then - VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,Cocoa]) - VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,OpenGL]) - VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon]) - VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices]) - VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL]) - VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QTKit]) - VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) - VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) + VLC_ADD_LIBS([macosx minimal_macosx],[-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([macosx minimal_macosx],[-Wl,-framework,OpenGL]) + VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,Carbon]) + VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,CoreServices]) + VLC_ADD_LIBS([macosx minimal_macosx], [-Wl,-framework,AGL]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,IOKit]) + VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle]) VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle]) - VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit -Wl,-framework,BGHUDAppKit]) + VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit -Wl,-framework,BGHUDAppKit]) VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BGHUDAppKit]) dnl For bug report - VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook]) - VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,AddressBook]) + VLC_ADD_LIBS([macosx], [-Wl,-framework,WebKit]) VLC_ADD_OBJCFLAGS([macosx minimal_macosx], [-fobjc-exceptions] ) VLC_ADD_PLUGIN([macosx minimal_macosx]) @@ -3841,8 +3782,8 @@ AC_ARG_ENABLE(macosx-vout, if test "x${enable_macosx_vout}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes") then - VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,Cocoa]) - VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,OpenGL]) + VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,OpenGL]) VLC_ADD_PLUGIN([vout_macosx]) fi @@ -3851,7 +3792,7 @@ AC_ARG_ENABLE(macosx-dialog-provider, if test "x${enable_macosx_dialog_provider}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_dialog_provider}" = "yes") then - VLC_ADD_LDFLAGS([macosx_dialog_provider],[-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([macosx_dialog_provider],[-Wl,-framework,Cocoa]) VLC_ADD_PLUGIN([macosx_dialog_provider]) fi @@ -3860,11 +3801,11 @@ AC_ARG_ENABLE(macosx-qtcapture, if test "x${enable_macosx_qtcapture}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes") then - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,Cocoa]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QuartzCore]) - VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QTKit]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreAudio]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QuartzCore]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreVideo]) VLC_ADD_PLUGIN([qtcapture]) fi @@ -3873,7 +3814,7 @@ AC_ARG_ENABLE(macosx-eyetv, if test "x${enable_macosx_eyetv}" != "xno" && (test "${SYS}" = "darwin" || test "${enable_macosx_eyetv}" = "yes") then - VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation]) + VLC_ADD_LIBS([access_eyetv], [-Wl,-framework,Foundation]) VLC_ADD_PLUGIN([access_eyetv]) fi @@ -4234,8 +4175,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]) ]) @@ -4250,23 +4191,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,8 +4226,6 @@ AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) dnl dnl Handle substvars that use $(top_srcdir) dnl -VLC_CONFIG="top_srcdir=\"\$(top_srcdir)\" top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config" -AC_SUBST(VLC_CONFIG) CPPFLAGS_save="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS_save}" dnl @@ -4316,11 +4238,6 @@ dnl Sort the modules list dnl PLUGINS=$( (for i in `echo $PLUGINS`; do echo $i; done)|sort|xargs ) -dnl -dnl Create the vlc-config script -dnl -LDFLAGS_libvlc="${LDFLAGS_libvlc} ${LDFLAGS_builtin}" - dnl dnl Configuration is finished dnl @@ -4339,15 +4256,9 @@ AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(FILE_LIBVLCCORE_DLL) AC_SUBST(FILE_LIBVLC_DLL) -dnl Create vlc-config.in -VLC_OUTPUT_VLC_CONFIG_IN - AC_CONFIG_FILES([ Makefile doc/Makefile - libs/loader/Makefile - libs/srtp/Makefile - libs/unzip/Makefile modules/Makefile m4/Makefile po/Makefile.in @@ -4367,6 +4278,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 @@ -4374,6 +4286,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 @@ -4399,13 +4312,13 @@ AC_CONFIG_FILES([ modules/lua/Makefile modules/meta_engine/Makefile modules/misc/Makefile - modules/misc/notify/Makefile modules/misc/playlist/Makefile modules/misc/osd/Makefile modules/misc/stats/Makefile modules/media_library/Makefile modules/mux/Makefile modules/mux/mpeg/Makefile + modules/notify/Makefile modules/packetizer/Makefile modules/services_discovery/Makefile modules/stream_filter/Makefile @@ -4444,13 +4357,7 @@ AM_COND_IF([HAVE_DARWIN], [ dnl Generate makefiles AC_OUTPUT -# Cannot use AC_CONFIG_FILES([vlc-config]) as is automatically built, -# not provided with the source -${SHELL} ./config.status --file=vlc-config -chmod 0755 vlc-config - -/bin/echo -n "Enabled modules: " -./vlc-config --list plugin +/bin/echo -n "Enabled modules: ${PLUGINS}" dnl Do we have to use make or gmake ? USE_MAKE_OR_GMAKE=`case "${SYS}" in openbsd*) echo "gmake";; *) echo "make";; esac` @@ -4485,5 +4392,4 @@ else echo "build vlc executable : no" fi echo " -You can tune the compiler flags in vlc-config. To build vlc and its plugins, type \`./compile' or \`$USE_MAKE_OR_GMAKE'."