Merge branch 'feature/upstream' into develop

1 files changed, 12 insertions, 60 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index b071866d..aac526bd 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -505,66 +505,6 @@ m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_AR([ACT-IF-FAIL])
-# -------------------------
-# Try to determine the archiver interface, and trigger the ar-lib wrapper
-# if it is needed.  If the detection of archiver interface fails, run
-# ACT-IF-FAIL (default is to abort configure with a proper error message).
-AC_DEFUN([AM_PROG_AR],
-[AC_BEFORE([$0], [LT_INIT])dnl
-AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([ar-lib])dnl
-AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
-: ${AR=ar}
-
-AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
-  [AC_LANG_PUSH([C])
-   am_cv_ar_interface=ar
-   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
-     [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([am_ar_try])
-      if test "$ac_status" -eq 0; then
-        am_cv_ar_interface=ar
-      else
-        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
-        AC_TRY_EVAL([am_ar_try])
-        if test "$ac_status" -eq 0; then
-          am_cv_ar_interface=lib
-        else
-          am_cv_ar_interface=unknown
-        fi
-      fi
-      rm -f conftest.lib libconftest.a
-     ])
-   AC_LANG_POP([C])])
-
-case $am_cv_ar_interface in
-ar)
-  ;;
-lib)
-  # Microsoft lib, so override with the ar-lib wrapper script.
-  # FIXME: It is wrong to rewrite AR.
-  # But if we don't then we get into trouble of one sort or another.
-  # A longer-term fix would be to have automake use am__AR in this case,
-  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
-  # similar.
-  AR="$am_aux_dir/ar-lib $AR"
-  ;;
-unknown)
-  m4_default([$1],
-             [AC_MSG_ERROR([could not determine $AR interface])])
-  ;;
-esac
-AC_SUBST([AR])dnl
-])
-
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
 # Copyright (C) 2001-2014 Free Software Foundation, Inc.
@@ -1691,7 +1631,9 @@ AC_SUBST([am__untar])
 m4_include([gnulib-m4/00gnulib.m4])
 m4_include([gnulib-m4/absolute-header.m4])
 m4_include([gnulib-m4/alloca.m4])
+m4_include([gnulib-m4/asm-underscore.m4])
 m4_include([gnulib-m4/btowc.m4])
+m4_include([gnulib-m4/builtin-expect.m4])
 m4_include([gnulib-m4/codeset.m4])
 m4_include([gnulib-m4/configmake.m4])
 m4_include([gnulib-m4/ctype.m4])
@@ -1720,6 +1662,7 @@ m4_include([gnulib-m4/glibc21.m4])
 m4_include([gnulib-m4/gnulib-common.m4])
 m4_include([gnulib-m4/gnulib-comp.m4])
 m4_include([gnulib-m4/hard-locale.m4])
+m4_include([gnulib-m4/host-cpu-c-abi.m4])
 m4_include([gnulib-m4/iconv.m4])
 m4_include([gnulib-m4/iconv_h.m4])
 m4_include([gnulib-m4/iconv_open.m4])
@@ -1730,6 +1673,7 @@ m4_include([gnulib-m4/intmax_t.m4])
 m4_include([gnulib-m4/inttypes-pri.m4])
 m4_include([gnulib-m4/inttypes.m4])
 m4_include([gnulib-m4/inttypes_h.m4])
+m4_include([gnulib-m4/isblank.m4])
 m4_include([gnulib-m4/isnand.m4])
 m4_include([gnulib-m4/isnanf.m4])
 m4_include([gnulib-m4/isnanl.m4])
@@ -1772,12 +1716,18 @@ m4_include([gnulib-m4/off_t.m4])
 m4_include([gnulib-m4/printf-frexp.m4])
 m4_include([gnulib-m4/printf-frexpl.m4])
 m4_include([gnulib-m4/printf.m4])
+m4_include([gnulib-m4/pthread_rwlock_rdlock.m4])
+m4_include([gnulib-m4/pthread_sigmask.m4])
 m4_include([gnulib-m4/putenv.m4])
+m4_include([gnulib-m4/raise.m4])
 m4_include([gnulib-m4/relocatable-lib.m4])
 m4_include([gnulib-m4/setenv.m4])
 m4_include([gnulib-m4/setlocale.m4])
+m4_include([gnulib-m4/signal_h.m4])
+m4_include([gnulib-m4/signalblocking.m4])
 m4_include([gnulib-m4/signbit.m4])
 m4_include([gnulib-m4/size_max.m4])
+m4_include([gnulib-m4/sleep.m4])
 m4_include([gnulib-m4/ssize_t.m4])
 m4_include([gnulib-m4/stdalign.m4])
 m4_include([gnulib-m4/stdbool.m4])
@@ -1794,7 +1744,9 @@ m4_include([gnulib-m4/sys_socket_h.m4])
 m4_include([gnulib-m4/sys_types_h.m4])
 m4_include([gnulib-m4/thread.m4])
 m4_include([gnulib-m4/threadlib.m4])
+m4_include([gnulib-m4/time_h.m4])
 m4_include([gnulib-m4/unistd_h.m4])
+m4_include([gnulib-m4/usleep.m4])
 m4_include([gnulib-m4/vasnprintf.m4])
 m4_include([gnulib-m4/warn-on-use.m4])
 m4_include([gnulib-m4/wchar_h.m4])