diff options
author | Ton Voon <ton.voon@opsera.com> | 2010-06-17 10:16:43 +0100 |
---|---|---|
committer | tonvoon <ton.voon@opsera.com> | 2010-06-23 13:30:34 +0000 |
commit | 18f6835edaf7d640a2c9e476cb1babdbdadbfd9b (patch) | |
tree | ae11f40e48dc34658445c99012726f32bfb45c56 /gl/m4/iconv.m4 | |
parent | f61412478ceb7c821793c8356b936f64066508bf (diff) | |
download | monitoring-plugins-18f6835edaf7d640a2c9e476cb1babdbdadbfd9b.tar.gz |
Added state retention APIs. Implemented for check_snmp with --rate option.
See http://nagiosplugin.org/c-api-private for more details on the API.
Also updated check_snmp -l option to change the perfdata label.
Diffstat (limited to 'gl/m4/iconv.m4')
-rw-r--r-- | gl/m4/iconv.m4 | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/gl/m4/iconv.m4 b/gl/m4/iconv.m4 index f46ff142..e2041b9b 100644 --- a/gl/m4/iconv.m4 +++ b/gl/m4/iconv.m4 | |||
@@ -1,4 +1,4 @@ | |||
1 | # iconv.m4 serial 9 (gettext-0.18) | 1 | # iconv.m4 serial 11 (gettext-0.18.1) |
2 | dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2000-2002, 2007-2010 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, |
@@ -170,7 +170,22 @@ int main () | |||
170 | AC_SUBST([LTLIBICONV]) | 170 | AC_SUBST([LTLIBICONV]) |
171 | ]) | 171 | ]) |
172 | 172 | ||
173 | AC_DEFUN([AM_ICONV], | 173 | dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to |
174 | dnl avoid warnings like | ||
175 | dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". | ||
176 | dnl This is tricky because of the way 'aclocal' is implemented: | ||
177 | dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. | ||
178 | dnl Otherwise aclocal's initial scan pass would miss the macro definition. | ||
179 | dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. | ||
180 | dnl Otherwise aclocal would emit many "Use of uninitialized value $1" | ||
181 | dnl warnings. | ||
182 | m4_define([gl_iconv_AC_DEFUN], | ||
183 | m4_version_prereq([2.64], | ||
184 | [[AC_DEFUN_ONCE( | ||
185 | [$1], [$2])]], | ||
186 | [[AC_DEFUN( | ||
187 | [$1], [$2])]])) | ||
188 | gl_iconv_AC_DEFUN([AM_ICONV], | ||
174 | [ | 189 | [ |
175 | AM_ICONV_LINK | 190 | AM_ICONV_LINK |
176 | if test "$am_cv_func_iconv" = yes; then | 191 | if test "$am_cv_func_iconv" = yes; then |