diff options
author | Jeremy T. Bouse <undrgrid@users.sourceforge.net> | 2003-03-11 07:04:56 (GMT) |
---|---|---|
committer | Jeremy T. Bouse <undrgrid@users.sourceforge.net> | 2003-03-11 07:04:56 (GMT) |
commit | 261b267e0965febb4f41237d79d7cb580a4fc029 (patch) | |
tree | 74e713b0393f027daa7f3c475c4f9ae5eb12296a | |
parent | f92835063a238a85cf8ef0cb3ac67f649ab35ebd (diff) | |
download | monitoring-plugins-261b267e0965febb4f41237d79d7cb580a4fc029.tar.gz |
Removed acconfig.h from EXTRA_DIST
Fixed problem with test in SWAP_FORMAT and SWAP_COMMAND
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@393 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r-- | Makefile.am | 4 | ||||
-rw-r--r-- | configure.in | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 60e4d3c..39fa032 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -3,8 +3,8 @@ | |||
3 | SUBDIRS = lib plugins plugins-scripts | 3 | SUBDIRS = lib plugins plugins-scripts |
4 | 4 | ||
5 | EXTRA_DIST = CODING FAQ LEGAL REQUIREMENTS SUPPORT \ | 5 | EXTRA_DIST = CODING FAQ LEGAL REQUIREMENTS SUPPORT \ |
6 | acconfig.h subst.in subst.sh Helper.pm \ | 6 | subst.in subst.sh Helper.pm \ |
7 | contrib nagios-plugins.spec.in | 7 | contrib nagios-plugins.spec.in |
8 | 8 | ||
9 | ACLOCAL_AMFLAGS = -I lib | 9 | ACLOCAL_AMFLAGS = -I lib |
10 | 10 | ||
diff --git a/configure.in b/configure.in index 8f7f4f9..1cad0d9 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1165,7 +1165,7 @@ else | |||
1165 | AC_MSG_WARN([Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin]) | 1165 | AC_MSG_WARN([Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin]) |
1166 | fi | 1166 | fi |
1167 | 1167 | ||
1168 | if test x$ac_cv_path_to_qstat != x | 1168 | if test $ac_cv_path_to_qstat |
1169 | then | 1169 | then |
1170 | AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat", | 1170 | AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat", |
1171 | [path to qstat/quakestat]) | 1171 | [path to qstat/quakestat]) |
@@ -1262,16 +1262,13 @@ then | |||
1262 | AC_MSG_RESULT([using HP-UX format swapinfo]) | 1262 | AC_MSG_RESULT([using HP-UX format swapinfo]) |
1263 | fi | 1263 | fi |
1264 | 1264 | ||
1265 | if test x$ac_cv_have_swap != x | 1265 | if test x$ac_cv_have_swap != x |
1266 | then | 1266 | then |
1267 | AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found]) | 1267 | AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found]) |
1268 | fi | 1268 | fi |
1269 | if test x$ac_cv_swap_format != x | 1269 | AC_DEFINE_UNQUOTED(SWAP_FORMAT,"$ac_cv_swap_format", |
1270 | then | 1270 | [Format string for parsing swap output]) |
1271 | AC_DEFINE_UNQUOTED(SWAP_FORMAT,"$ac_cv_swap_format", | 1271 | if test "x$ac_cv_swap_command" != "x" |
1272 | [Format string for parsing swap output]) | ||
1273 | fi | ||
1274 | if test x$ac_cv_swap_command != x | ||
1275 | then | 1272 | then |
1276 | AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$ac_cv_swap_command", | 1273 | AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$ac_cv_swap_command", |
1277 | [Path to swap/swapinfo binary, with any args]) | 1274 | [Path to swap/swapinfo binary, with any args]) |