Update of /cvsroot/nagiosplug/nagiosplug
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15066
Modified Files:
configure.in
Log Message:
Cleanup references to old check_udp and INSTALL_OPTS. Error if
--with-nagios-user or --with-nagios-group specified for configure
Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- configure.in 19 Jul 2006 23:05:31 -0000 1.194
+++ configure.in 28 Jul 2006 23:59:28 -0000 1.195
@@ -13,6 +13,10 @@
AC_PREFIX_DEFAULT(/usr/local/nagios)
dnl Deprecated configure options
+AC_ARG_WITH(nagios_user,,
+ AC_MSG_ERROR([--with-nagios-user is a deprecated option]))
+AC_ARG_WITH(nagios_group,,
+ AC_MSG_ERROR([--with-nagios-group is a deprecated option]))
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
@@ -60,21 +64,6 @@
CGIURL="$with_cgiurl"
AC_DEFINE_UNQUOTED(CGIURL,"$CGIURL",[URL of CGI programs])
-AC_ARG_WITH(nagios_user,
- ACX_HELP_STRING([--with-nagios-user=USER],
- [set user name to run nagios]),
- with_nagios_user=$withval,
- with_nagios_user=nagios)
-AC_ARG_WITH(nagios_group,
- ACX_HELP_STRING([--with-nagios-group=GROUP],
- [set group name to run nagios]),
- with_nagios_group=$withval,
- with_nagios_group=nagios)
-AC_SUBST(with_nagios_user)
-AC_SUBST(with_nagios_group)
-INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group"
-AC_SUBST(INSTALL_OPTS)
-
AC_ARG_WITH(trusted_path,
ACX_HELP_STRING([--with-trusted-path=PATH],
[sets trusted path for executables called by scripts
(default=/bin:/sbin:/usr/bin:/usr/sbin)]),
@@ -1748,8 +1737,6 @@
ACX_FEATURE([enable],[emulate-getaddrinfo])
ACX_FEATURE([with],[perl])
ACX_FEATURE([with],[cgiurl])
-ACX_FEATURE([with],[nagios-user])
-ACX_FEATURE([with],[nagios-group])
ACX_FEATURE([with],[trusted-path])
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
|
