From 90cec63a53de3bd667e80b2479fe4a9ee077655b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 31 Jul 2015 18:59:24 +0200
Subject: [PATCH] Don't use "u" option with ar(1).

It seems like it was never really needed as we always delete the archive
before creating it anyhow and there is no advantage in "updating" it if it
doesn't exist. Worse, with recent ar versions (like the one from binutils 2.25
in Debian Sid), using "u" results in a somewhat unclear warning

ar: `u' modifier ignored since `D' is the default (see `U')

so just get rid of it to avoid the warning.

(cherry picked from commit 004b5a4f49edb895a459ad98a00616aa5d303d7c)
---
 build/aclocal/bakefile.m4 | 2 +-
 configure                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
index 6c0d8d7b8a..05519667ca 100644
--- a/build/aclocal/bakefile.m4
+++ b/build/aclocal/bakefile.m4
@@ -626,7 +626,7 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
         AC_SUBST(AR)
     else
         AC_CHECK_TOOL(AR, ar, ar)
-        AROPTIONS=rcu
+        AROPTIONS=rc
     fi
     AC_SUBST(AROPTIONS)
 
diff --git a/configure b/configure
index 4c0f1e8c27..b9c7bd4c8f 100755
--- a/configure
+++ b/configure
@@ -38234,7 +38234,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-        AROPTIONS=rcu
+        AROPTIONS=rc
     fi