Fix Metacube header handling with multiple header blocks.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2c5af8e7df1cbdef5237023849d60532b0719636..0d7e48aea9caf8b189a8e2801795101f9be55298 100644 (file)
--- 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,7 +547,7 @@ 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.])
 ])
@@ -564,6 +555,8 @@ AC_CHECK_FUNCS(fdatasync,,
 dnl mingw64 implements those as static inline, not functions with C linkage
 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])