diff options
author | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-02-28 12:28:33 (GMT) |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2014-02-28 12:28:33 (GMT) |
commit | c08d6a429ba0e0cd3642ba2c2fe85687472ee22f (patch) | |
tree | 396a37ae462543f0e28f36501c30796b3eb91249 /configure.ac | |
parent | e260efb25690b13002a0bf432507f66bdad90f02 (diff) | |
download | monitoring-plugins-c08d6a429ba0e0cd3642ba2c2fe85687472ee22f.tar.gz |
Replace "plugins-scripts/subst.in" foo
Remove the buggy and complex awk(1) magic in "plugins-scripts/subst.in"
in favor of simple sed(1) substitutions.
The plugins in the "plugins-scripts" directory now always use the PATH
specified via "./configure --trusted-path", or the default PATH
hard-coded in "configure.ac".
Fixes #1242.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5759e60..a1ef445 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -10,6 +10,7 @@ AM_MAINTAINER_MODE([enable]) | |||
10 | AC_CONFIG_HEADERS([config.h]) | 10 | AC_CONFIG_HEADERS([config.h]) |
11 | AC_CANONICAL_HOST | 11 | AC_CANONICAL_HOST |
12 | 12 | ||
13 | DEFAULT_PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" | ||
13 | RELEASE=1 | 14 | RELEASE=1 |
14 | AC_SUBST(RELEASE) | 15 | AC_SUBST(RELEASE) |
15 | 16 | ||
@@ -75,7 +76,8 @@ AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs]) | |||
75 | AC_ARG_WITH(trusted_path, | 76 | AC_ARG_WITH(trusted_path, |
76 | ACX_HELP_STRING([--with-trusted-path=PATH], | 77 | ACX_HELP_STRING([--with-trusted-path=PATH], |
77 | [sets trusted path for executables called by scripts]), | 78 | [sets trusted path for executables called by scripts]), |
78 | with_trusted_path=$withval) | 79 | with_trusted_path=$withval, |
80 | with_trusted_path=$DEFAULT_PATH) | ||
79 | AC_SUBST(with_trusted_path) | 81 | AC_SUBST(with_trusted_path) |
80 | 82 | ||
81 | EXTRAS= | 83 | EXTRAS= |
@@ -1781,7 +1783,6 @@ AC_OUTPUT( | |||
1781 | lib/tests/Makefile | 1783 | lib/tests/Makefile |
1782 | plugins-root/Makefile | 1784 | plugins-root/Makefile |
1783 | plugins-scripts/Makefile | 1785 | plugins-scripts/Makefile |
1784 | plugins-scripts/subst | ||
1785 | plugins-scripts/utils.pm | 1786 | plugins-scripts/utils.pm |
1786 | plugins-scripts/utils.sh | 1787 | plugins-scripts/utils.sh |
1787 | perlmods/Makefile | 1788 | perlmods/Makefile |