diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-02-24 17:55:00 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-02-24 17:55:39 -0800 |
| commit | a3d146fd8a6e8e2301edd2c9e95640fa346fb9d8 (patch) | |
| tree | ca1cd8fa5e55556f76e85fb95070b19c807a7e4c /m4 | |
| parent | 72cf60e9dc8bcfa05157e6f5909c61037c3f7b0f (diff) | |
| download | emacs-a3d146fd8a6e8e2301edd2c9e95640fa346fb9d8.tar.gz | |
Update from Gnulib
This incorporates:
2020-02-24 getloadavg: don't use /usr/local when cross-compiling on AIX
2020-02-24 fcntl: add witness of gnulib override
* lib/fcntl.in.h, m4/getloadavg.m4: Copy from Gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/getloadavg.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 3bd2a142e73..8e96965d828 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]) |