summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Allbery <eagle@eyrie.org>2014-01-06 21:09:35 -0800
committerRuss Allbery <rra@stanford.edu>2014-01-06 21:13:44 -0800
commit7fd8aa28621d8a67e6d85e6571958b47eaffcc47 (patch)
tree2605fe45cea230c713b47ac21ae0f975a24259db
parent782e71d568957e05233f63fa8dca7cc53ba1afa1 (diff)
Add AM_PROG_AR to configure.ac for newer Automake
Change-Id: I422a014c3a2611324c2cdebd364d81f2e91aadd7 Reviewed-on: https://gerrit.stanford.edu/1370 Reviewed-by: Russ Allbery <rra@stanford.edu> Tested-by: Russ Allbery <rra@stanford.edu>
-rw-r--r--configure.ac5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index bb78702..5ae5828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Autoconf configuration for wallet.
dnl
dnl Written by Russ Allbery <rra@stanford.edu>
-dnl Copyright 2006, 2007, 2008, 2010, 2013
+dnl Copyright 2006, 2007, 2008, 2010, 2013, 2014
dnl The Board of Trustees of the Leland Stanford Junior University
dnl
dnl See LICENSE for licensing terms.
@@ -15,9 +15,12 @@ AM_INIT_AUTOMAKE([1.11 check-news dist-xz foreign silent-rules subdir-objects
-Wall -Wno-override -Werror])
AM_MAINTAINER_MODE
+dnl AM_PROG_AR is required for Automake 1.12 by Libtool but not defined at all
+dnl (or needed) in Automake 1.11. Work around this bug.
AC_PROG_CC
AC_USE_SYSTEM_EXTENSIONS
AM_PROG_CC_C_O
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_PROG_INSTALL
AC_PROG_RANLIB