--- configure.old	2008-03-10 22:04:41.000000000 +0100
+++ configure.old	2012-01-04 09:46:38.000000000 +0100
@@ -362,7 +362,11 @@ 
 AC_SUBST(NAGIOS_INSTALL_OPTS)
 
 
-AC_ARG_ENABLE(command-args,--enable-command-args allows clients to specify command arguments.  *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!,AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS))
+AC_ARG_ENABLE(command-args,--enable-command-args allows clients to specify command arguments.  *** THIS IS A SECURITY RISK! *** Read the SECURITY file before using this option!,[
+	if test x$enableval = xyes; then
+		AC_DEFINE_UNQUOTED(ENABLE_COMMAND_ARGUMENTS)
+	fi
+	])
 
 
 AC_PATH_PROG(PERL,perl)