From c326b4dc1dd42a50875578f0e7580125a1ddc03c Mon Sep 17 00:00:00 2001
From: Thomas Guyot-Sionnest <dermoth@aei.ca>
Date: Thu, 8 Apr 2010 00:30:10 -0400
Subject: pst3.c must not use nagiosplug/gnulib includes

---
 plugins-root/Makefile.am | 5 ++++-
 plugins-root/pst3.c      | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins-root')

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)"'
 
 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 7852aa1c..8ca52814 100644
--- 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>
 
 /*
-- 
cgit v1.2.3-74-g34f1