dnl Check for the contrib directory
dnl
AC_ARG_WITH(contrib,
- [AS_HELP_STRING([--without-contrib],
- [do not use the libraries in CONTRIB_DIR])])
-AC_ARG_VAR([CONTRIB_DIR], [directory containing pre-built contrib, overriding extras/contrib])
-AS_IF([test "${with_contrib}" != "no"],[
- AS_IF([test -z "$CONTRIB_DIR"], [
- topdir="`dirname $0`"
- if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
- topdir="`pwd`/$topdir"
- fi
- CONTRIB_DIR="${topdir}/extras/contrib/hosts/${host}"
- if ! test -d "$CONTRIB_DIR"
- then
- gccmachine=`$CC -dumpmachine`
- CONTRIB_DIR="${topdir}/extras/contrib/hosts/${gccmachine}"
- fi
+ [AS_HELP_STRING([--with-contrib[=DIR]],
+ [search for 3rd party libraries in DIR/include and DIR/lib])
+])
+AC_MSG_CHECKING([for 3rd party libraries path])
+AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
+ CONTRIB_DIR="${srcdir}/contrib/${host}"
+ AS_IF([test ! -d "${CONTRIB_DIR}"], [
+ echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
+ CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`"
+ AS_IF([test ! -d "${CONTRIB_DIR}"], [
+ echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
+ CONTRIB_DIR="${srcdir}/extras/contrib/hosts/${host}"
+ AS_IF([test ! -d "${CONTRIB_DIR}"], [
+ echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
+ CONTRIB_DIR="${srcdir}/extras/contrib/hosts/`$CC -dumpmachine`"
+ AS_IF([test ! -d "${CONTRIB_DIR}"], [
+ echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
+ CONTRIB_DIR=""
+ AC_MSG_RESULT([not found])
+ ])
+ ])
+ ])
])
- AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
+], [
+ AS_IF([test "${with_contrib}" != "no"], [
+ CONTRIB_DIR="${with_contrib}"
+ ], [
+ CONTRIB_DIR=""
+ AC_MSG_RESULT([disabled])
+ ])
+])
+AS_IF([test -n "${CONTRIB_DIR}"], [
AS_IF([test -d "${CONTRIB_DIR}/lib"],[
- AC_MSG_RESULT([yes])
- AC_SUBST(CONTRIB_DIR)
- export PATH=${CONTRIB_DIR}/bin:$PATH
- CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
- CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include"
- CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include"
- CFLAGS_save="${CFLAGS_save} -I${CONTRIB_DIR}/include"
- CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include"
- CXXFLAGS_save="${CXXFLAGS_save} -I${CONTRIB_DIR}/include"
- OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
- OBJCFLAGS_save="${OBJCFLAGS_save} -I${CONTRIB_DIR}/include"
- if test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"; then
- export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
- else
- export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig"
- fi
- LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
- LDFLAGS_save="${LDFLAGS_save} -L${CONTRIB_DIR}/lib"
-
- if test "${SYS}" = "darwin"; then
- export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH"
- export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH"
- fi
- ],[
- AC_MSG_RESULT([no])
+ CONTRIB_DIR=`cd "${CONTRIB_DIR}" && pwd`
+ ], [
+ echo "${CONTRIB_DIR}/lib not found" >&AS_MESSAGE_LOG_FD
CONTRIB_DIR=""
+ AC_MSG_RESULT([not usable])
+ ])
+
+])
+AS_IF([test -n "${CONTRIB_DIR}"], [
+ AC_MSG_RESULT([${CONTRIB_DIR}])
+ export PATH=${CONTRIB_DIR}/bin:$PATH
+ CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
+ CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include"
+ CFLAGS="${CFLAGS} -I${CONTRIB_DIR}/include"
+ CFLAGS_save="${CFLAGS_save} -I${CONTRIB_DIR}/include"
+ CXXFLAGS="${CXXFLAGS} -I${CONTRIB_DIR}/include"
+ CXXFLAGS_save="${CXXFLAGS_save} -I${CONTRIB_DIR}/include"
+ OBJCFLAGS="${OBJCFLAGS} -I${CONTRIB_DIR}/include"
+ OBJCFLAGS_save="${OBJCFLAGS_save} -I${CONTRIB_DIR}/include"
+ AS_IF([test "$build" = "$host" -o "$PKG_CONFIG_LIBDIR"], [
+ export PKG_CONFIG_PATH="${CONTRIB_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"
+ ], [
+ export PKG_CONFIG_LIBDIR="${CONTRIB_DIR}/lib/pkgconfig"
+ ])
+ LDFLAGS="${LDFLAGS} -L${CONTRIB_DIR}/lib"
+ LDFLAGS_save="${LDFLAGS_save} -L${CONTRIB_DIR}/lib"
+
+ AS_IF([test "${SYS}" = "darwin"], [
+ export LD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH"
+ export DYLD_LIBRARY_PATH="${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH"
+ ])
+], [
+ AS_IF([test -n "${with_contrib}" && test "${with_contrib}" != "no"], [
+ AC_MSG_ERROR([Third party libraries not found!])
])
])
+AC_SUBST(CONTRIB_DIR)
dnl
dnl Set default values
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"
*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_WINNT], 0x0600, [Define to '0x0600' for Windows Vista APIs.])
AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01 (and shell) APIs.])
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 aout_sdl 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])
+ VLC_ADD_LIBS([cdda vcdx sdl_image vout_sdl],[-lwinmm])
dnl
dnl DEP and ASLR options
dnl
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"
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.
AH_BOTTOM([#include <vlc_fixups.h>])
-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 <sys/types.h>
+#if HAVE_POLL
+# include <poll.h>
+#elif defined (WIN32)
+# include <winsock2.h>
+#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([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap 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 <sys/socket.h> does not define.])
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 <stdarg.h>],
- [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 <stdarg.h> defines va_copy.])
-fi
-AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy,
- AC_TRY_LINK(
- [#include <stdarg.h>],
- [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 <stdarg.h> defines __va_copy.])
-fi
-
AC_CHECK_FUNCS(inet_aton,,[
AC_CHECK_LIB(resolv,inet_aton,[
VLC_ADD_LIBS([libvlccore],[-lresolv])
])
AC_SUBST(GNUGETOPT_LIBS)
-if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
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],[-lm])
-])
-AC_CHECK_LIB(m,pow,[
- VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo qt4],[-lm])
-])
-AC_CHECK_LIB(m,sqrt,[
- VLC_ADD_LIBS([compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm])
-])
-AC_CHECK_LIB(m,ceil,[
- VLC_ADD_LIBS([access_imem hotkeys mosaic],[-lm])
-])
-AC_CHECK_LIB(m,exp,[
- VLC_ADD_LIBS([gaussianblur],[-lm])
-])
-AC_CHECK_LIB(m,round,[
- VLC_ADD_LIBS([dbus],[-lm])
-])
-AC_CHECK_LIB(m,sqrtf,[
- VLC_ADD_LIBS([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 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])
+ LIBM="-lm"
+], [
+ LIBM=""
])
-fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+AC_SUBST(LIBM)
AC_CHECK_LIB(m,lrintf, [
AC_DEFINE(HAVE_LRINTF, 1, [Define to 1 if you have the lrintf function])
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
# 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
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)
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
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"])
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] )
])
AC_MSG_WARN([The installed liveMedia version is too old:
Version 2010.05.29 or later is required to proceed.
You can get an updated one from http://www.live555.com/liveMedia .])
- AS_IF([test "${enable_live555}" == "yes"], [
+ AS_IF([test "${enable_live555}" = "yes"], [
AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable the 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.
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])
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
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
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
AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
echo "VAAPI acceleration activated"
],[
- AS_IF([test "${enable_libva}" == "yes"],
+ AS_IF([test "${enable_libva}" = "yes"],
[AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
[AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
])
VLC_RESTORE_FLAGS
],[
- AS_IF([test "${enable_libva}" == "yes"],
+ AS_IF([test "${enable_libva}" = "yes"],
[AC_MSG_ERROR([Could not find required libva.])],
[AC_MSG_WARN([libva not found ])])
])
AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.])
echo "DxVA2 acceleration activated"
],[
- AS_IF([test "${enable_dxva2}" == "yes"],
+ AS_IF([test "${enable_dxva2}" = "yes"],
[AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
[AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])])
])
],[
- AS_IF([test "${enable_dxva2}" == "yes"],
+ AS_IF([test "${enable_dxva2}" = "yes"],
[AC_MSG_ERROR([Could not find required dxva2api.h])],
[AC_MSG_WARN([dxva2api.h not found])])
])
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])
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
],[
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
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
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])
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}])
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)
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.])
PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [
# SDL on Darwin is heavily patched and can only run SDL_image
if test "${SYS}" != "darwin"; then
- VLC_ADD_PLUGIN([vout_sdl aout_sdl])
+ VLC_ADD_PLUGIN([vout_sdl])
fi
if test "${SYS}" != "mingw32"; then
VLC_ADD_LIBS([vout_sdl],[${X_LIBS} ${X_PRE_LIBS} -lX11])
fi
- VLC_ADD_CFLAGS([vout_sdl aout_sdl],[${SDL_CFLAGS}])
- VLC_ADD_LIBS([vout_sdl aout_sdl],[${SDL_LIBS}])
+ VLC_ADD_CFLAGS([vout_sdl],[${SDL_CFLAGS}])
+ VLC_ADD_LIBS([vout_sdl],[${SDL_LIBS}])
# SDL_image
AS_IF([ test "${enable_sdl_image}" != "no"],[
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
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
(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
VLC_ADD_LIBS([directx],[-lgdi32])
],[AC_MSG_ERROR([Cannot find DirectX headers!])]
)
- AC_CHECK_HEADERS(GL/gl.h GL/glext.h,
+ AC_CHECK_HEADERS(GL/glext.h,
[ VLC_ADD_PLUGIN([glwin32])
VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32])
])
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_LANG_PUSH([C++])
+ AC_CHECK_HEADERS(d2d1.h, [
+ VLC_ADD_PLUGIN([direct2d])
+ VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32])
+ ], [
+ AC_MSG_WARN([Cannot find Direct2D headers!])
+ ])
+ AC_LANG_POP([C++])
+])
dnl
dnl win32 GDI plugin
PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.22], [
have_pulse="yes"
], [
- AS_IF([test "x${enable_pulse}" != "x"], [
- AC_MSG_ERROR([$PULSE_PKG_ERRORS. PulseAudio 0.9.22 or later required.])
+ PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.16], [
+ AS_IF([test "${no_x}" != "yes"], [
+ have_pulse="yes"
+ PULSE_LIBS="$PULSE_LIBS ${X_LIBS} ${X_PRE_LIBS} -lX11"
+ ], [
+ AS_IF([test "${enable_pulse}" = "yes"], [
+ AC_MSG_ERROR([Xlib is required with PulseAudio pre-0.9.22 versions
+(see http://www.pulseaudio.org/ticket/799 for further reference).])
+ ])
+ ])
+ ], [
+ AS_IF([test "x${enable_pulse}" != "x"], [
+ AC_MSG_ERROR([$PULSE_PKG_ERRORS. PulseAudio 0.9.22 or later required.])
+ ])
])
])
])
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
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
], [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])
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)
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])
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
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
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
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
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
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
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
modules/lua/Makefile
modules/meta_engine/Makefile
modules/misc/Makefile
- modules/misc/dummy/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
modules/stream_out/Makefile
modules/stream_out/transcode/Makefile
+ modules/text_renderer/Makefile
modules/video_chroma/Makefile
modules/video_filter/Makefile
modules/video_filter/dynamicoverlay/Makefile
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`
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'."
projects / vlc / blobdiff