Merge tag 'upstream/0.9.7'

Upstream version 0.9.7

1 files changed, 70 insertions, 3 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index d95b746..b071866 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -16,18 +16,18 @@ m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 
 # po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
-dnl This file can can be used in projects which are not available under
+dnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
 dnl License but which still want to provide support for the GNU gettext
 dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered
 dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
+dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
 dnl Authors:
@@ -505,6 +505,66 @@ 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.
@@ -1634,6 +1694,9 @@ m4_include([gnulib-m4/alloca.m4])
 m4_include([gnulib-m4/btowc.m4])
 m4_include([gnulib-m4/codeset.m4])
 m4_include([gnulib-m4/configmake.m4])
+m4_include([gnulib-m4/ctype.m4])
+m4_include([gnulib-m4/dirname.m4])
+m4_include([gnulib-m4/double-slash-root.m4])
 m4_include([gnulib-m4/eealloc.m4])
 m4_include([gnulib-m4/environ.m4])
 m4_include([gnulib-m4/errno_h.m4])
@@ -1645,15 +1708,18 @@ m4_include([gnulib-m4/extensions.m4])
 m4_include([gnulib-m4/extern-inline.m4])
 m4_include([gnulib-m4/fcntl-o.m4])
 m4_include([gnulib-m4/fdopen.m4])
+m4_include([gnulib-m4/flexmember.m4])
 m4_include([gnulib-m4/float_h.m4])
 m4_include([gnulib-m4/fpieee.m4])
 m4_include([gnulib-m4/frexp.m4])
 m4_include([gnulib-m4/frexpl.m4])
 m4_include([gnulib-m4/fseterr.m4])
 m4_include([gnulib-m4/getpagesize.m4])
+m4_include([gnulib-m4/getprogname.m4])
 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/iconv.m4])
 m4_include([gnulib-m4/iconv_h.m4])
 m4_include([gnulib-m4/iconv_open.m4])
@@ -1675,6 +1741,7 @@ m4_include([gnulib-m4/lib-ld.m4])
 m4_include([gnulib-m4/lib-link.m4])
 m4_include([gnulib-m4/lib-prefix.m4])
 m4_include([gnulib-m4/libunistring-base.m4])
+m4_include([gnulib-m4/limits-h.m4])
 m4_include([gnulib-m4/localcharset.m4])
 m4_include([gnulib-m4/locale-ar.m4])
 m4_include([gnulib-m4/locale-fr.m4])