mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

Update from Gnulib

Browse source 
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.
This commit is contained in:
Paul Eggert 2020-02-24 17:55:00 -08:00
parent 72cf60e9dc
commit a3d146fd8a
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/fcntl.in.h
View file

@ -116,9 +116,15 @@ _GL_WARN_ON_USE (creat, "creat is not always POSIX compliant - "
# endif # endif
_GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...)); _GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...));
_GL_CXXALIAS_RPL (fcntl, int, (int fd, int action, ...)); _GL_CXXALIAS_RPL (fcntl, int, (int fd, int action, ...));
# if !GNULIB_defined_rpl_fcntl
# define GNULIB_defined_rpl_fcntl 1
# endif
# else # else
# if !@HAVE_FCNTL@ # if !@HAVE_FCNTL@
_GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...)); _GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...));
# if !GNULIB_defined_fcntl
# define GNULIB_defined_fcntl 1
# endif
# endif # endif
_GL_CXXALIAS_SYS (fcntl, int, (int fd, int action, ...)); _GL_CXXALIAS_SYS (fcntl, int, (int fd, int action, ...));
# endif # endif

6
m4/getloadavg.m4
View file

@ -7,7 +7,7 @@
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
#serial 8 #serial 9
# Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent.
# New applications should use gl_GETLOADAVG instead. # 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. # There is a commonly available library for RS/6000 AIX.
# Since it is not a standard part of AIX, it might be installed locally. # Since it is not a standard part of AIX, it might be installed locally.
gl_getloadavg_LIBS=$LIBS 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], AC_CHECK_LIB([getloadavg], [getloadavg],
[LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes],
[LIBS=$gl_getloadavg_LIBS]) [LIBS=$gl_getloadavg_LIBS])