diff options
author | Ton Voon <tonvoon@users.sourceforge.net> | 2006-07-28 23:59:29 (GMT) |
---|---|---|
committer | Ton Voon <tonvoon@users.sourceforge.net> | 2006-07-28 23:59:29 (GMT) |
commit | ab9b1169c268d9abefd556a85a0fe90bc513f496 (patch) | |
tree | 875c275f87703b48fc34a7e307a07508dcfaf83a /configure.in | |
parent | 03d772cc0d0023748e0b13a7bbaa301b86032eb4 (diff) | |
download | monitoring-plugins-ab9b1169c268d9abefd556a85a0fe90bc513f496.tar.gz |
Cleanup references to old check_udp and INSTALL_OPTS. Error if
--with-nagios-user or --with-nagios-group specified for configure
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1460 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/configure.in b/configure.in index d9bb619..4ff9be1 100644 --- a/configure.in +++ b/configure.in | |||
@@ -13,6 +13,10 @@ AC_SUBST(RELEASE) | |||
13 | AC_PREFIX_DEFAULT(/usr/local/nagios) | 13 | AC_PREFIX_DEFAULT(/usr/local/nagios) |
14 | 14 | ||
15 | dnl Deprecated configure options | 15 | dnl Deprecated configure options |
16 | AC_ARG_WITH(nagios_user,, | ||
17 | AC_MSG_ERROR([--with-nagios-user is a deprecated option])) | ||
18 | AC_ARG_WITH(nagios_group,, | ||
19 | AC_MSG_ERROR([--with-nagios-group is a deprecated option])) | ||
16 | 20 | ||
17 | dnl Figure out how to invoke "install" and what install options to use. | 21 | dnl Figure out how to invoke "install" and what install options to use. |
18 | AC_PROG_INSTALL | 22 | AC_PROG_INSTALL |
@@ -60,21 +64,6 @@ AC_ARG_WITH(cgiurl, | |||
60 | CGIURL="$with_cgiurl" | 64 | CGIURL="$with_cgiurl" |
61 | AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs]) | 65 | AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs]) |
62 | 66 | ||
63 | AC_ARG_WITH(nagios_user, | ||
64 | ACX_HELP_STRING([--with-nagios-user=USER], | ||
65 | [set user name to run nagios]), | ||
66 | with_nagios_user=$withval, | ||
67 | with_nagios_user=nagios) | ||
68 | AC_ARG_WITH(nagios_group, | ||
69 | ACX_HELP_STRING([--with-nagios-group=GROUP], | ||
70 | [set group name to run nagios]), | ||
71 | with_nagios_group=$withval, | ||
72 | with_nagios_group=nagios) | ||
73 | AC_SUBST(with_nagios_user) | ||
74 | AC_SUBST(with_nagios_group) | ||
75 | INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group" | ||
76 | AC_SUBST(INSTALL_OPTS) | ||
77 | |||
78 | AC_ARG_WITH(trusted_path, | 67 | AC_ARG_WITH(trusted_path, |
79 | ACX_HELP_STRING([--with-trusted-path=PATH], | 68 | ACX_HELP_STRING([--with-trusted-path=PATH], |
80 | [sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]), | 69 | [sets trusted path for executables called by scripts (default=/bin:/sbin:/usr/bin:/usr/sbin)]), |
@@ -1748,8 +1737,6 @@ ACX_FEATURE([with],[gnutls]) | |||
1748 | ACX_FEATURE([enable],[emulate-getaddrinfo]) | 1737 | ACX_FEATURE([enable],[emulate-getaddrinfo]) |
1749 | ACX_FEATURE([with],[perl]) | 1738 | ACX_FEATURE([with],[perl]) |
1750 | ACX_FEATURE([with],[cgiurl]) | 1739 | ACX_FEATURE([with],[cgiurl]) |
1751 | ACX_FEATURE([with],[nagios-user]) | ||
1752 | ACX_FEATURE([with],[nagios-group]) | ||
1753 | ACX_FEATURE([with],[trusted-path]) | 1740 | ACX_FEATURE([with],[trusted-path]) |
1754 | 1741 | ||
1755 | 1742 | ||