aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--configure.ac5
2 files changed, 2 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index dc6738c079..ef35175690 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 130ec0964d..44f7fe675c 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,