diff options
| author | Paul Eggert | 2011-05-29 14:52:18 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-29 14:52:18 -0700 |
| commit | 6a3e57bb546b094bfc8ec24a3ec63b2bd4496d65 (patch) | |
| tree | 7941b467caf44ec0c4297e4a6afb1b4ab3f0b9a0 /m4 | |
| parent | e8cbec34e8ef069f54c1189a7b6109f768047be8 (diff) | |
| download | emacs-6a3e57bb546b094bfc8ec24a3ec63b2bd4496d65.tar.gz emacs-6a3e57bb546b094bfc8ec24a3ec63b2bd4496d65.zip | |
Adjust to recent gnulib change for @GUARD_PREFIX@.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/getloadavg.m4 | 10 | ||||
| -rw-r--r-- | m4/gl-comp.m4 | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index e58d29b238f..0e44b694e40 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 | |||
| @@ -7,23 +7,19 @@ | |||
| 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
| 8 | # with or without modifications, as long as this notice is preserved. | 8 | # with or without modifications, as long as this notice is preserved. |
| 9 | 9 | ||
| 10 | #serial 2 | 10 | #serial 3 |
| 11 | 11 | ||
| 12 | # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. | 12 | # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. |
| 13 | # New applications should use gl_GETLOADAVG instead. | 13 | # New applications should use gl_GETLOADAVG instead. |
| 14 | 14 | ||
| 15 | # gl_GETLOADAVG(LIBOBJDIR) | 15 | # gl_GETLOADAVG |
| 16 | # ------------------------ | 16 | # ------------- |
| 17 | AC_DEFUN([gl_GETLOADAVG], | 17 | AC_DEFUN([gl_GETLOADAVG], |
| 18 | [AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) | 18 | [AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) |
| 19 | 19 | ||
| 20 | # Persuade glibc <stdlib.h> to declare getloadavg(). | 20 | # Persuade glibc <stdlib.h> to declare getloadavg(). |
| 21 | AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) | 21 | AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) |
| 22 | 22 | ||
| 23 | # Make sure getloadavg.c is where it belongs, at configure-time. | ||
| 24 | test -f "$srcdir/$1/getloadavg.c" || | ||
| 25 | AC_MSG_ERROR([$srcdir/$1/getloadavg.c is missing]) | ||
| 26 | |||
| 27 | gl_save_LIBS=$LIBS | 23 | gl_save_LIBS=$LIBS |
| 28 | 24 | ||
| 29 | # getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0, | 25 | # getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0, |
diff --git a/m4/gl-comp.m4 b/m4/gl-comp.m4 index c2f80323441..cb9f11a6284 100644 --- a/m4/gl-comp.m4 +++ b/m4/gl-comp.m4 | |||
| @@ -96,7 +96,7 @@ gl_MD5 | |||
| 96 | gl_SHA1 | 96 | gl_SHA1 |
| 97 | AC_REQUIRE([gl_C99_STRTOLD]) | 97 | AC_REQUIRE([gl_C99_STRTOLD]) |
| 98 | gl_FILEMODE | 98 | gl_FILEMODE |
| 99 | gl_GETLOADAVG([$gl_source_base]) | 99 | gl_GETLOADAVG |
| 100 | gl_STDLIB_MODULE_INDICATOR([getloadavg]) | 100 | gl_STDLIB_MODULE_INDICATOR([getloadavg]) |
| 101 | gl_FUNC_GETOPT_GNU | 101 | gl_FUNC_GETOPT_GNU |
| 102 | gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) | 102 | gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) |