summaryrefslogtreecommitdiffstats
path: root/configure.in
diff options
context:
space:
mode:
authorTon Voon <tonvoon@users.sourceforge.net>2006-07-28 23:59:29 (GMT)
committerTon Voon <tonvoon@users.sourceforge.net>2006-07-28 23:59:29 (GMT)
commitab9b1169c268d9abefd556a85a0fe90bc513f496 (patch)
tree875c275f87703b48fc34a7e307a07508dcfaf83a /configure.in
parent03d772cc0d0023748e0b13a7bbaa301b86032eb4 (diff)
downloadmonitoring-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.in21
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)
13AC_PREFIX_DEFAULT(/usr/local/nagios) 13AC_PREFIX_DEFAULT(/usr/local/nagios)
14 14
15dnl Deprecated configure options 15dnl Deprecated configure options
16AC_ARG_WITH(nagios_user,,
17 AC_MSG_ERROR([--with-nagios-user is a deprecated option]))
18AC_ARG_WITH(nagios_group,,
19 AC_MSG_ERROR([--with-nagios-group is a deprecated option]))
16 20
17dnl Figure out how to invoke "install" and what install options to use. 21dnl Figure out how to invoke "install" and what install options to use.
18AC_PROG_INSTALL 22AC_PROG_INSTALL
@@ -60,21 +64,6 @@ AC_ARG_WITH(cgiurl,
60CGIURL="$with_cgiurl" 64CGIURL="$with_cgiurl"
61AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs]) 65AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs])
62 66
63AC_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)
68AC_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)
73AC_SUBST(with_nagios_user)
74AC_SUBST(with_nagios_group)
75INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group"
76AC_SUBST(INSTALL_OPTS)
77
78AC_ARG_WITH(trusted_path, 67AC_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])
1748ACX_FEATURE([enable],[emulate-getaddrinfo]) 1737ACX_FEATURE([enable],[emulate-getaddrinfo])
1749ACX_FEATURE([with],[perl]) 1738ACX_FEATURE([with],[perl])
1750ACX_FEATURE([with],[cgiurl]) 1739ACX_FEATURE([with],[cgiurl])
1751ACX_FEATURE([with],[nagios-user])
1752ACX_FEATURE([with],[nagios-group])
1753ACX_FEATURE([with],[trusted-path]) 1740ACX_FEATURE([with],[trusted-path])
1754 1741
1755 1742