[icinga-checkins] icinga.org: icinga-core/rbartels/cgi-current: install: replace configure option --with-checkresults-dir by --with-spool-dir #1224

git at icinga.org git at icinga.org
Thu Mar 17 10:56:03 CET 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Wed Mar 16 09:22:30 2011 +0100

install: replace configure option --with-checkresults-dir by --with-spool-dir #1224

fixes #1224

---

 Changelog    |    2 ++
 configure    |   27 ++++++++++++++++++---------
 configure.in |    2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Changelog b/Changelog
index 4551a68..756260b 100644
--- a/Changelog
+++ b/Changelog
@@ -24,6 +24,8 @@ FIXES
 * classic ui: fix display_name survive reconfiguration and is use instead of host_name in classic ui #1282
 * classic ui: don't show pause/continue urls on non-refreshable pages
 
+* install: replace configure option --with-checkresults-dir by --with-spool-dir #1224
+
 
 1.3.0 - 16/02/2011
 
diff --git a/configure b/configure
index 54a6cb1..b08ac75 100755
--- a/configure
+++ b/configure
@@ -643,7 +643,7 @@ XSDC
 lockfile
 init_dir
 TMPDIR
-CHECKRESULTDIR
+SPOOLDIR
 HTTPD_CONF
 MAIL_PROG
 COMMAND_OPTS
@@ -729,6 +729,7 @@ with_command_group
 with_mail
 with_httpd_conf
 with_checkresult_dir
+with_spool_dir
 with_temp_dir
 with_init_dir
 with_lockfile
@@ -1417,7 +1418,8 @@ Optional Packages:
   --with-httpd-conf=<path_to_conf>
                           sets path to Apache conf.d directory
   --with-checkresult-dir=<path>
-                          sets path to check results spool directory
+                          obsolete option, use --with-spool-dir instead
+  --with-spool-dir=<path> sets path to spool base 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
@@ -5204,17 +5206,24 @@ 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; CHECKRESULTDIR=$withval
+  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
 else
-  CHECKRESULTDIR=no
+  SPOOLDIR=no
 fi
 
-if test x$CHECKRESULTDIR = xno; then
-	CHECKRESULTDIR="$localstatedir/spool/checkresults"
+if test x$SPOOLDIR = xno; then
+	SPOOLDIR="$localstatedir/spool/icinga"
 fi
 
 
@@ -8265,8 +8274,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:    Check result directory:  $CHECKRESULTDIR" >&5
-$as_echo "   Check result directory:  $CHECKRESULTDIR" >&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:            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
diff --git a/configure.in b/configure.in
index 301197e..0b1317c 100644
--- a/configure.in
+++ b/configure.in
@@ -262,7 +262,7 @@ fi
 AC_SUBST(HTTPD_CONF)
 
 dnl Location of check spool path
-AC_ARG_WITH(checkresult-dir,AC_HELP_STRING([--with-checkresult-dir=<path>],[obsolte option, use --with-spool-dir instead]),[AC_MSG_WARN([obsolete option, use --with-spool-dir instead])])
+AC_ARG_WITH(checkresult-dir,AC_HELP_STRING([--with-checkresult-dir=<path>],[obsolete option, use --with-spool-dir instead]),[AC_MSG_WARN([obsolete option, use --with-spool-dir instead])])
 SPOOLDIR=no
 AC_ARG_WITH(spool-dir,AC_HELP_STRING([--with-spool-dir=<path>],[sets path to spool base directory]),SPOOLDIR=$withval,SPOOLDIR=no)
 if test x$SPOOLDIR = xno; then





More information about the icinga-checkins mailing list