diff options
| author |  M. Sean Finney <seanius@users.sourceforge.net>
| 2005-10-06 12:12:47 +0000 |
|---|---|---|
| committer | M. Sean Finney <seanius@users.sourceforge.net>
| 2005-10-06 12:12:47 +0000 |
| commit | 3f6257d7179977a87e6ca79bf69d7e2034102b32 (patch) | |
| tree | b3688134e8818147a323cb5d0be4e4b9517e5e08 | |
| parent | ed23bb9c8cdb8503dcad4ce8301ae76305f4c543 (diff) | |
| download | monitoring-plugins-3f6257d7179977a87e6ca79bf69d7e2034102b32.tar.gz | |
whoops. now using automake conditionals to prevent attempted compiles
of pst3 on non solaris systems.
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1242 f882894a-f735-0410-b71e-b25c423dba1c
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | plugins-root/Makefile.am | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.in b/configure.in index cbc2f3c4..a2666826 100644 --- a/configure.in +++ b/configure.in @@ -600,6 +600,7 @@ AC_PATH_PROG(PATH_TO_PS,ps) 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 @@ -622,6 +623,7 @@ if test "$ac_cv_uname_s" = "SunOS"; then 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... diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index 81e83774..81679d53 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am @@ -9,7 +9,12 @@ localedir = $(datadir)/locale 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) @@ -71,4 +76,3 @@ check_icmp_LDADD = $(SOCKETLIBS) check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) check_icmp_DEPENDENCIES = check_icmp.c -pst3_DEPENDENCIES = pst3.c |