diff options
author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2010-04-08 04:30:10 (GMT) |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2010-04-14 07:02:38 (GMT) |
commit | c326b4dc1dd42a50875578f0e7580125a1ddc03c (patch) | |
tree | cb5ec1728d30143e7756dacbdbb6e2c2224fd8c9 /plugins-root | |
parent | 74da141e618ef99959d509cb2e7be35a348a39db (diff) | |
download | monitoring-plugins-c326b4dc1dd42a50875578f0e7580125a1ddc03c.tar.gz |
pst3.c must not use nagiosplug/gnulib includes
Diffstat (limited to 'plugins-root')
-rw-r--r-- | plugins-root/Makefile.am | 5 | ||||
-rw-r--r-- | plugins-root/pst3.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index 2184053..b5f5519 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am | |||
@@ -13,7 +13,7 @@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"' | |||
13 | 13 | ||
14 | VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir) | 14 | VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir) |
15 | 15 | ||
16 | INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@ | 16 | AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@ |
17 | 17 | ||
18 | localedir = $(datadir)/locale | 18 | localedir = $(datadir)/locale |
19 | DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ | 19 | DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ |
@@ -79,9 +79,12 @@ install-exec-local: $(noinst_PROGRAMS) | |||
79 | # the actual targets | 79 | # the actual targets |
80 | check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) | 80 | check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) |
81 | check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) | 81 | check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) |
82 | |||
82 | # -m64 needed at compiler and linker phase | 83 | # -m64 needed at compiler and linker phase |
83 | pst3_CFLAGS = @PST3CFLAGS@ | 84 | pst3_CFLAGS = @PST3CFLAGS@ |
84 | pst3_LDFLAGS = @PST3CFLAGS@ | 85 | pst3_LDFLAGS = @PST3CFLAGS@ |
86 | # pst3 must not use nagiosplug/gnulib includes! | ||
87 | pst3_CPPFLAGS = | ||
85 | 88 | ||
86 | check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) | 89 | check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) |
87 | check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS) | 90 | check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS) |
diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c index 7852aa1..8ca5281 100644 --- a/plugins-root/pst3.c +++ b/plugins-root/pst3.c | |||
@@ -49,7 +49,6 @@ | |||
49 | #include <errno.h> | 49 | #include <errno.h> |
50 | #include <fcntl.h> | 50 | #include <fcntl.h> |
51 | #include <procfs.h> | 51 | #include <procfs.h> |
52 | #include <errno.h> | ||
53 | #include <sys/types32.h> | 52 | #include <sys/types32.h> |
54 | 53 | ||
55 | /* | 54 | /* |