sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Bearcat Sandor (abe9c1b3c346b60c3fce622404e0a359ebb8db23)
- From: Bearcat Sandor <scm AT mail.sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Bearcat Sandor (abe9c1b3c346b60c3fce622404e0a359ebb8db23)
- Date: Fri, 15 Sep 2006 17:03:46 -0500
GIT changes to master grimoire by Bearcat Sandor <sourcemage AT feline-soul.com>:
php-pear/php/BUILD | 7 +++++++
php-pear/php/CONFIGURE | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 57bc9c3207d1a57a5b5ec808ea6ade8ce1b772d8
Author: Bearcat Sandor <sourcemage AT feline-soul.com>
Commit: Bearcat Sandor <sourcemage AT feline-soul.com>
changed BUILD in php spell to check for xorg or xorg-server to set
location of xpm properly. Thanks Ruskie!
diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index 19a09e5..522c930 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -34,6 +34,13 @@ case "$PHP4_APACHE" in
;;
esac &&
+#Check for xorg or xserver and pass location of xpm
+if check_if_xorg_modular_libs; then
+ OPTS="$OPTS --with-xpm-dir=/usr"
+else
+ OPTS="$OPTS --with-xpm-dir=/usr/X11R6"
+fi &&
+
./configure --prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--with-exec-dir=${INSTALL_ROOT}/usr/bin \
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 0ca9329..70fad22 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -24,4 +24,5 @@ config_query_option PHP4_FCGI 'Ena
'--disable-fastcgi' &&
config_query_list PHP4_APACHE 'Which Apache module to build?' \
- none handler filter
+ none handler filter
+
- [SM-Commit] GIT changes to master grimoire by Bearcat Sandor (abe9c1b3c346b60c3fce622404e0a359ebb8db23), Bearcat Sandor, 09/15/2006
Archive powered by MHonArc 2.6.24.