diff options
author | Ton Voon <tonvoon@users.sourceforge.net> | 2008-02-28 16:21:59 +0000 |
---|---|---|
committer | Ton Voon <tonvoon@users.sourceforge.net> | 2008-02-28 16:21:59 +0000 |
commit | 9f3d864fd3e47d4e728b196b1b6948a8a5e47e4e (patch) | |
tree | ffaf70a0a09e40cf706f1362a01450f76e845d18 /configure.in | |
parent | f00e6a9676154eaac8aed140c49bde76e52d6cee (diff) | |
download | monitoring-plugins-9f3d864fd3e47d4e728b196b1b6948a8a5e47e4e.tar.gz |
Reverted check_procs for solaris back to using pst3 due to truncation
for argument fields using other methods
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1937 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 49 |
1 files changed, 41 insertions, 8 deletions
diff --git a/configure.in b/configure.in index 341add80..6d94582c 100644 --- a/configure.in +++ b/configure.in | |||
@@ -512,16 +512,49 @@ if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test - | |||
512 | ac_cv_ps_cols="$PS_COLS" | 512 | ac_cv_ps_cols="$PS_COLS" |
513 | AC_MSG_RESULT([(command-line) $ac_cv_ps_command]) | 513 | AC_MSG_RESULT([(command-line) $ac_cv_ps_command]) |
514 | 514 | ||
515 | dnl Now using the pst3/kmem hack for solaris systems to avoid truncation | ||
516 | elif test "$ac_cv_uname_s" = "SunOS"; then | ||
517 | # | ||
518 | # this is a very, very ugly hack, to hardcode the location for plugins | ||
519 | # | ||
520 | if test "$libexecdir" = '${exec_prefix}/libexec'; then | ||
521 | if test "$exec_prefix" = "NONE"; then | ||
522 | if test "$prefix" = "NONE"; then | ||
523 | pst3="$ac_default_prefix/libexec/pst3" | ||
524 | else | ||
525 | pst3="$prefix/libexec/pst3" | ||
526 | fi | ||
527 | else | ||
528 | pst3="$exec_prefix/libexec/pst3" | ||
529 | fi | ||
530 | else | ||
531 | pst3="$libexecdir/pst3" | ||
532 | fi | ||
533 | ac_cv_ps_command="$pst3" | ||
534 | ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" | ||
535 | ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" | ||
536 | ac_cv_ps_cols=9 | ||
537 | AC_MSG_RESULT([using nagios-plugins internal ps command (pst3) for solaris]) | ||
538 | if test `isainfo -b` = 64 ; then | ||
539 | PST3CFLAGS="-m64" | ||
540 | AC_SUBST(PST3CFLAGS) | ||
541 | AC_MSG_NOTICE([using 64bit pst3]) | ||
542 | else | ||
543 | AC_MSG_NOTICE([using 32bit pst3]) | ||
544 | fi | ||
545 | EXTRAS_ROOT="$EXTRAS_ROOT pst3" | ||
546 | |||
547 | dnl Removing this for the moment - Ton | ||
515 | dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation | 548 | dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation |
516 | dnl Limitation that command name is not available | 549 | dnl Limitation that command name is not available |
517 | elif test "$ac_cv_uname_s" = "SunOS" && /usr/ucb/ps -alxwwn 2>/dev/null | \ | 550 | dnl elif test "$ac_cv_uname_s" = "SunOS" && /usr/ucb/ps -alxwwn 2>/dev/null | \ |
518 | egrep -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null | 551 | dnl egrep -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null |
519 | then | 552 | dnl then |
520 | ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procpcpu,&procvsz,&procrss,procstat,&pos]" | 553 | dnl ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procpcpu,&procvsz,&procrss,procstat,&pos]" |
521 | ac_cv_ps_command="/usr/ucb/ps -alxwwn" | 554 | dnl ac_cv_ps_command="/usr/ucb/ps -alxwwn" |
522 | ac_cv_ps_format=["%*s %d %d %d %d %*d %*d %d %d%*[ 0123456789abcdef]%[OSRZT]%*s %*s %n"] | 555 | dnl ac_cv_ps_format=["%*s %d %d %d %d %*d %*d %d %d%*[ 0123456789abcdef]%[OSRZT]%*s %*s %n"] |
523 | ac_cv_ps_cols=8 | 556 | dnl ac_cv_ps_cols=8 |
524 | AC_MSG_RESULT([$ac_cv_ps_command]) | 557 | dnl AC_MSG_RESULT([$ac_cv_ps_command]) |
525 | 558 | ||
526 | dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. | 559 | dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. |
527 | dnl so test for this first... | 560 | dnl so test for this first... |