From 21c3d05ca705daa62ec4c7444e67af48ba757c18 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 2 Sep 2011 22:00:24 +0200 Subject: [PATCH] Find 'ar' program that fits with --host argument. * m4/gnulib-common.m4 (gl_PROG_AR_RANLIB): Use AC_CHECK_TOOL. --- ChangeLog | 5 +++++ m4/gnulib-common.m4 | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2d7cb1c7..f2a4eaac3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-09-02 Bruno Haible + Find 'ar' program that fits with --host argument. + * m4/gnulib-common.m4 (gl_PROG_AR_RANLIB): Use AC_CHECK_TOOL. + +2011-09-02 Bruno Haible + tests: init.sh: Support any non-GNU diff. * tests/init.sh (compare): If "diff -c" is supported but "diff -u" is not, use "diff -c". Useful on AIX 6.1, HP-UX 11.31, OSF/1 5.1, diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 9dc8fbe8e..1e87b11e8 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 29 +# gnulib-common.m4 serial 30 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -230,8 +230,9 @@ Amsterdam ARFLAGS='-o' RANLIB=':' ], - [dnl Use the Automake-documented default values for AR and ARFLAGS. - AR='ar' + [dnl Use the Automake-documented default values for AR and ARFLAGS, + dnl but prefer ${host}-ar over ar (useful for cross-compiling). + AC_CHECK_TOOL([AR], [ar], [ar]) ARFLAGS='cru' dnl Use the ranlib program if it is available. AC_PROG_RANLIB -- 2.11.0