need_libc=false
dnl Check for usual libc functions
-AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setenv setlocale stricmp strnicmp uselocale])
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
+AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r gettimeofday isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
AC_FUNC_STRCOLL
dnl Check for non-standard system calls
-AC_CHECK_FUNCS([accept4 dup3 eventfd vmsplice sched_getaffinity])
+AC_CHECK_FUNCS([accept4 dup3 pipe2 eventfd vmsplice sched_getaffinity])
AH_BOTTOM([#include <vlc_fixups.h>])
dnl Some plugins aren't useful on some platforms
dnl
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([dynamicoverlay])
+ VLC_ADD_PLUGIN([dynamicoverlay access_shm])
elif test "${SYS}" != "mingwce"; then
VLC_ADD_PLUGIN([access_smb dmo globalhotkeys])
VLC_ADD_LIBS([dmo],[-lole32 -luuid])
CFLAGS_TUNING="-mtune=${with_tuning}"
fi
else
- if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then
+ if test "${SYS}" = "darwin" -a "${host_cpu}" = "i686"; then
CFLAGS_TUNING="-march=prescott -mtune=generic"
+ elif test "${SYS}" = "darwin" -a "${host_cpu}" = "x86_64"; then
+ CFLAGS_TUNING="-march=core2 -mtune=core2"
elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then
CFLAGS_TUNING="-mtune=pentium2"
elif test "${host_cpu}" = "x86_64"; then
dnl
dnl - special access module for dc1394 input
dnl - dv module: digital video module check for libraw1394
+dnl - linsys modules: access module check for libzvbi
dnl
PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], [dc1394 access module], [auto])
PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto])
+AC_ARG_ENABLE(linsys,
+ [ --enable-linsys Linux Linear Systems Ltd. SDI and HD-SDI input cards (default enabled)])
+case "${SYS}" in
+ linux*)
+if test "${enable_linsys}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+ VLC_ADD_PLUGIN([linsys_hdsdi])
+ PKG_CHECK_MODULES(LINSYS_SDI, zvbi-0.2 >= 0.2.28,
+ [ VLC_ADD_LIBS([linsys_sdi],[$LINSYS_SDI_LIBS])
+ VLC_ADD_CFLAGS([linsys_sdi],[$LINSYS_SDI_CFLAGS])
+ VLC_ADD_PLUGIN([linsys_sdi]) ],
+ [AC_MSG_WARN([Couldn't find zvbi >= 0.2.28, install libzvbi-dev ?])]
+ )
+fi
+;;
+esac
+
dnl
dnl dvdread module: check for libdvdread
dnl
if test "${enable_pvr}" = "yes"
then
VLC_ADD_PLUGIN([pvr])
- AC_ARG_WITH(videodev2,
- [ --with-videodev2=FILE Location of videodev2.h file (default /usr/include/linux/videodev2.h)],[],[])
- if test "${with_videodev2}" != "no" -a -n "${with_videodev2}"
- then
- AC_DEFINE_UNQUOTED(VIDEODEV2_H_FILE, "${with_videodev2}", [Location of videodev2.h])
- fi
-
- AC_CACHE_CHECK([for new linux/videodev2.h],
- [ac_cv_new_linux_videodev2_h],
- [AC_TRY_COMPILE([
- #include <sys/types.h>
- # ifdef VIDEODEV2_H_FILE
- # include VIDEODEV2_H_FILE
- # else
- # include <linux/videodev2.h>
- # endif
- ],
- [struct v4l2_ext_controls ctrls; ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG; ],
- ac_cv_new_linux_videodev2_h=yes,
- ac_cv_new_linux_videodev2_h=no)])
- if test "${ac_cv_new_linux_videodev2_h}" != "no"; then
- AC_DEFINE(HAVE_NEW_LINUX_VIDEODEV2_H, 1, [Define if new linux/videodev2.h present])
- fi
fi
dnl
AC_CHECK_LIB(ebml_pic, main, [
VLC_ADD_PLUGIN([mkv])
VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic])
- ],
+ ],[
AC_CHECK_LIB(ebml, main, [
VLC_ADD_PLUGIN([mkv])
VLC_ADD_LIBS([mkv],[-lmatroska -lebml])
])
- )
- ],
- [AC_MSG_RESULT([no])
+ ])
+ ], [
+ AC_MSG_RESULT([no])
AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.])
])
])
AC_ARG_ENABLE(crystalhd,
[ --enable-crystalhd crystalhd codec plugin (default disabled)])
if test "${enable_crystalhd}" == "yes"; then
- AC_CHECK_HEADERS(libcrystalhd/libcrystalhd_if.h, [
+ AC_CHECK_HEADER(libcrystalhd/libcrystalhd_if.h, [
VLC_ADD_PLUGIN([crystalhd])
VLC_ADD_LIBS([crystalhd], [-lcrystalhd])
],[
AC_MSG_ERROR("Could not find CrystalHD development headers")
])
fi
- ])
+ ],[#define __LINUX_USER__
+ #include <libcrystalhd/bc_dts_types.h>
+ ])
fi
dnl
dnl
dnl UPnP Plugin (Intel SDK)
dnl
-PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto])
-VLC_ADD_CXXFLAGS([upnp_intel],[${UPNP_CFLAGS}])
+PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPnp SDK],[auto])
+VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}])
dnl
dnl Interface plugins
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit])
VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle])
VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle])
+ VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/BWToolKit -Wl,-framework,BWToolKitFramework])
+ VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/BWToolKit])
dnl For bug report
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
VLC_ADD_PLUGIN([media_library])
fi
fi
+AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" = "yes"])
dnl
dnl Endianness check
modules/misc/playlist/Makefile
modules/misc/osd/Makefile
modules/misc/stats/Makefile
- modules/misc/xml/Makefile
modules/media_library/Makefile
modules/mux/Makefile
modules/mux/mpeg/Makefile
projects / vlc / blobdiff