From: Bruno Haible Date: Mon, 24 Feb 2020 20:19:28 +0000 (+0100) Subject: getloadavg: Don't use /usr/local when cross-compiling on AIX. X-Git-Tag: v1.0~4196 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d279bc6d9f9323e19ad8c32b6d12ff96dfb0f5ba;p=gnulib.git getloadavg: Don't use /usr/local when cross-compiling on AIX. Reported by Jens Rehsack in . * m4/getloadavg.m4 (gl_GETLOADAVG): Don't look in /usr/local/lib when cross-compiling. --- diff --git a/ChangeLog b/ChangeLog index b3856c2937..067e41956f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2020-02-24 Bruno Haible + + getloadavg: Don't use /usr/local when cross-compiling on AIX. + Reported by Jens Rehsack in + . + * m4/getloadavg.m4 (gl_GETLOADAVG): Don't look in /usr/local/lib when + cross-compiling. + 2020-02-24 Bruno Haible fcntl: Add witness of gnulib override. diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 3bd2a142e7..8e96965d82 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -7,7 +7,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 8 +#serial 9 # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. # New applications should use gl_GETLOADAVG instead. @@ -45,7 +45,9 @@ AC_CHECK_FUNC([getloadavg], [], # There is a commonly available library for RS/6000 AIX. # Since it is not a standard part of AIX, it might be installed locally. gl_getloadavg_LIBS=$LIBS - LIBS="-L/usr/local/lib $LIBS" + if test $cross_compiling != yes; then + LIBS="-L/usr/local/lib $LIBS" + fi AC_CHECK_LIB([getloadavg], [getloadavg], [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], [LIBS=$gl_getloadavg_LIBS])