From e92b57f38848c2364b753c02b8e40d0b13204acd Mon Sep 17 00:00:00 2001
From: Klas Lindfors <klas@yubico.com>
Date: Wed, 7 Nov 2012 08:26:24 +0100
Subject: [PATCH] add AM_PROG_AR workaround for automake 1.12.

---
 README       | 4 ----
 configure.ac | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/README b/README
index a4770bc..1c17fce 100644
--- a/README
+++ b/README
@@ -59,10 +59,6 @@ Generate the build system using:
    $ autoreconf --install
 ------
 
-If you get "linking libraries using a non-POSIX archiver requires 'AM_PROG_AR' in 'configure.ac'"
-you're probably using automake 1.12, use 1.11 or add -Wno-extra-portability in configure.ac. Adding
-this breaks compability with automake before 1.11.2.
-
 
 Building
 --------
diff --git a/configure.ac b/configure.ac
index d82362b..4ee4695 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,11 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.10 foreign -Wall -Werror])
 AM_SILENT_RULES([yes])
 AM_PROG_CC_C_O
+
+# needed for automake 1.12 and other workarounds break 1.11...
+m4_pattern_allow([AM_PROG_AR])
+AM_PROG_AR
+
 AC_LIBTOOL_WIN32_DLL
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL