From 85a06399d8f09f7656b2a45f72b8745481db0bca Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Thu, 28 Jan 2010 09:41:33 +1300
Subject: [PATCH] Allow config files to be under /usr/local

---
 inc/always.php    | 6 ++++++
 inc/always.php.in | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/inc/always.php b/inc/always.php
index 21dc0b5c..5b8bd04a 100644
--- a/inc/always.php
+++ b/inc/always.php
@@ -94,6 +94,12 @@ if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
 else if ( @file_exists('/etc/davical/config.php') ) {
   include('/etc/davical/config.php');
 }
+else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
+  include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
+}
+else if ( @file_exists('/usr/local/etc/davical/config.php') ) {
+  include('/usr/local/etc/davical/config.php');
+}
 else if ( @file_exists('../config/config.php') ) {
   include('../config/config.php');
 }
diff --git a/inc/always.php.in b/inc/always.php.in
index 1b21935a..86c1427e 100644
--- a/inc/always.php.in
+++ b/inc/always.php.in
@@ -94,6 +94,12 @@ if ( @file_exists('/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
 else if ( @file_exists('/etc/davical/config.php') ) {
   include('/etc/davical/config.php');
 }
+else if ( @file_exists('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php') ) {
+  include('/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php');
+}
+else if ( @file_exists('/usr/local/etc/davical/config.php') ) {
+  include('/usr/local/etc/davical/config.php');
+}
 else if ( @file_exists('../config/config.php') ) {
   include('../config/config.php');
 }