[tor-commits] [tor/master] Use AM_PROG_AR to improve portability

[nickm at torproject.org]

commit a1c0ebc3ebc49924fa38dd4f60d89204208aacc8
Author: cypherpunks <cypherpunks at torproject.org>
Date:   Thu Dec 15 16:15:42 2016 +0000

    Use AM_PROG_AR to improve portability
    
    Turning on warnings in Automake makes it complain about not using the
    AM_PROG_AR macro. The AM_PROG_AR macro is required when LIBRARIES or
    LTLIBRARIES is used.
    
    The macro looks for an archiver and wraps it in the ar-lib script which
    is automatically generated so Git should ignore it.
    
    It makes the custom check for 'ar' obsolete so it is removed.
    
    The AM_PROG_AR macro was added in Automake 1.11.2 thus the minimum
    Automake version is increased.
---
 .gitignore   | 1 +
 configure.ac | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc6738c..ef35175 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ uptime-*.json
 /Makefile
 /Makefile.in
 /aclocal.m4
+/ar-lib
 /autom4te.cache
 /build-stamp
 /compile
diff --git a/configure.ac b/configure.ac
index 130ec09..44f7fe6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -171,10 +171,7 @@ AC_ARG_ENABLE(libscrypt,
      AS_HELP_STRING(--disable-libscrypt, [do not attempt to use libscrypt]))
 
 dnl check for the correct "ar" when cross-compiling
-AN_MAKEVAR([AR], [AC_PROG_AR])
-AN_PROGRAM([ar], [AC_PROG_AR])
-AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])])
-AC_PROG_AR
+AM_PROG_AR
 
 dnl Check whether the above macro has settled for a simply named tool even
 dnl though we're cross compiling. We must do this before running AC_PROG_CC,