[icinga-checkins] icinga.org: icinga-web/master: * Cleaner config files with doc and doc resources

git at icinga.org git at icinga.org
Fri Feb 10 15:19:15 CET 2012


Module: icinga-web
Branch: master
Commit: 2aec1efefe6c4b2d0863e5cea540959a92925401
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=2aec1efefe6c4b2d0863e5cea540959a92925401

Author: Marius Hein <marius.hein at netways.de>
Date:   Fri Feb 10 15:16:17 2012 +0100

* Cleaner config files with doc and doc resources
* Added config options for access.xml (fixes #2259)
* Whitespace fixes

---

 aclocal.m4 |   66 ++++++++++++++++++++++++++++++------------------------------
 configure  |   28 ++++++++++++------------
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
old mode 100755
new mode 100644
index c96995a..478f2d4
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -26,7 +26,7 @@ AC_DEFUN([ACICINGA_CHECK_BIN], [
    AC_PATH_PROG([$1],[$2],[not found])
 
    AS_IF([ test "XX${$1}" == "XXnot found" ],
-	 [ AC_MSG_WARN([binary $2 not found in PATH]) ])
+     [ AC_MSG_WARN([binary $2 not found in PATH]) ])
 
    test "XX${$1}" == "XXnot found" && $1=""
 ])
@@ -39,51 +39,51 @@ AC_DEFUN([ACICINGA_RESOURCE_EXISTS], [
 ])
 
 AC_DEFUN([ACICINGA_CHECK_API], [
-	AC_MSG_CHECKING([for IcingaApi])
-	AS_IF([ test -e $1/IcingaApi.php && $GREP -q "class IcingaApi" $1/IcingaApi.php ],
-		[ AC_MSG_RESULT([found])    ],
-		[ AC_MSG_ERROR([not found]) ])
+    AC_MSG_CHECKING([for IcingaApi])
+    AS_IF([ test -e $1/IcingaApi.php && $GREP -q "class IcingaApi" $1/IcingaApi.php ],
+        [ AC_MSG_RESULT([found])    ],
+        [ AC_MSG_ERROR([not found]) ])
 ])
 
 AC_DEFUN([ACICINGA_EXTRACT_VERSION], [
-	$1=`echo "$PACKAGE_VERSION" | $SED 's/^\([[0-9]]\+\)\.\([[0-9]]\+\)\.\([[0-9]]\+\)\(\-\(.\+\)\)\?$/\1/g'`
-	$2=`echo "$PACKAGE_VERSION" | $SED 's/^\([[0-9]]\+\)\.\([[0-9]]\+\)\.\([[0-9]]\+\)\(\-\(.\+\)\)\?$/\2/g'`
-	$3=`echo "$PACKAGE_VERSION" | $SED 's/^\([[0-9]]\+\)\.\([[0-9]]\+\)\.\([[0-9]]\+\)\(\-\(.\+\)\)\?$/\3/g'`
-	$4=`echo "$PACKAGE_VERSION" | $SED 's/^\([[0-9]]\+\)\.\([[0-9]]\+\)\.\([[0-9]]\+\)\(\-\(.\+\)\)\?$/\5/g'`
+    $1=`echo "$PACKAGE_VERSION" | $SED 's/^\([[0-9]]\+\)\.\([[0-9]]\+\)\.\([[0-9]]\+\)\(\-\(.\+\)\)\?$/\1/g'`
+    $2=`echo "$PACKAGE_VERSION" | $SED 's/^\([[0-9]]\+\)\.\([[0-9]]\+\)\.\([[0-9]]\+\)\(\-\(.\+\)\)\?$/\2/g'`
+    $3=`echo "$PACKAGE_VERSION" | $SED 's/^\([[0-9]]\+\)\.\([[0-9]]\+\)\.\([[0-9]]\+\)\(\-\(.\+\)\)\?$/\3/g'`
+    $4=`echo "$PACKAGE_VERSION" | $SED 's/^\([[0-9]]\+\)\.\([[0-9]]\+\)\.\([[0-9]]\+\)\(\-\(.\+\)\)\?$/\5/g'`
 ])
 
 AC_DEFUN([ACICINGA_REMOVE_BLOCK], [
-	$SED -e "/###BEGIN_$2###/,/###END_$2###/d" $1 > $1.tmp
-	mv $1.tmp $1
+    $SED -e "/###BEGIN_$2###/,/###END_$2###/d" $1 > $1.tmp
+    mv $1.tmp $1
 ])
 
 AC_DEFUN([ACICINGA_CLEANUP_APICONFIG], [
-	FILE="$2"
-	BLOCKS=`echo "CONNECTION_IDO CONNECTION_LIFESTATUS CONNECTION_FILE" | $SED "s/\s*$1//g"`
-	AC_MSG_NOTICE([Create api config in $FILE])
-	for T in $BLOCKS; do
-		ACICINGA_REMOVE_BLOCK([$FILE],[$T])
-	done
+    FILE="$2"
+    BLOCKS=`echo "CONNECTION_IDO CONNECTION_LIFESTATUS CONNECTION_FILE" | $SED "s/\s*$1//g"`
+    AC_MSG_NOTICE([Create api config in $FILE])
+    for T in $BLOCKS; do
+        ACICINGA_REMOVE_BLOCK([$FILE],[$T])
+    done
 ])
 
 AC_DEFUN([ACICINGA_DEVEL_MODE], [
-	AC_MSG_CHECKING([for devel-mode])
-	AS_IF([ test "$devel_mode" == "yes" ], [
-		flag_caching="false"
-dnl		Setting this to true cause errors
-dnl		for parrallel requests
-		flag_debug="false"
-		AC_MSG_RESULT([YES ... debug=false, jscache=false (!!)]) 
-	], [ AC_MSG_RESULT([no (good)]) ])
+    AC_MSG_CHECKING([for devel-mode])
+    AS_IF([ test "$devel_mode" == "yes" ], [
+        flag_caching="false"
+dnl     Setting this to true cause errors
+dnl     for parrallel requests
+        flag_debug="false"
+        AC_MSG_RESULT([YES ... debug=false, jscache=false (!!)]) 
+    ], [ AC_MSG_RESULT([no (good)]) ])
 ])
 
 AC_DEFUN([ACICINGA_PATH_GUESS], [
-	$2=$3
-	for x in $1; do
-		AC_MSG_CHECKING([if path $x exists])
-		AS_IF([test -d $x],
-			  [AC_MSG_RESULT([found]); $2=$x; break],
-			  [AC_MSG_RESULT([not found])]
-		)
-	done
+    $2=$3
+    for x in $1; do
+        AC_MSG_CHECKING([if path $x exists])
+        AS_IF([test -d $x],
+              [AC_MSG_RESULT([found]); $2=$x; break],
+              [AC_MSG_RESULT([not found])]
+        )
+    done
 ])
