[icinga-checkins] icinga.org: icinga-web/mhein/testing: * added configure flag to squishloader cache

git at icinga.org git at icinga.org
Thu Aug 11 13:47:37 CEST 2011


Module: icinga-web
Branch: mhein/testing
Commit: 83ce3e1f33791bcef8f91da5c0fc82415771da30
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=83ce3e1f33791bcef8f91da5c0fc82415771da30

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Aug 10 13:56:39 2011 +0200

* added configure flag to squishloader cache

---

 .../AppKit/config/{module.xml => module.xml.in}    |    2 +-
 configure                                          |    3 ++-
 configure.ac                                       |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/modules/AppKit/config/module.xml b/app/modules/AppKit/config/module.xml.in
similarity index 97%
rename from app/modules/AppKit/config/module.xml
rename to app/modules/AppKit/config/module.xml.in
index acf810e..d50b8c3 100755
--- a/app/modules/AppKit/config/module.xml
+++ b/app/modules/AppKit/config/module.xml.in
@@ -28,7 +28,7 @@
 
                 <setting name="squishloader">
                     <ae:parameter name="cache_dir">%core.cache_dir%/Squished</ae:parameter>
-                    <ae:parameter name="use_caching">true</ae:parameter>
+                    <ae:parameter name="use_caching">@flag_caching@</ae:parameter>
                 </setting>
 
                 <setting name="user_preferences_default">
diff --git a/configure b/configure
index a77776c..70e2bf4 100755
--- a/configure
+++ b/configure
@@ -2574,7 +2574,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile etc/sitecfg/Makefile app/config/databases.xml app/config/icinga.xml app/config/settings.xml app/modules/Api/config/access.xml app/modules/AppKit/cache/Widgets/SquishLoader.xml etc/build.properties tests/phpunit/test.properties etc/apache2/icinga-web.conf bin/clearcache.sh pub/.htaccess pub/soap/.htaccess"
+ac_config_files="$ac_config_files Makefile lib/Makefile pub/Makefile etc/Makefile bin/Makefile doc/Makefile app/Makefile etc/sitecfg/Makefile app/config/databases.xml app/config/icinga.xml app/config/settings.xml app/modules/Api/config/access.xml app/modules/AppKit/cache/Widgets/SquishLoader.xml app/modules/AppKit/config/module.xml etc/build.properties tests/phpunit/test.properties etc/apache2/icinga-web.conf bin/clearcache.sh pub/.htaccess pub/soap/.htaccess"
 
 
 cat >confcache <<\_ACEOF
@@ -3296,6 +3296,7 @@ do
     "app/config/settings.xml") CONFIG_FILES="$CONFIG_FILES app/config/settings.xml" ;;
     "app/modules/Api/config/access.xml") CONFIG_FILES="$CONFIG_FILES app/modules/Api/config/access.xml" ;;
     "app/modules/AppKit/cache/Widgets/SquishLoader.xml") CONFIG_FILES="$CONFIG_FILES app/modules/AppKit/cache/Widgets/SquishLoader.xml" ;;
+    "app/modules/AppKit/config/module.xml") CONFIG_FILES="$CONFIG_FILES app/modules/AppKit/config/module.xml" ;;
     "etc/build.properties") CONFIG_FILES="$CONFIG_FILES etc/build.properties" ;;
     "tests/phpunit/test.properties") CONFIG_FILES="$CONFIG_FILES tests/phpunit/test.properties" ;;
     "etc/apache2/icinga-web.conf") CONFIG_FILES="$CONFIG_FILES etc/apache2/icinga-web.conf" ;;
diff --git a/configure.ac b/configure.ac
index f413835..256c200 100755
--- a/configure.ac
+++ b/configure.ac
@@ -279,6 +279,7 @@ AC_CONFIG_FILES([
 	app/config/settings.xml
     app/modules/Api/config/access.xml
 	app/modules/AppKit/cache/Widgets/SquishLoader.xml
+	app/modules/AppKit/config/module.xml
 	etc/build.properties
 	tests/phpunit/test.properties
 	etc/apache2/icinga-web.conf





More information about the icinga-checkins mailing list