[icinga-checkins] icinga.org: icinga-core/rbartels/cgi-current: cleanup configure from recent reverts due to compatibility issues

git at icinga.org git at icinga.org
Thu Apr 14 22:20:16 CEST 2011


Module: icinga-core
Branch: rbartels/cgi-current
Commit: 0e5fe84163e50184cd8740c4e63f805009afc273
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=0e5fe84163e50184cd8740c4e63f805009afc273

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Apr 11 19:41:23 2011 +0200

cleanup configure from recent reverts due to compatibility issues

---

 configure |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/configure b/configure
index d1dfab0..39a3431 100755
--- a/configure
+++ b/configure
@@ -643,7 +643,7 @@ XSDC
 lockfile
 init_dir
 TMPDIR
-SPOOLDIR
+CHECKRESULTDIR
 HTTPD_CONF
 MAIL_PROG
 COMMAND_OPTS
@@ -729,7 +729,6 @@ with_command_group
 with_mail
 with_httpd_conf
 with_checkresult_dir
-with_spool_dir
 with_temp_dir
 with_init_dir
 with_lockfile
@@ -1418,8 +1417,7 @@ Optional Packages:
   --with-httpd-conf=<path_to_conf>
                           sets path to Apache conf.d directory
   --with-checkresult-dir=<path>
-                          obsolete option, use --with-spool-dir instead
-  --with-spool-dir=<path> sets path to spool base directory
+                          sets path to check results spool directory
   --with-temp-dir=<path>  sets path to temp directory
   --with-init-dir=<path>  sets directory to place init script into
   --with-lockfile=<path>  sets path and file name for lock file
@@ -5206,24 +5204,17 @@ if test x$HTTPD_CONF = xno; then
 fi
 
 
+CHECKRESULTDIR=no
 
 # Check whether --with-checkresult-dir was given.
 if test "${with_checkresult_dir+set}" = set; then :
-  withval=$with_checkresult_dir; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: obsolete option, use --with-spool-dir instead" >&5
-$as_echo "$as_me: WARNING: obsolete option, use --with-spool-dir instead" >&2;}
-fi
-
-SPOOLDIR=no
-
-# Check whether --with-spool-dir was given.
-if test "${with_spool_dir+set}" = set; then :
-  withval=$with_spool_dir; SPOOLDIR=$withval
+  withval=$with_checkresult_dir; CHECKRESULTDIR=$withval
 else
-  SPOOLDIR=no
+  CHECKRESULTDIR=no
 fi
 
-if test x$SPOOLDIR = xno; then
-	SPOOLDIR="$localstatedir/spool/icinga"
+if test x$CHECKRESULTDIR = xno; then
+	CHECKRESULTDIR="$localstatedir/spool/checkresults"
 fi
 
 
@@ -8274,8 +8265,8 @@ fi
 $as_echo "        Install \${prefix}:  $prefix" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:                 Lock file:  $lockfile" >&5
 $as_echo "                Lock file:  $lockfile" >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result:           Spool directory:  $SPOOLDIR" >&5
-$as_echo "          Spool directory:  $SPOOLDIR" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:    Check result directory:  $CHECKRESULTDIR" >&5
+$as_echo "   Check result directory:  $CHECKRESULTDIR" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:            Init directory:  $init_dir" >&5
 $as_echo "           Init directory:  $init_dir" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result:   Apache conf.d directory:  $HTTPD_CONF" >&5





More information about the icinga-checkins mailing list