From 7b006d95da2f6af1686ca88745c1d105fe94b67f Mon Sep 17 00:00:00 2001
From: x99laine <x99laine>
Date: Sun, 21 Nov 2004 18:33:55 +0000
Subject: [PATCH] Work towards distribution and Apache configuration

* Install :
  - Do not modify PHP include path from auto.prepend.inc.php          -SHK
  - Add install.d/apache.conf with a sample Apache config file        -SHK
---
 ChangeLog                    |  5 +++++
 include/auto.prepend.inc.php |  4 +---
 install.d/apache.conf        | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 install.d/apache.conf

diff --git a/ChangeLog b/ChangeLog
index 7ff9d1b..04376d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ New :
 
 	* Core :
 		- Members can be disabled. It deletes volatile datas.				-MC
+	
+	* Install :
+		- Do not modify PHP include path from auto.prepend.inc.php			-SHK
+		- Add install.d/apache.conf with a sample Apache config file		-SHK
 
 	* Mails : Use HermesMailer.												-MC
 
@@ -144,6 +148,7 @@ ACRONYMS :
 	* FRU : Florent Bruneau  (fruneau)  <florent.bruneau@m4x.org>
 	* JS  : Jean Sébastien Bedo         <jean-sebastien.bedo@m4x.org>
 	* MC  : Pierre Habouzit  (MadCoder) <pierre.habouzit@m4x.org>
+	* SHK : Jeremy Lainé     (Sharky)   <jeremy.laine@m4x.org>
 	* VP  : Vincent Palatin             <vincent.palatin@m4x.org>
 	* XdX : Alexandre Hô     (XandreX)  <alexandre.ho@m4x.org>
 
diff --git a/include/auto.prepend.inc.php b/include/auto.prepend.inc.php
index 5a5be81..941f216 100644
--- a/include/auto.prepend.inc.php
+++ b/include/auto.prepend.inc.php
@@ -18,11 +18,9 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: auto.prepend.inc.php,v 1.31 2004-11-16 20:36:12 x2000habouzit Exp $
+        $Id: auto.prepend.inc.php,v 1.32 2004-11-21 18:33:58 x99laine Exp $
  ***************************************************************************/
 
-ini_set('include_path',"/home/x2000habouzit/dev/diogenes/lib/:/usr/share/php:".ini_get('include_path'));
- 
 function microtime_float() 
 { 
     list($usec, $sec) = explode(" ", microtime()); 
diff --git a/install.d/apache.conf b/install.d/apache.conf
new file mode 100644
index 0000000..25393e9
--- /dev/null
+++ b/install.d/apache.conf
@@ -0,0 +1,15 @@
+Alias /xorg /usr/share/xorg/htdocs
+
+<Directory /usr/share/xorg>
+  Options FollowSymLinks MultiViews
+  Order allow,deny
+  Allow from all
+  <IfModule mod_dir.c>
+    DirectoryIndex index.php
+  </IfModule>
+  <IfModule mod_php4.c>
+    php_value magic_quotes_gpc On
+    php_value register_globals Off
+    php_value include_path ".:/usr/share/xorg/include:/usr/share/diogenes/lib:/usr/share/php/smarty/libs:/usr/share/php"
+  </IfModule>
+</Directory>
-- 
2.1.4