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 setlocale stricmp strnicmp uselocale])
-AC_REPLACE_FUNCS([asprintf atof atoll dirfd 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_REPLACE_FUNCS([asprintf atof atoll dirfd flockfile 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.])
])
dnl Check for dynamic plugins
ac_cv_have_plugins=no
-# HP-UX style
-if test "${ac_cv_have_plugins}" = "no"; then
- AC_CHECK_HEADERS(dl.h)
- ac_cv_my_have_shl_load=no
- AC_CHECK_FUNC(shl_load,
- [ac_cv_my_have_shl_load=yes,
- AC_CHECK_LIB(dld, shl_load,
- [ac_cv_my_have_shl_load=yes
- VLC_ADD_LIBS([libvlccore],[-ldld])])])
- if test "${ac_cv_my_have_shl_load}" = "yes"; then
- AC_DEFINE(HAVE_DL_SHL_LOAD, 1, [Define if you have the shl_load API])
- ac_cv_have_plugins=yes
- fi
-fi
-
# Win32 style
if test "${ac_cv_have_plugins}" = "no"; then
if test "${SYS}" = "mingw32" ; then
RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
RDC_PROG_CC_FLAGS([-pipe])
+AC_LANG_PUSH([C++])
+RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var])
+AC_LANG_POP([C++])
dnl
dnl Debugging mode
AS_IF([test "${ac_cv_c_mmx_intrinsics}" != "no"], [
AC_DEFINE(HAVE_MMX_INTRINSICS, 1,
[Define to 1 if MMX intrinsics are available.])
- MMX_CFLAGS="-mmmx"
])
AC_CACHE_CHECK([if $CC groks MMX inline assembly],
have_mmxext="yes"
])
])
-AC_SUBST(MMX_CFLAGS)
AM_CONDITIONAL([HAVE_MMX], [test "${have_mmx}" = "yes"])
AM_CONDITIONAL([HAVE_MMXEXT], [test "${have_mmxext}" = "yes"])
[AS_HELP_STRING([--disable-sse],
[disable SSE (1-4) optimizations (default auto)])],, [
case "${host_cpu}" in
- i686|x86_64)
+ i?86|x86_64)
enable_sse=yes
;;
*)
AS_IF([test "${ac_cv_c_sse2_intrinsics}" != "no"], [
AC_DEFINE(HAVE_SSE2_INTRINSICS, 1,
[Define to 1 if SSE2 intrinsics are available.])
- SSE2_CFLAGS="-msse2"
])
AC_CACHE_CHECK([if $CC groks SSE inline assembly],
AC_DEFINE(CAN_COMPILE_SSE4A, 1,
[Define to 1 if SSE4A inline assembly is available.]) ])
])
-AC_SUBST(SSE2_CFLAGS)
AM_CONDITIONAL([HAVE_SSE2], [test "$have_sse2" = "yes"])
have_3dnow="no"
dnl
dnl Blu-ray Disc Support with libbluray
dnl
-PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2 ], (libbluray for Blu-ray disc support ) )
+PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2 libxml-2.0 >= 2.6 ], (libbluray for Blu-ray disc support ) )
dnl
dnl OpenCV wrapper and example filters
dnl
dnl libdvbpsi check for ts mux/demux
dnl
-PKG_WITH_MODULES([DVBPSI], [libdvbpsi],
- VLC_ADD_PLUGIN([ts])
- VLC_ADD_LIBS([ts],[-ldvbpsi])
-if test "${enable_sout}" != "no"; then
- VLC_ADD_PLUGIN([mux_ts])
- VLC_ADD_LIBS([mux_ts],[-ldvbpsi])
-fi
-)
+have_dvbpsi="no"
+PKG_WITH_MODULES([DVBPSI], [libdvbpsi], [have_dvbpsi="yes"])
+AM_CONDITIONAL(HAVE_DVBPSI, [test "${have_dvbpsi}" = "yes"])
dnl
dnl Screen capture module
dnl freetype module
dnl
AC_ARG_ENABLE(freetype,
- [ --enable-freetype freetype support (default enabled)])
+ [ --enable-freetype freetype support (default auto)])
AC_ARG_ENABLE(fribidi,
- [ --enable-fribidi fribidi support (default enabled)])
+ [ --enable-fribidi fribidi support (default auto)])
AC_ARG_ENABLE(fontconfig,
- [ --enable-fontconfig fontconfig support (default enabled)])
+ [ --enable-fontconfig fontconfig support (default auto)])
+
if test "${enable_freetype}" != "no"; then
- PKG_CHECK_MODULES(FREETYPE, freetype2,[
- VLC_ADD_PLUGIN([freetype])
+ PKG_CHECK_MODULES(FREETYPE, freetype2, [
have_freetype=yes
+ VLC_ADD_PLUGIN([freetype])
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([freetype],[-liconv -lz])
fi
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
+ AC_CHECK_HEADERS(Carbon/Carbon.h,
+ [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
+
+ dnl fontconfig support
if test "${SYS}" != "mingw32"; then
if test "${enable_fontconfig}" != "no"; then
- AC_CHECK_HEADERS(fontconfig/fontconfig.h,
- [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
- VLC_ADD_LIBS([freetype],[-lfontconfig])])
- AC_CHECK_HEADERS(Carbon/Carbon.h,
- [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
+ AC_CHECK_HEADERS(fontconfig/fontconfig.h, [
+ VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
+ VLC_ADD_LIBS([freetype],[-lfontconfig])
+ ],[AC_MSG_WARN([library fontconfig not found. Styles will be disabled in freetype])])
fi
else
VLC_ADD_LIBS([freetype],[-lgdi32])
fi
dnl fribidi support
- if test "${enable_fribidi}" != "no"
- then
+ if test "${enable_fribidi}" != "no"; then
PKG_CHECK_MODULES(FRIBIDI, fribidi, [
VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI])
VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}])
- ])
+ ],[AC_MSG_WARN([library fribidi not found. Bidirectional support will be disabled in freetype])])
fi
],[
have_freetype=no
- AS_IF([ test "${enable_freetype}" = "yes"],[
- AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
-from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
- ])
+ AS_IF([ test "${enable_freetype}" = "yes"],[
+ AC_MSG_ERROR([Freetype2 package cannot be detected. Install Freetype2 development or configure with --disable-freetype.])
])
])
-
fi
dnl