diff options
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | plugins-root/Makefile.am | 5 | ||||
-rw-r--r-- | plugins-root/pst3.c | 1 |
3 files changed, 6 insertions, 3 deletions
@@ -17,7 +17,8 @@ This file documents the major additions and syntax changes between releases. | |||
17 | Fix regression in check_http ssl checks on some servers - make SNI an option | 17 | Fix regression in check_http ssl checks on some servers - make SNI an option |
18 | Fix guest mode support in check_disk_smb | 18 | Fix guest mode support in check_disk_smb |
19 | Fix check_disk_smb and check_ircd failures when run via ePN | 19 | Fix check_disk_smb and check_ircd failures when run via ePN |
20 | check_ldap now allows for specifying an empty LDAP base | 20 | check_ldap now allows for specifying an empty LDAP bas |
21 | Fix compilation error of pst3 in Solaris 8 | ||
21 | WARNINGS | 22 | WARNINGS |
22 | Updated developer documentation to say that performance labels should not have an equals sign or | 23 | Updated developer documentation to say that performance labels should not have an equals sign or |
23 | single quote in the label | 24 | single quote in the label |
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index 21840535..b5f55197 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 7852aa1c..8ca52814 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 | /* |