pst3.c must not use nagiosplug/gnulib includes

diff --git a/NEWS b/NEWS
index 62a1acbd9ff676b387910521d02fc64918d08f15..dd36af4cf5cc101495d9ff5ca38fd9c5158145f9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,8 @@ This file documents the major additions and syntax changes between releases.
        Fix regression in check_http ssl checks on some servers - make SNI an option
        Fix guest mode support in check_disk_smb
        Fix check_disk_smb and check_ircd failures when run via ePN
-       check_ldap now allows for specifying an empty LDAP base
+       check_ldap now allows for specifying an empty LDAP bas
+       Fix compilation error of pst3 in Solaris 8
        WARNINGS
        Updated developer documentation to say that performance labels should not have an equals sign or
        single quote in the label

diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 218405356425141dd0cf435a59cf8817806633b0..b5f55197024cd0403962bbc0aaa5f2d29c737c41 100644 (file)
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -13,7 +13,7 @@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
 
 VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir)
 
-INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@
+AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@
 
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
@@ -79,9 +79,12 @@ install-exec-local: $(noinst_PROGRAMS)
 # the actual targets
 check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS)
 check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS)
+
 # -m64 needed at compiler and linker phase
 pst3_CFLAGS = @PST3CFLAGS@
 pst3_LDFLAGS = @PST3CFLAGS@
+# pst3 must not use nagiosplug/gnulib includes!
+pst3_CPPFLAGS =
 
 check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
 check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS)

diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c
index 7852aa1cbb011a7fe6a51d7c2b19012344eef281..8ca52814854fa37ac55815ea82ae5045cc11ce7a 100644 (file)
--- a/plugins-root/pst3.c
+++ b/plugins-root/pst3.c
@@ -49,7 +49,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <procfs.h>
-#include <errno.h>
 #include <sys/types32.h>
 
 /*