[icinga-checkins] icinga.org: icinga-core/next: fix configure does not honour --enable-cgi-log correctly

git at icinga.org git at icinga.org
Tue Apr 3 09:19:51 CEST 2012


Module: icinga-core
Branch: next
Commit: c55dcd4653e59ad384387cec02fb5140d8b025d2
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=c55dcd4653e59ad384387cec02fb5140d8b025d2

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Mar  5 17:39:11 2012 +0100

fix configure does not honour --enable-cgi-log correctly

the AC detection was not correct, and therefore always used
the default "yes", which is now changed to "no" and fixed to be
enabled by setting this param.

---

 configure    |   17 +++++++++++------
 configure.in |    7 ++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index c0d18f3..f30b922 100755
--- a/configure
+++ b/configure
@@ -749,7 +749,7 @@ with_temp_file
 with_plugin_dir
 with_eventhandler_dir
 with_log_dir
-enable_enable_cgi_log
+enable_cgi_log
 with_cgi_log_dir
 with_ext_cmd_file_dir
 with_p1_file_dir
@@ -1408,7 +1408,7 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-cgi-log        enables cgi logging - experimental!!
+--enable-cgi-log enables cgi logging - experimental!!
   --disable-statusmap     disables compilation of statusmap CGI
   --disable-statuswrl     disables compilation of statuswrl (VRML) CGI
   --enable-nanosleep      enables use of nanosleep (instead sleep) in event
@@ -5408,13 +5408,18 @@ fi
 
 
 ENABLE_CGILOG=no
-# Check whether --enable-enable-cgi-log was given.
-if test "${enable_enable_cgi_log+set}" = set; then :
-  enableval=$enable_enable_cgi_log; ENABLE_CGILOG=$enableval
+# Check whether --enable-cgi-log was given.
+if test "${enable_cgi_log+set}" = set; then :
+  enableval=$enable_cgi_log;
+        if test x$enableval = xyes; then
+		ENABLE_CGILOG=yes
+	fi
+
 else
-  ENABLE_CGILOG=yes
+  ENABLE_CGILOG=no
 fi
 
+
 if test x$ENABLE_CGILOG = xyes; then
         ENABLECGILOG=1
 else
diff --git a/configure.in b/configure.in
index 34cc509..24c4620 100644
--- a/configure.in
+++ b/configure.in
@@ -357,7 +357,12 @@ AC_SUBST(LOGDIR)
 
 dnl Enable cgi logging
 ENABLE_CGILOG=no
-AC_ARG_ENABLE(enable-cgi-log,AC_HELP_STRING([--enable-cgi-log],[enables cgi logging - experimental!!]),ENABLE_CGILOG=$enableval,ENABLE_CGILOG=yes)
+AC_ARG_ENABLE(cgi-log,--enable-cgi-log enables cgi logging - experimental!!,[
+        if test x$enableval = xyes; then
+		ENABLE_CGILOG=yes
+	fi
+	],ENABLE_CGILOG=no)
+
 if test x$ENABLE_CGILOG = xyes; then
         ENABLECGILOG=1
 else





More information about the icinga-checkins mailing list