From 261b267e0965febb4f41237d79d7cb580a4fc029 Mon Sep 17 00:00:00 2001 From: "Jeremy T. Bouse" Date: Tue, 11 Mar 2003 07:04:56 +0000 Subject: [PATCH] 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 --- Makefile.am | 4 ++-- 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 @@ SUBDIRS = lib plugins plugins-scripts EXTRA_DIST = CODING FAQ LEGAL REQUIREMENTS SUPPORT \ -acconfig.h subst.in subst.sh Helper.pm \ -contrib nagios-plugins.spec.in + subst.in subst.sh Helper.pm \ + contrib nagios-plugins.spec.in ACLOCAL_AMFLAGS = -I lib diff --git a/configure.in b/configure.in index 8f7f4f9..1cad0d9 100644 --- a/configure.in +++ b/configure.in @@ -1165,7 +1165,7 @@ else AC_MSG_WARN([Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin]) fi -if test x$ac_cv_path_to_qstat != x +if test $ac_cv_path_to_qstat then AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat", [path to qstat/quakestat]) @@ -1262,16 +1262,13 @@ then AC_MSG_RESULT([using HP-UX format swapinfo]) fi -if test x$ac_cv_have_swap != x +if test x$ac_cv_have_swap != x then AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found]) fi -if test x$ac_cv_swap_format != x -then - AC_DEFINE_UNQUOTED(SWAP_FORMAT,"$ac_cv_swap_format", - [Format string for parsing swap output]) -fi -if test x$ac_cv_swap_command != x +AC_DEFINE_UNQUOTED(SWAP_FORMAT,"$ac_cv_swap_format", + [Format string for parsing swap output]) +if test "x$ac_cv_swap_command" != "x" then AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$ac_cv_swap_command", [Path to swap/swapinfo binary, with any args]) -- 2.30.2