New commits:
commit 40ba20b8b770998b0b4bbe5a83fcc48d39b164d3
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>
Updated php to fix two bugs and clean up build process. Bugs #8605 and
13132.
diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index 6a03811..11b2617 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -43,6 +43,11 @@ if [ "$PHP5_X11LIBS" == "y" ]; then
fi
fi &&
+#check to see if internal GD requested
+if [ "$PHP5_GD" == "internal" ]; then
+ OPTS="--with-gd --enable-gd-native-ttf $OPTS"
+fi &&
+
./configure --prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--with-exec-dir=${INSTALL_ROOT}/usr/bin \
@@ -74,5 +79,6 @@ make
# safety precaution against earlier PHP installations removing httpd.conf
# we can remove this sedit after a couple of ISOs (today's 2003-11-05)
if [ -f $INSTALL_LOGS/$SPELL-* ]
- then sedit 's|.*/httpd\.conf.*||g' $INSTALL_LOGS/$SPELL-*
+ then sedit 's|.*/httpd\.conf.*||g' $INSTALL_LOGS/$SPELL-*
fi
+
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 1018712..62b66a8 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -26,4 +26,7 @@ config_query_option PHP4_FCGI 'Ena
config_query_list PHP4_APACHE 'Which Apache module to build?' \
none handler filter &&
-config_query PHP5_X11LIBS "Would you like to use libxpm? (Requires
X11-libs)" n
+config_query PHP5_X11LIBS "Would you like to use libxpm? (Requires
X11-libs)" n &&
+
+config_query_list PHP5_GD "Which GD library to use?" \
+ none internal external
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 9b170ee..c5dc43f 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -1,6 +1,7 @@
source $GRIMOIRE/FUNCTIONS &&
# Officially ZLib is optional, but we require it because some other
# optional extensions depend on it, and it"s omnipresent anyway.
@@ -21,6 +22,10 @@ if [ "$PHP5_X11LIBS" == "y" ]; then
fi
fi &&