X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=0d7e48aea9caf8b189a8e2801795101f9be55298;hb=cd273368d7f6ce512876dbf98de6a08200b69a7d;hp=72c5341434177025fab2c312daae39da4ea174f4;hpb=300ce853046238cb4a75b9af0f41d535e40b2d33;p=vlc

diff --git a/configure.ac b/configure.ac
index 72c5341434..0d7e48aea9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,17 +27,8 @@ AC_PRESERVE_HELP_ORDER
 AM_INIT_AUTOMAKE(tar-ustar color-tests foreign)
 AC_CONFIG_HEADERS([config.h])
 
-# Disable with "./configure --disable-silent-rules" or "make V=1"
 AM_SILENT_RULES([yes])
-
-dnl Too many people are not aware of maintainer mode:
-dnl If you want to use it, you definitely know what you are doing, so
-dnl you can specify "--disable-maintainer-mode". But if you want the default
-dnl automake behavior, you've likely never heard of maintainer mode, so we
-dnl can't expect you to enable it manually.
-AS_IF([test "x${enable_maintainer_mode}" != "xno"],
-    [enable_maintainer_mode="yes"])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 
 dnl
 dnl Directories
@@ -556,26 +547,16 @@ need_libc=false
 dnl Check for usual libc functions
 AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
 AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale pthread_cond_timedwait_monotonic_np pthread_condattr_setclock])
-AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp])
+AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid lldiv nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp])
 AC_CHECK_FUNCS(fdatasync,,
   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
 ])
 
 dnl mingw64 implements those as static inline, not functions with C linkage
-AC_LINK_IFELSE([
-    AC_LANG_PROGRAM([#include <stdio.h>], [
-        char *c;
-        if (asprintf(&c, "%s %d", "string", 1) == -1)
-            c = NULL;
-    ])],[AC_DEFINE([HAVE_ASPRINTF],[1],[Define to 1 if you have asprintf function])],[AC_LIBOBJ([asprintf])])
-AC_LINK_IFELSE([
-    AC_LANG_PROGRAM([#include <stdio.h>
-                     #include <stdarg.h>], [
-        char *c;
-        va_list ap;
-        if (vasprintf(&c, "%s %d", ap) == -1)
-            c = NULL;
-    ])],[AC_DEFINE([HAVE_VASPRINTF],[1],[Define to 1 if you have asprintf function])],[AC_LIBOBJ([vasprintf])])
+VLC_REPLACE_DECL([asprintf], [#include <stdio.h>])
+VLC_REPLACE_DECL([vasprintf], [#include <stdio.h>])
+VLC_REPLACE_DECL([gmtime_r], [#include <time.h>])
+VLC_REPLACE_DECL([localtime_r], [#include <time.h>])
 
 dnl C11 static_assert()
 AC_MSG_CHECKING([for static_assert in assert.h])
@@ -1973,7 +1954,7 @@ dnl
 dnl  libdvbpsi check for ts mux/demux
 dnl
 have_dvbpsi="no"
-PKG_WITH_MODULES([DVBPSI], [libdvbpsi], [have_dvbpsi="yes"])
+PKG_WITH_MODULES([DVBPSI], [libdvbpsi >= 1.0.0], [have_dvbpsi="yes"])
 AM_CONDITIONAL(HAVE_DVBPSI, [test "${have_dvbpsi}" = "yes"])
 
 
@@ -3036,9 +3017,9 @@ AS_IF([test "${have_vdpau}" = "yes" -a "${have_avcodec}" = "yes"], [
     AC_MSG_NOTICE([VDPAU decoding acceleration activated])
   ], [
     AS_IF([test -n "${enable_vdpau}"], [
-      AC_MSG_ERROR([libavutil >= 52.4.0 and libavcodec >= 55.26.0 are required for VDPAU decoding.])
+      AC_MSG_ERROR([libav libavutil >= 52.4.0 and libavcodec >= 55.26.0 are required for VDPAU decoding.])
     ], [
-      AC_MSG_WARN([libavutil >= 52.4.0 and libavcodec >= 55.26.0 are required for VDPAU decoding.])
+      AC_MSG_WARN([libav libavutil >= 52.4.0 and libavcodec >= 55.26.0 are required for VDPAU decoding.])
     ])
   ])
 ])
@@ -3155,9 +3136,6 @@ if test "${enable_freetype}" != "no"; then
       VLC_ADD_CPPFLAGS([skins2],[${FREETYPE_CFLAGS}])
       VLC_ADD_LIBS([skins2],[${FREETYPE_LIBS}])
 
-      AC_CHECK_HEADERS(Carbon/Carbon.h,
-                       [VLC_ADD_LIBS([freetype],[-Wl,-framework,Carbon])])
-
       dnl fontconfig support
       if test "${SYS}" != "mingw32"; then
           if test "${enable_fontconfig}" != "no"; then
@@ -3244,7 +3222,12 @@ AS_IF([test "${enable_directx}" != "no"], [
     #include <GL/gl.h>
   ])
 
-  dnl Direct3D
+  dnl Direct3D11
+  AC_CHECK_HEADERS(d3d11.h, [
+    VLC_ADD_PLUGIN([direct3d11])
+  ])
+
+  dnl Direct3D9
   AC_CHECK_HEADERS(d3d9.h, [
     VLC_ADD_PLUGIN([direct3d9])
   ])