diff --git a/configure b/configure
index 6b90ce5..f82eabf 100755
--- a/configure
+++ b/configure
@@ -2077,10 +2077,10 @@ $as_echo "$ac_cv_path_SED" >&6; }
 
 # Extract version parts
 
-	VERSION_MAJOR=`echo "$PACKAGE_VERSION" | $SED 's/^\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(\-\(.\+\)\)\?$/\1/g'`
-	VERSION_MINOR=`echo "$PACKAGE_VERSION" | $SED 's/^\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(\-\(.\+\)\)\?$/\2/g'`
-	VERSION_PATCH=`echo "$PACKAGE_VERSION" | $SED 's/^\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(\-\(.\+\)\)\?$/\3/g'`
-	VERSION_EXTEN=`echo "$PACKAGE_VERSION" | $SED 's/^\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(\-\(.\+\)\)\?$/\5/g'`
+    VERSION_MAJOR=`echo "$PACKAGE_VERSION" | $SED 's/^\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(\-\(.\+\)\)\?$/\1/g'`
+    VERSION_MINOR=`echo "$PACKAGE_VERSION" | $SED 's/^\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(\-\(.\+\)\)\?$/\2/g'`
+    VERSION_PATCH=`echo "$PACKAGE_VERSION" | $SED 's/^\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(\-\(.\+\)\)\?$/\3/g'`
+    VERSION_EXTEN=`echo "$PACKAGE_VERSION" | $SED 's/^\([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\)\(\-\(.\+\)\)\?$/\5/g'`
 
 
 
@@ -2342,11 +2342,11 @@ if test "${with_web_apache_path+set}" = set; then :
   withval=$with_web_apache_path; web_apache_path=$withval
 else
   web_apache_path=
-	web_apache_path=/etc/apache2/conf.d
-	for x in /etc/httpd/conf.d /etc/apache2/conf.d /etc/apache/conf.d; do
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if path $x exists" >&5
+    web_apache_path=/etc/apache2/conf.d
+    for x in /etc/httpd/conf.d /etc/apache2/conf.d /etc/apache/conf.d; do
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if path $x exists" >&5
 $as_echo_n "checking if path $x exists... " >&6; }
-		if test -d $x; then :
+        if test -d $x; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }; web_apache_path=$x; break
 else
@@ -2354,7 +2354,7 @@ else
 $as_echo "not found" >&6; }
 
 fi
-	done
+    done
 
 
 fi
@@ -2866,13 +2866,13 @@ flag_debug=false
 CFLAGS=""
 
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for devel-mode" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for devel-mode" >&5
 $as_echo_n "checking for devel-mode... " >&6; }
-	if  test "$devel_mode" == "yes" ; then :
+    if  test "$devel_mode" == "yes" ; then :
 
-		flag_caching="false"
-		flag_debug="false"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: YES ... debug=false, jscache=false (!!)" >&5
+        flag_caching="false"
+        flag_debug="false"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: YES ... debug=false, jscache=false (!!)" >&5
 $as_echo "YES ... debug=false, jscache=false (!!)" >&6; }
 
 else





More information about the icinga-checkins mailing list