[SM-Commit] GIT changes to master grimoire by Bearcat Sandor (abe9c1b3c346b60c3fce622404e0a359ebb8db23)

Bearcat Sandor scm at mail.sourcemage.org
Fri Sep 15 18:03:46 EDT 2006


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							
+



More information about the SM-Commit mailing list