diff options
author | Holger Weiss <holger@zedat.fu-berlin.de> | 2009-05-20 00:32:10 +0200 |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2009-05-20 00:32:10 +0200 |
commit | 50b3ff7b91e78a61aca93247bee586d6d7eb27c8 (patch) | |
tree | db4c7eee24479ac7ee6888ce1562facf60159b71 /gl/m4/gnulib-common.m4 | |
parent | 2701ccd500e60537a8c2977a81549ff33eeaef3f (diff) | |
download | monitoring-plugins-50b3ff7b91e78a61aca93247bee586d6d7eb27c8.tar.gz |
Sync with the latest Gnulib code (cb75dc5)
Signed-off-by: Holger Weiss <holger@zedat.fu-berlin.de>
Diffstat (limited to 'gl/m4/gnulib-common.m4')
-rw-r--r-- | gl/m4/gnulib-common.m4 | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4 index 5804eb9b..c8fda203 100644 --- a/gl/m4/gnulib-common.m4 +++ b/gl/m4/gnulib-common.m4 | |||
@@ -1,4 +1,4 @@ | |||
1 | # gnulib-common.m4 serial 7 | 1 | # gnulib-common.m4 serial 11 |
2 | dnl Copyright (C) 2007-2009 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2007-2009 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
@@ -8,6 +8,7 @@ dnl with or without modifications, as long as this notice is preserved. | |||
8 | # is expanded unconditionally through gnulib-tool magic. | 8 | # is expanded unconditionally through gnulib-tool magic. |
9 | AC_DEFUN([gl_COMMON], [ | 9 | AC_DEFUN([gl_COMMON], [ |
10 | dnl Use AC_REQUIRE here, so that the code is expanded once only. | 10 | dnl Use AC_REQUIRE here, so that the code is expanded once only. |
11 | AC_REQUIRE([gl_00GNULIB]) | ||
11 | AC_REQUIRE([gl_COMMON_BODY]) | 12 | AC_REQUIRE([gl_COMMON_BODY]) |
12 | ]) | 13 | ]) |
13 | AC_DEFUN([gl_COMMON_BODY], [ | 14 | AC_DEFUN([gl_COMMON_BODY], [ |
@@ -52,7 +53,7 @@ m4_ifndef([m4_foreach_w], | |||
52 | # is a backport of autoconf-2.60's AC_PROG_MKDIR_P. | 53 | # is a backport of autoconf-2.60's AC_PROG_MKDIR_P. |
53 | # Remove this macro when we can assume autoconf >= 2.60. | 54 | # Remove this macro when we can assume autoconf >= 2.60. |
54 | m4_ifdef([AC_PROG_MKDIR_P], [], [ | 55 | m4_ifdef([AC_PROG_MKDIR_P], [], [ |
55 | AC_DEFUN([AC_PROG_MKDIR_P], | 56 | AC_DEFUN_ONCE([AC_PROG_MKDIR_P], |
56 | [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | 57 | [AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake |
57 | MKDIR_P='$(mkdir_p)' | 58 | MKDIR_P='$(mkdir_p)' |
58 | AC_SUBST([MKDIR_P])])]) | 59 | AC_SUBST([MKDIR_P])])]) |
@@ -99,3 +100,25 @@ AC_DEFUN([AC_C_RESTRICT], | |||
99 | *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; | 100 | *) AC_DEFINE_UNQUOTED([restrict], [$ac_cv_c_restrict]) ;; |
100 | esac | 101 | esac |
101 | ]) | 102 | ]) |
103 | |||
104 | # gl_BIGENDIAN | ||
105 | # is like AC_C_BIGENDIAN, except that it can be AC_REQUIREd. | ||
106 | # Note that AC_REQUIRE([AC_C_BIGENDIAN]) does not work reliably because some | ||
107 | # macros invoke AC_C_BIGENDIAN with arguments. | ||
108 | AC_DEFUN([gl_BIGENDIAN], | ||
109 | [ | ||
110 | AC_C_BIGENDIAN | ||
111 | ]) | ||
112 | |||
113 | # gl_CACHE_VAL_SILENT(cache-id, command-to-set-it) | ||
114 | # is like AC_CACHE_VAL(cache-id, command-to-set-it), except that it does not | ||
115 | # output a spurious "(cached)" mark in the midst of other configure output. | ||
116 | # This macro should be used instead of AC_CACHE_VAL when it is not surrounded | ||
117 | # by an AC_MSG_CHECKING/AC_MSG_RESULT pair. | ||
118 | AC_DEFUN([gl_CACHE_VAL_SILENT], | ||
119 | [ | ||
120 | saved_as_echo_n="$as_echo_n" | ||
121 | as_echo_n=':' | ||
122 | AC_CACHE_VAL([$1], [$2]) | ||
123 | as_echo_n="$saved_as_echo_n" | ||
124 | ]) | ||