AC_CANONICAL_HOST
AC_PRESERVE_HELP_ORDER
-AM_INIT_AUTOMAKE(tar-ustar color-tests)
+AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
AM_CONFIG_HEADER(config.h)
# Disable with "./configure --disable-silent-rules" or "make V=1"
CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"
LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
- VLC_ADD_LIBS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation])
- VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,Appkit])
- VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress])
+ VLC_ADD_LIBS([motion], [-Wl,-framework,IOKit,-framework,CoreFoundation])
+ VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
+ VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress])
VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation])
AC_LIBOBJ([strnlen])],)
dnl
- dnl Check for Mac OS X SDK settings
+ dnl Handle Mac OS X SDK flags
dnl
AC_ARG_WITH(macosx-sdk,
[AS_HELP_STRING([--with-macosx-sdk=DIR],
[compile using the SDK in DIR])])
- test "${with_macosx_sdk}" = "" && with_macosx_sdk=/Developer/SDKs/MacOSX10.6.sdk
- test ! -d "${with_macosx_sdk}" && AC_MSG_ERROR([SDK "${with_macosx_sdk}" not found])
+ if test "${with_macosx_sdk}" != "" ; then
+ test ! -d "${with_macosx_sdk}" && AC_MSG_ERROR([SDK "${with_macosx_sdk}" not found])
+ CPP="${CPP} -isysroot ${with_macosx_sdk}"
+ CC="${CC} -isysroot ${with_macosx_sdk}"
+ CXX="${CXX} -isysroot ${with_macosx_sdk}"
+ OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
+ LD="${LD} -syslibroot ${with_macosx_sdk}"
+ fi
AC_ARG_WITH(macosx-version-min,
[AS_HELP_STRING([--with-macosx-version-min=VERSION],
- [compile for MacOS X VERSION and above])])
- if test "${with_macosx_version_min}" = "" ; then
- with_macosx_version_min=10.5
+ [compile for Mac OS X VERSION and above])])
+ if test "${with_macosx_version_min}" != "" ; then
+ MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
+ CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"
+ CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
+ CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
+ OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
+ LD="${LD} -mmacosx_version_min=${with_macosx_version_min}"
+ CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
+ CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
+ OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
+ export MACOSX_DEPLOYMENT_TARGET
fi
- MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
- CPP="${CPP} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}"
- CC="${CC} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}"
- CXX="${CXX} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}"
- OBJC="${OBJC} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}"
- LD="${LD} -syslibroot ${with_macosx_sdk} -mmacosx_version_min=${with_macosx_version_min}"
- CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
- CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
- OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
- export MACOSX_DEPLOYMENT_TARGET
;;
*mingw32* | *cygwin* | *wince* | *mingwce*)
AC_CHECK_TOOL(WINDRES, windres, :)
AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.])
case "${host_os}" in
- *wince* | *mingwce* | *mingw32ce*)
- SYS=mingwce
- dnl Sadly CeGCC still needs non-wince macros
- ;;
*mingw32*)
SYS=mingw32
;;
esac
if test "${SYS}" = "mingw32"; then
- VLC_ADD_LIBS([libvlccore],[-lnetapi32 -lwinmm])
+ VLC_ADD_LIBS([libvlccore],[-lwinmm])
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([win32text],[-lgdi32])
- VLC_ADD_LIBS([cdda vcdx sdl_image vout_sdl],[-lwinmm])
+ VLC_ADD_LIBS([vcdx],[-lwinmm])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_win32"
DESTDIR="`pwd`/_win32/"
AC_SUBST(PROGRAMFILES)
fi
- if test "${SYS}" = "mingwce"; then
- VLC_ADD_LIBS([libvlccore],[-lmmtimer])
- AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
- ac_default_prefix="`pwd`/_wince"
- DESTDIR="`pwd`/_wince/"
- fi
;;
*nto*)
SYS=nto
AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2")
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1")
-AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
AM_CONDITIONAL(HAVE_SYMBIAN, test "${SYS}" = "symbian")
+dnl
+dnl Sadly autoconf does not think about testing foo.exe when ask to test
+dnl for program foo on win32
+case "${build_os}" in
+ cygwin|msys)
+ ac_executable_extensions=".exe"
+ ;;
+ *)
+ ;;
+esac
+
+dnl Android is linux, but a bit different
+AS_IF([test "$SYS" = linux],[
+ AC_MSG_CHECKING([for an Android system])
+ AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
+ [[#ifndef __ANDROID__
+ # error Not Android
+ #endif
+ ]],[[;]])
+ ],[
+ HAVE_ANDROID="1"
+ AC_MSG_RESULT([yes])
+ ],[
+ AC_MSG_RESULT([no])
+ ])
+])
+AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1")
+
+
dnl
dnl Check for the contrib directory
dnl
])
AC_SUBST(CONTRIB_DIR)
-dnl
-dnl Sadly autoconf does not think about testing foo.exe when ask to test
-dnl for program foo on win32
-
-case "${build_os}" in
- cygwin|msys)
- ac_executable_extensions=".exe"
- ;;
- *)
- ;;
-esac
-
-dnl Android is linux, but a bit different
-AS_IF([test "$SYS" = linux],[
- AC_MSG_CHECKING([for an Android system])
- AC_PREPROC_IFELSE([AC_LANG_PROGRAM(
- [[#ifndef __ANDROID__
- # error Not Android
- #endif
- ]],[[;]])
- ],[
- HAVE_ANDROID="1"
- AC_MSG_RESULT([yes])
- ],[
- AC_MSG_RESULT([no])
- ])
-])
-AM_CONDITIONAL(HAVE_ANDROID, test "${HAVE_ANDROID}" = "1")
-
dnl
dnl Libtool
dnl It's very bad, but our former custom system was worst
LT_LANG([C++])
LT_LANG([Windows Resource])
+DOLT
+
m4_undefine([AC_DEPLIBS_CHECK_METHOD])
m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
dnl
AM_ICONV
+dnl
+dnl checks for mingw
+AS_IF([test "${SYS}" = "mingw32"], [
dnl Check for broken versions of mingw-runtime compatability library
-AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
AC_MSG_CHECKING(for broken mingw-runtime)
AC_PREPROC_IFELSE([AC_LANG_SOURCE([
#include <_mingw.h>
])
dnl force use of mingw provided c99 *printf over msvcrt
CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1"
-])
dnl Check for the need to include the mingwex lib for mingw32
-if test "${SYS}" = "mingw32" ; then
AC_CHECK_LIB(mingwex,opendir,
AC_CHECK_LIB(mingw32,opendir,,
[VLC_ADD_LIBS([libvlccore],[-lmingwex])])
)
-fi
dnl Check for fnative-struct or mms-bitfields support for mingw32
-if test "${SYS}" = "mingw32" ; then
VLC_SAVE_FLAGS
CFLAGS="${CFLAGS} -mms-bitfields"
CXXFLAGS="${CXXFLAGS} -mms-bitfields"
[AC_TRY_COMPILE([],,ac_cv_c_fnative_struct=yes, ac_cv_c_fnative_struct=no)])
"${ac_cv_c_fnative_struct}" = "no" && VLC_RESTORE_FLAGS
fi
-fi
+])
dnl
dnl Buggy glibc prevention. Purposedly not cached.
AS_IF([test "${SYS}" = "mingw32"], [
SOCKET_LIBS="-lws2_32"
])
- AS_IF([test "${SYS}" = "mingwce"], [
- SOCKET_LIBS="-lws2"
- ])
])
AC_SEARCH_LIBS([getaddrinfo], [nsl], [
VLC_RESTORE_FLAGS
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 flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync stream_filter_dash],[${SOCKET_LIBS}])
+ VLC_ADD_LIBS([access_http 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 rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[${SOCKET_LIBS}])
])
AC_SUBST(SOCKET_LIBS)
AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_struct_sockaddr_storage,
[AC_TRY_COMPILE(
[#include <sys/types.h>
- #if defined( UNDER_CE )
- # include <winsock2.h>
- #elif defined( WIN32 )
+ #if defined( WIN32 )
# include <winsock2.h>
#else
# include <sys/socket.h>
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 freetype mpc dmo mp4 quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x26410b hqdn3d anaglyph],[-lm])
+ VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mpc dmo quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex opus mono colorthres extract ball access_imem hotkeys mosaic gaussianblur x26410b hqdn3d anaglyph oldrc ncurses],[-lm])
LIBM="-lm"
], [
LIBM=""
VLC_RESTORE_FLAGS
# Windows
-AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
+AS_IF([test "${SYS}" = "mingw32"], [
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=""
+AS_IF([test "${enable_shared}" = "no"], [
+ have_dynamic_objects=no
])
AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"])
VLC_ADD_LIBS([lua],[$LIBDL])
dnl Check for thread library
-if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
-
+LIBPTHREAD=""
+AS_IF([test "${SYS}" != "mingw32"], [
VLC_SAVE_FLAGS
LIBS=""
AC_SEARCH_LIBS(pthread_rwlock_init, pthread pthreads c_r, [
- VLC_ADD_LIBS([libvlccore libvlc vlc plugin],[${LIBS}])
+ AS_IF([test "$ac_cv_search_pthread_rwlock_init" != "none required"], [
+ LIBPTHREAD="$ac_cv_search_pthread_rwlock_init"
+ ])
])
VLC_RESTORE_FLAGS
dnl HP/UX port
AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LIBS([libvlccore],[-lrt])])
])
-fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+])
+AC_SUBST(LIBPTHREAD)
dnl Check for headers
AC_CHECK_HEADERS([search.h])
#include <sys/param.h>
])
-if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+if test "${SYS}" != "mingw32"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h])
AC_CHECK_HEADERS(syslog.h mntent.h)
-fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+fi # end "${SYS}" != "mingw32"
dnl LP64 and LLP64 architectures had better define ssize_t by themselves...
AH_TEMPLATE(ssize_t, [Define to `int' if <stddef.h> does not define.]) dnl ` (fix VIM syntax highlight
])
dnl Check for threads library
-if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+if test "${SYS}" != "mingw32"; then
AC_CHECK_HEADERS(pthread.h)
-fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+fi # end "${SYS}" != "mingw32"
dnl It seems that autoconf detects pkg-config only during the first
dnl PKG_CHECK_MODULES from configure.ac - which makes sense. But in our case,
dnl On some OS we need static linking
AS_IF([test -n "${PKG_CONFIG}" ],[
- AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ],[
+ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ],[
PKG_CONFIG="${PKG_CONFIG} --static"
])
])
AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
if test "${have_zlib}" = "yes"
then
- VLC_ADD_LIBS([access_http mp4 skins2 sap mkv unzip zip],[-lz])
+ VLC_ADD_LIBS([access_http skins2 sap unzip zip],[-lz])
PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [
AC_CHECK_HEADERS([unzip.h], [
have_minizip=yes
MINIZIP_LIBS="-lminizip -lz"
], [
+ VLC_ADD_CPPFLAGS([skins2], [-I\\\$(top_srcdir)/modules/access/zip/unzip])
+ VLC_ADD_LIBS([skins2], [\\\$(top_builddir)/modules/access/libunzip.la])
have_minizip=no
- 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])
AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
+dnl
+dnl Domain name i18n support via GNU libidn
+dnl
+PKG_CHECK_MODULES([IDN], [libidn], [
+ have_libidn="yes"
+ AC_DEFINE([HAVE_IDN], 1, [Define to 1 if you have GNU libidn.])
+], [
+ have_libidn="no"
+])
+
+
dnl Check for dbus
AC_ARG_ENABLE(dbus,
[AS_HELP_STRING([--enable-dbus],
[compile D-Bus message bus support (default enabled)])])
-case "${SYS}" in
- linux*|*bsd*)
-if test "${enable_dbus}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
-then
- dnl api stable dbus
- PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0.0],
- [ AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] )
- VLC_ADD_LIBS([libvlccore],[$DBUS_LIBS])
- VLC_ADD_CFLAGS([libvlccore],[$DBUS_CFLAGS])
- dnl Check for dbus control interface
- AC_ARG_ENABLE(dbus-control,
- [AS_HELP_STRING([--disable-dbus-control],
- [D-Bus control interface (default enabled)])])
- if test "${enable_dbus_control}" != "no"
- then
- VLC_ADD_PLUGIN([dbus])
- VLC_ADD_LIBS([dbus],[$DBUS_LIBS])
- VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS])
- fi
- dnl Check for Telepathy
- AC_ARG_ENABLE(telepathy,
- AS_HELP_STRING([--enable-telepathy],[Telepathy Presence plugin through DBus(default enabled)]))
- if test "${enable_telepathy}" != "no"; then
- VLC_ADD_PLUGIN([telepathy])
- VLC_ADD_LIBS([telepathy],[$DBUS_LIBS])
- VLC_ADD_CFLAGS([telepathy],[$DBUS_CFLAGS])
- fi
- dnl Power Management Inhibiter
- VLC_ADD_PLUGIN([inhibit])
- VLC_ADD_LIBS([inhibit],[$DBUS_LIBS])
- VLC_ADD_CFLAGS([inhibit],[$DBUS_CFLAGS])
- ],
- [AC_MSG_ERROR([${DBUS_PKG_ERRORS}.])]
- )
-fi
-;;
-esac
+have_dbus="no"
+AS_IF([test "${enable_dbus}" != "no"], [
+ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0.0], [
+ have_dbus="yes"
+ ], [
+ AS_IF([test -n "${enable_dbus}"], [
+ AC_MSG_ERROR([${DBUS_PKG_ERRORS}.])
+ ], [
+ AC_MSG_WARN([${DBUS_PKG_ERRORS}.])
+ ])
+ ])
+])
+AM_CONDITIONAL([HAVE_DBUS], [test "${have_dbus}" = "yes"])
dnl Check for ntohl, etc.
VLC_SAVE_FLAGS
LDFLAGS="-lgcov ${LDFLAGS}"
])
-AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
+AS_IF([test "${SYS}" != "mingw32"], [
VLC_SAVE_FLAGS
CFLAGS="${CFLAGS} -fvisibility=hidden"
CXXFLAGS="${CXXFLAGS} -fvisibility=hidden"
dnl
ALIASES="${ALIASES} cvlc rvlc"
-dnl
-dnl Some plugins aren't useful on some platforms
-dnl
-if test "${SYS}" = "os2"; then
- VLC_ADD_PLUGIN([dynamicoverlay])
-elif test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([dynamicoverlay access_shm])
-elif test "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([access_smb dmo globalhotkeys])
- VLC_ADD_LIBS([dmo],[-lole32 -luuid])
-fi
-if test "${SYS}" = "darwin"; then
- VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices])
-fi
-
dnl
dnl Accelerated modules
dnl
])
AS_IF([test "${enable_neon}" != "no"], [
VLC_SAVE_FLAGS
- CFLAGS="${CFLAGS} -mfpu=neon"
- AC_CACHE_CHECK([if $CC groks NEON inline assembly], [ac_cv_neon_inline], [
+ CFLAGS="${CFLAGS} -mfpu=neon -mhard-float"
+ AC_CACHE_CHECK([if $CCAS groks ARM NEON assembly], [ac_cv_arm_neon], [
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM(,[[
asm volatile("vqmovun.s64 d0, q1":::"d0");
-asm volatile("ssat r0, #1, r0":::"r0"); /* assume ARMv6 */
]])
], [
- ac_cv_neon_inline="-mfpu=neon"
+ ac_cv_arm_neon="yes"
], [
- ac_cv_neon_inline="no"
+ ac_cv_arm_neon="no"
])
])
VLC_RESTORE_FLAGS
- AS_IF([test "$ac_cv_neon_inline" != "no"], [
- NEON_CFLAGS="$ac_cv_neon_inline"
- AC_DEFINE([CAN_COMPILE_NEON], 1, [Define to 1 if NEON (and ARMv6) assembly is available with NEON_CFLAGS.])
- ])
-], [
- ac_cv_neon_inline="no"
])
-AC_SUBST(NEON_CFLAGS)
-AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_neon_inline}" != "no"])
+AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_arm_neon}" = "yes"])
AC_ARG_ENABLE(altivec,
AC_LANG_PUSH(C++)
VLC_SAVE_FLAGS
AS_IF([test -z "${CONTRIB_DIR}"], [
- CPPFLAGS_live555="-I/usr/include/liveMedia -I/usr/include/groupsock -I/usr/include/BasicUsageEnvironment -I/usr/include/UsageEnvironment"
+ AS_IF([test ${SYS} != "os2"], [
+ LIVE555_PREFIX=${LIVE555_PREFIX-"/usr"}
+ CPPFLAGS_live555="-I${LIVE555_PREFIX}/include/liveMedia -I${LIVE555_PREFIX}/include/groupsock -I${LIVE555_PREFIX}/include/BasicUsageEnvironment -I${LIVE555_PREFIX}/include/UsageEnvironment"
+ ], [
+ LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"}
+ CPPFLAGS_live555="-I${LIVE555_PREFIX}/liveMedia/include -I${LIVE555_PREFIX}/groupsock/include -I${LIVE555_PREFIX}/BasicUsageEnvironment/include -I${LIVE555_PREFIX}/UsageEnvironment/include"
+ LDFLAGS_live555="-L${LIVE555_PREFIX}/liveMedia -L${LIVE555_PREFIX}/groupsock -L${LIVE555_PREFIX}/BasicUsageEnvironment -L${LIVE555_PREFIX}/UsageEnvironment"
+ ])
], [
CPPFLAGS_live555="-I${CONTRIB_DIR}/include/liveMedia -I${CONTRIB_DIR}/include/groupsock -I${CONTRIB_DIR}/include/BasicUsageEnvironment -I${CONTRIB_DIR}/include/UsageEnvironment"
])
CPPFLAGS_live555="${CPPFLAGS_live555} -DSOLARIS"
])
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_live555}"
+ LDFLAGS="${LDFLAGS} ${LDFLAGS_live555}"
AC_CACHE_CHECK([for live555 version 1324598400 or later], [ac_cv_live555], [
AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
AS_IF([test "${SYS}" = "mingw32"], [
# add ws2_32 for closesocket, select, recv
other_libs="$other_libs -lws2_32"
- ], [test "${SYS}" = "mingwce"], [
- # add ws2 for closesocket, select, recv
- other_libs="$other_libs -lws2"
])
dnl We need to check for pic because live555 don't provide shared libs
dnl and we want to build a plugins so we need -fPIC on some arch.
VLC_ADD_CXXFLAGS([live555], [${CPPFLAGS_live555}])
+ VLC_ADD_LDFLAGS([live555], [${LDFLAGS_live555}])
AC_CHECK_LIB(liveMedia_pic, main, [
VLC_ADD_PLUGIN([live555])
VLC_ADD_LIBS([live555], [-lliveMedia_pic ${other_libs_pic}])
[AC_MSG_WARN([${DVDNAV_PKG_ERRORS}.])])
fi
-dnl
-dnl Windows DirectShow access module
-dnl
-AC_ARG_ENABLE(dshow,
- [AS_HELP_STRING([--disable-dshow],
- [support DirectShow (default auto)])])
-if test "${enable_dshow}" != "no"
-then
- if test "${SYS}" = "mingw32"
- then
- AC_LANG_PUSH(C++)
- AC_CHECK_HEADERS(dshow.h,
- [ VLC_ADD_PLUGIN([dshow])
- VLC_ADD_CXXFLAGS([dshow],[])
- VLC_ADD_LIBS([dshow],[-lole32 -loleaut32 -luuid -lstrmiids -lksuser])])
- AC_LANG_POP(C++)
- fi
-fi
-
dnl
dnl Blu-ray Disc Support with libbluray
dnl
dnl
dnl OpenCV wrapper and example filters
dnl
-PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (OpenCV (computer vision) filter), [off])
+PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0], (OpenCV (computer vision) filter), [auto])
dnl
dnl
AC_ARG_ENABLE(v4l2, [AS_HELP_STRING([--disable-v4l2],
[disable Video4Linux version 2 (default auto)])])
-AC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr],
- [support PVR V4L2 cards (default disabled)])])
have_v4l2="no"
AS_IF([test "$enable_v4l2" != "no"], [
AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [
have_v4l2="yes"
])
- AC_CHECK_DECLS([V4L2_CTRL_TYPE_BITMASK],,, [
-#ifdef HAVE_LINUX_VIDEODEV2_H
-# include <linux/videodev2.h>
-#endif
-#ifdef HAVE_SYS_VIDEOIO_H
-# include <sys/videoio.h>
-#endif
- ])
-])
-AS_IF([test "$have_v4l2" = "yes"], [
- AS_IF([test "${enable_pvr}" = "yes"], [
- VLC_ADD_PLUGIN([pvr])
- ])
])
AM_CONDITIONAL(HAVE_V4L2, [test "${have_v4l2}" != "no"])
AC_CHECK_HEADERS(OpenGL/gl.h, [
AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, [
VLC_ADD_PLUGIN([screen])
- VLC_ADD_LIBS([screen],[-Wl,-framework,OpenGL,-framework,ApplicationServices])
])
])
- elif test "${SYS}" = "mingw32"; then
- VLC_ADD_PLUGIN([screen])
- VLC_ADD_LIBS([screen],[-lgdi32])
fi
fi
AC_ARG_ENABLE(realrtsp,
[ --enable-realrtsp Real RTSP module (default disabled)])
if test "${enable_realrtsp}" = "yes"; then
- VLC_ADD_PLUGIN([access_realrtsp])
+ VLC_ADD_PLUGIN([realrtsp])
fi
dnl
if test "${enable_omxil}" = "yes"
then
VLC_ADD_PLUGIN([omxil])
- VLC_ADD_LIBS([omxil], [$LIBDL])
fi
dnl
AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)])
AS_IF([test "${enable_avcodec}" != "no"], [
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil],
+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil >= 49.5.0],
[
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
fi
])
+dnl
+dnl vda needs avcodec
+dnl
+AC_ARG_ENABLE(vda,
+ [ --enable-vda VDA support (default auto)])
+
+AS_IF([test "${enable_vda}" != "no"], [
+ if test "${SYS}" = "darwin"; then
+ AS_IF([test "x${have_avcodec}" = "xyes"], [
+ AC_CHECK_HEADERS(VideoDecodeAcceleration/VDADecoder.h,
+ [
+ AC_CHECK_HEADERS(libavcodec/vda.h, [
+ VLC_ADD_LIBS([avcodec],[-Wl,-framework,CoreFoundation,-framework,VideoDecodeAcceleration,-framework,QuartzCore])
+ VLC_ADD_LDFLAGS([vda],[-Wl,-framework,CoreFoundation,-framework,VideoDecodeAcceleration,-framework,QuartzCore])
+ AC_DEFINE(HAVE_AVCODEC_VDA, 1, [Define if avcodec has to be built with VDA support.])
+ ],[
+ AS_IF([test "${enable_vda}" == "yes"],
+ [AC_MSG_ERROR([vda is present but libavcodec/vda.h is missing])],
+ [AC_MSG_WARN([vda is present but libavcodec/vda.h is missing ])])
+ ])
+ ],[
+ AS_IF([test "${enable_vda}" == "yes"],
+ [AC_MSG_ERROR([Could not find required VideoDecodeAcceleration/VDADecoder.h])],
+ [AC_MSG_WARN([VideoDecodeAcceleration/VDADecoder.h not found])])
+ ])
+ ],[
+ AS_IF([test "x${enable_vda}" != "x"], [
+ AC_MSG_ERROR([--enable-vda and --disable-avcodec options are mutually exclusive.])
+ ])
+ ])
+ fi
+])
dnl
dnl stream_out switcher needs libavcodec
AC_CHECK_HEADERS(libavutil/avutil.h)
AS_IF([test "$enable_merge_ffmpeg" = "no"], [
VLC_ADD_PLUGIN([avformat access_avio])
- VLC_ADD_LIBS([avformat access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
- VLC_ADD_CFLAGS([avformat access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
+ VLC_ADD_LIBS([access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
+ VLC_ADD_CFLAGS([access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [
- VLC_ADD_LIBS([avformat access_avio],[-Wl,-Bsymbolic])
+ VLC_ADD_LDFLAGS([avformat access_avio],[-Wl,-Bsymbolic])
])
], [
VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS])
])
AM_CONDITIONAL([HAVE_SPEEXDSP], [test "$have_speexdsp" = "yes"])
+dnl
+dnl Opus plugin
+dnl
+PKG_ENABLE_MODULES_VLC([OPUS], [], [ogg opus], [Opus support], [auto])
+
dnl
dnl theora decoder plugin
dnl
dnl
AC_ARG_ENABLE(xcb,
[ --enable-xcb X11 support with XCB (default enabled)],, [
- AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin" -a "${SYS}" != "symbian"], [
+ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" -a "${SYS}" != "symbian"], [
enable_xcb="yes"
], [
enable_xcb="no"
PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [
PKG_CHECK_MODULES(XPROTO, [xproto])
VLC_ADD_PLUGIN([globalhotkeys])
- VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}])
- VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}])
VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS])
], [
AC_MSG_WARN([${XCB_KEYSYMS_PKG_ERRORS}. Hotkeys will not work.])
dnl Windows DirectX module
dnl
-if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"
+if test "${SYS}" = "mingw32"
then
VLC_ADD_PLUGIN([panoramix])
fi
AC_ARG_ENABLE(directx,
- [ --enable-directx Win32 DirectX support (default enabled on Win32)])
-if test "${enable_directx}" != "no"; then
- if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then
- dnl DDraw
- AC_CHECK_HEADERS(ddraw.h,
- [ VLC_ADD_PLUGIN([directx aout_directx])
- VLC_ADD_LIBS([directx],[-luser32 -lgdi32])
- ],[AC_MSG_ERROR([Cannot find DirectX headers!])]
- )
-
- dnl OpenGL
- AC_CHECK_HEADERS(GL/wglew.h,
- [ VLC_ADD_PLUGIN([glwin32])
- VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32])
- ],[],[
- #include <windows.h>
- #include <GL/gl.h>
- ])
+ [AS_HELP_STRING([--enable-directx],
+ [Microsoft DirectX support (default enabled on Windows)])],, [
+ AS_IF([test "${SYS}" = "mingw32"], [
+ enable_directx="yes"
+ ], [
+ enable_directx="no"
+ ])
+])
+have_directx="no"
+AS_IF([test "${enable_directx}" != "no"], [
+ dnl DirectDraw
+ AC_CHECK_HEADERS(ddraw.h, [
+ have_directx="yes"
+ ], [
+ AC_MSG_ERROR([Cannot find DirectX headers!])
+ ])
- dnl Direct3D
- AC_CHECK_HEADERS(d3d9.h,
- [ VLC_ADD_PLUGIN([direct3d])
- VLC_ADD_LIBS([direct3d],[-lgdi32])
- ])
- VLC_ADD_LIBS([direct3d directx glwin32],[-lole32 -luuid])
- fi
-fi
+ dnl OpenGL
+ AC_CHECK_HEADERS(GL/wglew.h, [
+ VLC_ADD_PLUGIN([glwin32])
+ ],, [
+ #include <windows.h>
+ #include <GL/gl.h>
+ ])
-dnl
-dnl Windows Direct2D plugin
-dnl
-AC_ARG_ENABLE(direct2d,
- [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)],, [
- AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
- enable_direct2d="no"
+ dnl Direct3D
+ AC_CHECK_HEADERS(d3d9.h, [
+ VLC_ADD_PLUGIN([direct3d])
])
-])
-AS_IF([test "${enable_direct2d}" != "no"], [
+
+ dnl Direct2D
AC_CHECK_HEADERS(d2d1.h, [
VLC_ADD_PLUGIN([direct2d])
- VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32 -luuid])
- ], [
- AC_MSG_WARN([Cannot find Direct2D headers!])
])
])
-
-dnl
-dnl win32 GDI plugin
-dnl
-AC_ARG_ENABLE(wingdi,
- [ --enable-wingdi Win32 GDI module (default enabled on Win32)])
-if test "${enable_wingdi}" != "no"; then
- if test "${SYS}" = "mingw32"; then
- VLC_ADD_PLUGIN([wingdi])
- VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32 -luuid])
- fi
- if test "${SYS}" = "mingwce"; then
- VLC_ADD_PLUGIN([wingdi wingapi])
- VLC_ADD_LIBS([wingdi],[-laygshell])
- VLC_ADD_LIBS([wingapi],[-laygshell])
- fi
-fi
-
+AM_CONDITIONAL([HAVE_DIRECTX], [test "$have_directx" = "yes"])
dnl
dnl Linux framebuffer module
AC_ARG_ENABLE(oss,
[AS_HELP_STRING([--enable-oss],
[support the Open Sound System OSS (default enabled on FreeBSD/NetBSD/DragonFlyBSD)])],, [
- AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "mingwce" -o "$SYS" = "linux" -o "$SYS" = "openbsd"], [
+ AS_IF([test "$SYS" = "mingw32" -o "$SYS" = "linux" -o "$SYS" = "openbsd"], [
enable_oss="no"
])
])
VLC_ADD_PLUGIN([waveout])
VLC_ADD_LIBS([waveout],[-lwinmm])
fi
- if test "${SYS}" = "mingwce"; then
- VLC_ADD_PLUGIN([waveout])
- fi
fi
dnl
EXTEND_HELP_STRING([Interface plugins:])
dnl
-dnl Hildon UI
+dnl QT
dnl
-AC_ARG_ENABLE(hildon,
- [ --enable-hildon Hildon touchscreen UI (default disabled)])
-AS_IF([test "${enable_hildon}" = "yes"], [
- PKG_CHECK_MODULES(HILDON, [hildon-1], [
- PKG_CHECK_MODULES(HILDON_FM, hildon-fm-2, [
- VLC_ADD_CFLAGS([hildon],[${HILDON_FM_CFLAGS} -DHAVE_HILDON_FM])
- VLC_ADD_LIBS([hildon],[${HILDON_FM_LIBS}])
- ], [
- AC_MSG_WARN([${HILDON_FM_PKG_ERRORS}.])
- ])
- VLC_ADD_CFLAGS([hildon],[${HILDON_CFLAGS} ${X_CFLAGS}])
- VLC_ADD_LIBS([hildon],[${HILDON_LIBS} ${X_LIBS} ${X_PRE_LIBS} -lX11])
- VLC_ADD_PLUGIN([hildon])
- ALIASES="${ALIASES} mvlc"
- ], [
- AS_IF([test "${enable_hildon}" = "yes"],[
- AC_MSG_ERROR([${HILDON_PKG_ERRORS}.])
+AC_ARG_ENABLE(qt, [
+ AS_HELP_STRING([--disable-qt], [Qt UI support (default enabled)])],, [
+ AS_IF([test "${SYS}" = "darwin"], [
+ enable_qt="no"
+ ])
+])
+AS_IF([test "${enable_qt}" != "no"], [
+ PKG_CHECK_MODULES([QT], [QtCore >= 5 QtWidgets QtGui],, [
+ PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [
+ AS_IF([test -n "${enable_qt}"],[
+ AC_MSG_ERROR([${QT_PKG_ERRORS}.])
+ ],[
+ AC_MSG_WARN([${QT_PKG_ERRORS}.])
+ ])
+ enable_qt="no"
])
- enable_hildon="no"
])
])
-AM_CONDITIONAL(BUILD_HILDON, [test "${enable_hildon}" = "yes"])
+AS_IF([test "${enable_qt}" != "no"], [
+ VLC_ADD_PLUGIN([qt4])
+ VLC_ADD_LIBS([qt4],[${QT_LIBS}])
+ VLC_ADD_CXXFLAGS([qt4],[${QT_CFLAGS}])
+ ALIASES="${ALIASES} qvlc"
-dnl
-dnl QT 4
-dnl
-AC_ARG_ENABLE(qt4,
- [ --enable-qt4 Qt 4 support (default enabled) ],, [
- AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no])
-])
-AS_IF([test "${enable_qt4}" != "no"], [
- PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.6.0], [
- VLC_ADD_PLUGIN([qt4])
- VLC_ADD_LIBS([qt4],[${QT4_LIBS}])
- VLC_ADD_CXXFLAGS([qt4],[${QT4_CFLAGS}])
- ALIASES="${ALIASES} qvlc"
-
- AC_LANG_PUSH([C++])
- VLC_SAVE_FLAGS
+ AC_LANG_PUSH([C++])
+ VLC_SAVE_FLAGS
- AC_MSG_CHECKING([whether Qt uses X11])
- CPPFLAGS="${CPPFLAGS} ${QT4_CFLAGS}"
- AC_PREPROC_IFELSE([AC_LANG_SOURCE([
+ AC_MSG_CHECKING([whether Qt uses Xlib])
+ CPPFLAGS="${CPPFLAGS} ${QT_CFLAGS}"
+ AC_PREPROC_IFELSE([AC_LANG_SOURCE([
#include <QWidget>
#if !defined (Q_WS_X11)
# error Fail
#endif
- ])], [
- AC_MSG_RESULT([yes])
- VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11])
- VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}])
- ], [
- AC_MSG_RESULT([no])
- ])
+ ])], [
+ AC_MSG_RESULT([yes])
+ VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11])
+ VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}])
+ ], [
+ AC_MSG_RESULT([no])
+ ])
- VLC_RESTORE_FLAGS
- AC_LANG_POP([C++])
+ VLC_RESTORE_FLAGS
+ AC_LANG_POP([C++])
- AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
- VLC_ADD_LIBS([qt4],[-lole32])
- ])
- AS_IF([test "${SYS}" = "darwin" ],[
- 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)
- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
- ], [
- AS_IF([test -n "${enable_qt4}"],[
- AC_MSG_ERROR([${QT4_PKG_ERRORS}.])
- ],[
- AC_MSG_WARN([${QT4_PKG_ERRORS}.])
- ])
- enable_qt4="no"
+ AS_IF([test "${SYS}" = "mingw32"], [
+ VLC_ADD_LIBS([qt4],[-lole32])
+ ])
+ AS_IF([test "${SYS}" = "darwin" ],[
+ VLC_ADD_LIBS([qt4], [-Wl,-framework,Cocoa])
])
+
+ QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
+ AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin])
+ AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin])
+ AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, [${QT_PATH}/bin])
])
-AM_CONDITIONAL(ENABLE_QT4, [test "x$enable_qt4" != "xno"])
+AM_CONDITIONAL(ENABLE_QT4, [test "$enable_qt" != "no"])
dnl
dnl Simple test for skins2 dependency
dnl
-AS_IF([test "x$enable_qt4" = "xno"], [
+AS_IF([test "$enable_qt" = "no"], [
AS_IF([test "${enable_skins2}" = "yes"], [
AC_MSG_ERROR([The skins2 module depends on the Qt4 interface. Without it you will not be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the Qt4 development package or alternatively you can also configure with: --disable-qt4 --disable-skins2.])
], [
dnl
AC_ARG_ENABLE(ncurses,
[AS_HELP_STRING([--disable-ncurses],[ncurses text-based interface (default auto)])])
-if test "${enable_ncurses}" != "no"; then
- VLC_SAVE_FLAGS
- LIBS=""
- AC_CHECK_HEADER(ncurses.h, [
- AC_CHECK_LIB(ncursesw, mvprintw, [
- AC_SEARCH_LIBS([tgetent], [ncursesw tinfow tinfo], [
- VLC_ADD_PLUGIN([ncurses])
- ALIASES="${ALIASES} nvlc"
- VLC_ADD_LIBS([ncurses],[-lncursesw ${LIBS}])
- ], [
- AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([tgetent not found])])
- ])
- ], [
- AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([libncursesw not found])])
- ])
+AS_IF([test "${enable_ncurses}" != "no"] ,[
+ PKG_CHECK_MODULES([NCURSES], [ncursesw], [
+ VLC_ADD_PLUGIN([ncurses])
+ VLC_ADD_CFLAGS([ncurses],[${NCURSES_CFLAGS}])
+ VLC_ADD_LIBS([ncurses],[${NCURSES_LIBS}])
+ ALIASES="${ALIASES} nvlc"
], [
- AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([ncurses.h not found])])
+ AS_IF([test -n "${enable_ncurses}"], [
+ AC_MSG_ERROR([${NCURSES_PKG_ERRORS}.])
+ ])
])
- VLC_RESTORE_FLAGS
-fi
+])
dnl
dnl Lirc plugin
fi
EXTEND_HELP_STRING([Visualisations and Video filter plugins:])
-dnl
-dnl Visualisation plugin
-dnl
-AC_ARG_ENABLE(visual,
- [ --enable-visual visualisation plugin (default enabled)])
-if test "${enable_visual}" != "no"
-then
- VLC_ADD_PLUGIN([visual])
-fi
-
dnl
dnl goom visualization plugin
dnl
[AS_HELP_STRING([--disable-taglib],
[do not use TagLib (default enabled)])])
AS_IF([test "${enable_taglib}" != "no"], [
- PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5, [
+ PKG_CHECK_MODULES(TAGLIB, taglib >= 1.6.1, [
VLC_ADD_PLUGIN([taglib])
VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz])
VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS])
AS_HELP_STRING([--with-kde-solid=PATH],
[KDE Solid actions directory (auto)]),, [
-if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin" ; then
+if test "${SYS}" != "mingw32" -a "${SYS}" != "darwin" ; then
with_kde_solid="yes"
fi
])
AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
AS_IF([test "${enable_loader}" = "yes"],
[ VLC_ADD_PLUGIN([dmo])
- VLC_ADD_CPPFLAGS([dmo quicktime ],[-I\\\${top_srcdir}/modules/codec/loader])
- VLC_ADD_LIBS([dmo quicktime ],[\\\${top_builddir}/modules/codec/loader/libloader.la])
+ VLC_ADD_CPPFLAGS([dmo quicktime ],[-I\\\$(srcdir)/loader])
+ VLC_ADD_LIBS([dmo quicktime ],[libloader.la])
VLC_ADD_LIBS([dmo quicktime], [-lpthread])
])
share/Makefile
compat/Makefile
src/Makefile
- src/test/Makefile
lib/Makefile
bin/Makefile
test/Makefile
modules/access/Makefile
- modules/access/bd/Makefile
- modules/access/dshow/Makefile
- modules/access/mms/Makefile
modules/access/rtp/Makefile
- modules/access/rtsp/Makefile
- modules/access/vcd/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/audio_output/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
- modules/codec/wmafixed/Makefile
modules/control/Makefile
- modules/control/dbus/Makefile
- modules/control/globalhotkeys/Makefile
modules/demux/Makefile
- modules/demux/asf/Makefile
- modules/demux/avformat/Makefile
- modules/demux/avi/Makefile
- modules/demux/mkv/Makefile
- modules/demux/mp4/Makefile
- modules/demux/mpeg/Makefile
- modules/demux/playlist/Makefile
modules/gui/Makefile
modules/gui/macosx/Makefile
- modules/gui/hildon/Makefile
modules/gui/minimal_macosx/Makefile
modules/gui/macosx_dialog_provider/Makefile
modules/gui/qt4/Makefile
modules/lua/Makefile
modules/meta_engine/Makefile
modules/misc/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_filter/dash/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
modules/video_output/Makefile
- modules/video_output/msw/Makefile
modules/visualization/Makefile
- modules/visualization/visual/Makefile
modules/mmx/Makefile
- modules/mmxext/Makefile
- modules/3dnow/Makefile
modules/sse2/Makefile
modules/altivec/Makefile
modules/arm_neon/Makefile
AM_COND_IF([HAVE_WIN32], [
AC_CONFIG_FILES([
- extras/package/win32/spad.nsi
- extras/package/win32/vlc.win32.nsi
+ extras/package/win32/NSIS/spad.nsi
+ extras/package/win32/NSIS/vlc.win32.nsi
])
])
projects / vlc / blobdiff