From 0804f51508d65ecd02b974c59407c3f1629e4df8 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 22 Dec 2008 23:38:42 +0000
Subject: * Make PHP extensions directory a variable * Check to ensure that
 each needed extension exists before adding to php.ini

---
 etc/rc.php_ini_setup | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup
index 4df3d76..9bd6df5 100755
--- a/etc/rc.php_ini_setup
+++ b/etc/rc.php_ini_setup
@@ -2,6 +2,7 @@
 
 # Set our operating platform
 PLATFORM=`cat /etc/platform`
+EXTENSIONSDIR="/usr/local/lib/php/20060613/"
 
 PHPMODULES="apc \
 	bcmath \
@@ -56,7 +57,7 @@ zlib.output_compression = On
 zlib.output_compression_level = 1
 include_path = ".:/etc/inc:/usr/local/www:/usr/local/captiveportal:/usr/local/pkg"
 uploadprogress.file.filename_template = /tmp/uploadprogress_%s.txt
-extension_dir=/usr/local/lib/php/20060613/
+extension_dir=${EXTENSIONSDIR}
 
 ; Extensions
 EOF
@@ -71,7 +72,12 @@ for EXT in $PHPMODULES; do
 		fi
 	done
 	if [ "$SHOULDADD" = "true" ]; then
-		echo "extension=${EXT}.so" >> /usr/local/lib/php.ini
+		if [ -f "${EXTENSIONSDIR}/${EXT}.so" ]; then
+			echo "extension=${EXT}.so" >> /usr/local/lib/php.ini
+		else
+			echo ">>> WARNING!  Could not locate ${EXTENSIONSDIR}/${EXT}.so"
+			echo ">>> WARNING!  Could not locate ${EXTENSIONSDIR}/${EXT}.so <<< " | logger -p daemon.info -i -t rc.php_ini_setup
+		fi
 	fi
 done
 
-- 
cgit v1.1