summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in6
-rw-r--r--plugins-root/Makefile.am11
2 files changed, 7 insertions, 10 deletions
diff --git a/configure.in b/configure.in
index 1313b2f..d0a2a52 100644
--- a/configure.in
+++ b/configure.in
@@ -84,6 +84,7 @@ AC_ARG_WITH(trusted_path,
84AC_SUBST(with_trusted_path) 84AC_SUBST(with_trusted_path)
85 85
86EXTRAS= 86EXTRAS=
87EXTRAS_ROOT=pst3
87dnl PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/local/sbin:$PATH 88dnl PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/local/sbin:$PATH
88 89
89LDFLAGS="$LDFLAGS -L." 90LDFLAGS="$LDFLAGS -L."
@@ -656,8 +657,6 @@ AC_ARG_WITH(ps_varlist,
656 [Variable list for sscanf of 'ps' output]), 657 [Variable list for sscanf of 'ps' output]),
657 PS_VARLIST=$withval) 658 PS_VARLIST=$withval)
658 659
659AM_CONDITIONAL(WANT_PST3, false)
660
661if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test -n "$PS_VARLIST"; then 660if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test -n "$PS_VARLIST"; then
662 ac_cv_ps_command="$PS_COMMAND" 661 ac_cv_ps_command="$PS_COMMAND"
663 ac_cv_ps_format="$PS_FORMAT" 662 ac_cv_ps_format="$PS_FORMAT"
@@ -688,7 +687,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; then
688 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" 687 ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
689 ac_cv_ps_cols=8 688 ac_cv_ps_cols=8
690 AC_MSG_RESULT([using nagios-plugins internal ps for solaris]) 689 AC_MSG_RESULT([using nagios-plugins internal ps for solaris])
691 AM_CONDITIONAL(WANT_PST3, true) 690 EXTRAS_ROOT="$EXTRAS_ROOT pst3"
692 691
693dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. 692dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
694dnl so test for this first... 693dnl so test for this first...
@@ -1658,6 +1657,7 @@ case $host in
1658esac 1657esac
1659 1658
1660AC_SUBST(EXTRAS) 1659AC_SUBST(EXTRAS)
1660AC_SUBST(EXTRAS_ROOT)
1661AC_SUBST(EXTRA_NETOBJS) 1661AC_SUBST(EXTRA_NETOBJS)
1662AC_SUBST(DEPLIBS) 1662AC_SUBST(DEPLIBS)
1663 1663
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 54e91b0..782a1ca 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -9,12 +9,11 @@ localedir = $(datadir)/locale
9DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ 9DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
10LIBS = @LIBINTL@ @LIBS@ @SSLLIBS@ 10LIBS = @LIBINTL@ @LIBS@ @SSLLIBS@
11 11
12EXTRA_PROGRAMS = check_dhcp check_icmp 12libexec_PROGRAMS = check_dhcp check_icmp @EXTRAS_ROOT@
13 13
14if WANT_PST3 14EXTRA_PROGRAMS = pst3
15 EXTRA_PROGRAMS += pst3 15
16 pst3_DEPENDENCIES = pst3.c 16EXTRA_DIST = pst3.c
17endif
18 17
19BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a 18BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a
20NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) 19NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
@@ -27,8 +26,6 @@ TESTS = @PLUGIN_TEST@
27test: 26test:
28 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl 27 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
29 28
30all-local: $(EXTRA_PROGRAMS)
31
32setuid_root_mode = 4550 29setuid_root_mode = 4550
33 30
34group = nagios 31group = nagios