summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2006-07-04 09:47:44 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2006-07-04 09:47:44 (GMT)
commitd5236194b11ccd5049fc8068b4b6087fd401f6b5 (patch)
treed145419350f1593ecd0422f12aff8303ac177318
parent46894f211e8c3405febb03b3e455e345c93f64d5 (diff)
downloadmonitoring-plugins-d5236194b11ccd5049fc8068b4b6087fd401f6b5.tar.gz
Added alloca.h check and fixed locale.h, wchar.h (Ari Pollak - 1516578)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1440 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--THANKS.in2
-rw-r--r--m4/alloca.m442
-rw-r--r--m4/np_coreutils.m413
3 files changed, 52 insertions, 5 deletions
diff --git a/THANKS.in b/THANKS.in
index 4967ff0..60af6bf 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -185,3 +185,5 @@ Michael Tiernan
185Jeremy Reed 185Jeremy Reed
186Holger Weiss 186Holger Weiss
187Cire Iriarte 187Cire Iriarte
188Allan Bennett
189Ari Pollak
diff --git a/m4/alloca.m4 b/m4/alloca.m4
new file mode 100644
index 0000000..a9e3f45
--- /dev/null
+++ b/m4/alloca.m4
@@ -0,0 +1,42 @@
1# alloca.m4 serial 5
2dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7AC_DEFUN([gl_FUNC_ALLOCA],
8[
9 dnl Work around a bug of AC_EGREP_CPP in autoconf-2.57.
10 AC_REQUIRE([AC_PROG_CPP])
11 AC_REQUIRE([AC_PROG_EGREP])
12
13 AC_REQUIRE([AC_FUNC_ALLOCA])
14 if test $ac_cv_func_alloca_works = no; then
15 gl_PREREQ_ALLOCA
16 fi
17
18 # Define an additional variable used in the Makefile substitution.
19 if test $ac_cv_working_alloca_h = yes; then
20 AC_EGREP_CPP([Need own alloca], [
21#if defined __GNUC__ || defined _AIX || defined _MSC_VER
22 Need own alloca
23#endif
24 ],
25 [AC_DEFINE(HAVE_ALLOCA, 1,
26 [Define to 1 if you have `alloca' after including <alloca.h>,
27 a header that may be supplied by this distribution.])
28 ALLOCA_H=alloca.h],
29 [ALLOCA_H=])
30 else
31 ALLOCA_H=alloca.h
32 fi
33 AC_SUBST([ALLOCA_H])
34
35 AC_DEFINE(HAVE_ALLOCA_H, 1,
36 [Define HAVE_ALLOCA_H for backward compatibility with older code
37 that includes <alloca.h> only if HAVE_ALLOCA_H is defined.])
38])
39
40# Prerequisites of lib/alloca.c.
41# STACK_DIRECTION is already handled by AC_FUNC_ALLOCA.
42AC_DEFUN([gl_PREREQ_ALLOCA], [:])
diff --git a/m4/np_coreutils.m4 b/m4/np_coreutils.m4
index 18c5f66..23d55e4 100644
--- a/m4/np_coreutils.m4
+++ b/m4/np_coreutils.m4
@@ -12,12 +12,15 @@ AC_DEFUN([np_COREUTILS],
12[ 12[
13 AC_REQUIRE([AM_STDBOOL_H]) 13 AC_REQUIRE([AM_STDBOOL_H])
14 AC_REQUIRE([gl_C_STRTOLD]) 14 AC_REQUIRE([gl_C_STRTOLD])
15 AC_REQUIRE([gl_GETOPT])
16 AC_REQUIRE([gl_AFS])
17 AC_REQUIRE([gl_EXITFAIL]) 15 AC_REQUIRE([gl_EXITFAIL])
18 AC_REQUIRE([gl_XALLOC])
19 AC_REQUIRE([gl_MOUNTLIST])
20 AC_REQUIRE([gl_FSUSAGE]) 16 AC_REQUIRE([gl_FSUSAGE])
21 AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO]) 17 AC_REQUIRE([gl_FUNC_ALLOCA])
18 AC_REQUIRE([gl_GETOPT])
19 AC_REQUIRE([gl_MOUNTLIST])
22 AC_REQUIRE([gl_REGEX]) 20 AC_REQUIRE([gl_REGEX])
21 AC_REQUIRE([gl_XALLOC])
22 AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO])
23
24dnl This is in jm-macros.m4, which calls prereq.m4, and then calls this afterwards
25 AC_REQUIRE([gl_AFS])
23]) 26])