summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--plugins-root/Makefile.am8
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index cbc2f3c..a266682 100644
--- a/configure.in
+++ b/configure.in
@@ -600,6 +600,7 @@ AC_PATH_PROG(PATH_TO_PS,ps)
600AC_MSG_CHECKING(for ps syntax) 600AC_MSG_CHECKING(for ps syntax)
601 601
602dnl Now using the pst3/kmem hack for solaris systems to avoid truncation 602dnl Now using the pst3/kmem hack for solaris systems to avoid truncation
603AM_CONDITIONAL(WANT_PST3, false)
603if test "$ac_cv_uname_s" = "SunOS"; then 604if test "$ac_cv_uname_s" = "SunOS"; then
604 # 605 #
605 # this is a very, very ugly hack, to hardcode the location for plugins 606 # this is a very, very ugly hack, to hardcode the location for plugins
@@ -622,6 +623,7 @@ if test "$ac_cv_uname_s" = "SunOS"; then
622 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" 623 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
623 ac_cv_ps_cols=8 624 ac_cv_ps_cols=8
624 AC_MSG_RESULT([using nagios-plugins internal ps for solaris]) 625 AC_MSG_RESULT([using nagios-plugins internal ps for solaris])
626 AM_CONDITIONAL(WANT_PST3, true)
625 627
626dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. 628dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
627dnl so test for this first... 629dnl so test for this first...
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 81e8377..81679d5 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -9,7 +9,12 @@ localedir = $(datadir)/locale
9DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ 9DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
10LIBS = @LIBINTL@ @LIBS@ @SSLINCLUDE@ 10LIBS = @LIBINTL@ @LIBS@ @SSLINCLUDE@
11 11
12EXTRA_PROGRAMS = check_dhcp check_icmp pst3 12EXTRA_PROGRAMS = check_dhcp check_icmp
13
14if WANT_PST3
15 EXTRA_PROGRAMS += pst3
16 pst3_DEPENDENCIES = pst3.c
17endif
13 18
14BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a 19BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a
15NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) 20NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
@@ -71,4 +76,3 @@ check_icmp_LDADD = $(SOCKETLIBS)
71 76
72check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 77check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS)
73check_icmp_DEPENDENCIES = check_icmp.c 78check_icmp_DEPENDENCIES = check_icmp.c
74pst3_DEPENDENCIES = pst3.c