Commit a1c0ebc3 authored by cypherpunks's avatar cypherpunks Committed by Nick Mathewson
Browse files

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.
parent dee0b869
...@@ -38,6 +38,7 @@ uptime-*.json ...@@ -38,6 +38,7 @@ uptime-*.json
/Makefile /Makefile
/Makefile.in /Makefile.in
/aclocal.m4 /aclocal.m4
/ar-lib
/autom4te.cache /autom4te.cache
/build-stamp /build-stamp
/compile /compile
......
...@@ -171,10 +171,7 @@ AC_ARG_ENABLE(libscrypt, ...@@ -171,10 +171,7 @@ AC_ARG_ENABLE(libscrypt,
AS_HELP_STRING(--disable-libscrypt, [do not attempt to use libscrypt])) AS_HELP_STRING(--disable-libscrypt, [do not attempt to use libscrypt]))
dnl check for the correct "ar" when cross-compiling dnl check for the correct "ar" when cross-compiling
AN_MAKEVAR([AR], [AC_PROG_AR]) AM_PROG_AR
AN_PROGRAM([ar], [AC_PROG_AR])
AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL([AR], [ar], [ar])])
AC_PROG_AR
dnl Check whether the above macro has settled for a simply named tool even 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, dnl though we're cross compiling. We must do this before running AC_PROG_CC,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment