diff options
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 1313b2f5..d0a2a528 100644 --- a/configure.in +++ b/configure.in | |||
@@ -84,6 +84,7 @@ AC_ARG_WITH(trusted_path, | |||
84 | AC_SUBST(with_trusted_path) | 84 | AC_SUBST(with_trusted_path) |
85 | 85 | ||
86 | EXTRAS= | 86 | EXTRAS= |
87 | EXTRAS_ROOT=pst3 | ||
87 | dnl PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/local/sbin:$PATH | 88 | dnl PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/etc:/usr/local/bin:/usr/local/sbin:$PATH |
88 | 89 | ||
89 | LDFLAGS="$LDFLAGS -L." | 90 | LDFLAGS="$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 | ||
659 | AM_CONDITIONAL(WANT_PST3, false) | ||
660 | |||
661 | if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test -n "$PS_VARLIST"; then | 660 | if 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 | ||
693 | dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. | 692 | dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. |
694 | dnl so test for this first... | 693 | dnl so test for this first... |
@@ -1658,6 +1657,7 @@ case $host in | |||
1658 | esac | 1657 | esac |
1659 | 1658 | ||
1660 | AC_SUBST(EXTRAS) | 1659 | AC_SUBST(EXTRAS) |
1660 | AC_SUBST(EXTRAS_ROOT) | ||
1661 | AC_SUBST(EXTRA_NETOBJS) | 1661 | AC_SUBST(EXTRA_NETOBJS) |
1662 | AC_SUBST(DEPLIBS) | 1662 | AC_SUBST(DEPLIBS) |
1663 | 1663 | ||