summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: ed23bb9)
raw | patch | inline | side by side (from parent 1: ed23bb9)
author | M. Sean Finney <seanius@users.sourceforge.net> | |
Thu, 6 Oct 2005 12:12:47 +0000 (12:12 +0000) | ||
committer | M. Sean Finney <seanius@users.sourceforge.net> | |
Thu, 6 Oct 2005 12:12:47 +0000 (12:12 +0000) |
of pst3 on non solaris systems.
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1242 f882894a-f735-0410-b71e-b25c423dba1c
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1242 f882894a-f735-0410-b71e-b25c423dba1c
configure.in | patch | blob | history | |
plugins-root/Makefile.am | patch | blob | history |
diff --git a/configure.in b/configure.in
index cbc2f3c4e894d18c6dca307da1f2f9f61f61f918..a2666826d59057e3f05fcfe8a6d16f5708487c49 100644 (file)
--- a/configure.in
+++ b/configure.in
AC_MSG_CHECKING(for ps syntax)
dnl Now using the pst3/kmem hack for solaris systems to avoid truncation
+AM_CONDITIONAL(WANT_PST3, false)
if test "$ac_cv_uname_s" = "SunOS"; then
#
# this is a very, very ugly hack, to hardcode the location for plugins
ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
ac_cv_ps_cols=8
AC_MSG_RESULT([using nagios-plugins internal ps for solaris])
+ AM_CONDITIONAL(WANT_PST3, true)
dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
dnl so test for this first...
index 81e83774931959b8d25e1b3ff02e5ef59f0f8a84..81679d53cbc0e84eee5c8b3adba4dedd1866d7e9 100644 (file)
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
LIBS = @LIBINTL@ @LIBS@ @SSLINCLUDE@
-EXTRA_PROGRAMS = check_dhcp check_icmp pst3
+EXTRA_PROGRAMS = check_dhcp check_icmp
+
+if WANT_PST3
+ EXTRA_PROGRAMS += pst3
+ pst3_DEPENDENCIES = pst3.c
+endif
BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a
NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS)
check_icmp_DEPENDENCIES = check_icmp.c
-pst3_DEPENDENCIES = pst3.c