Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (40ba20b8b770998b0b4bbe5a83fcc48d39b164d3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (40ba20b8b770998b0b4bbe5a83fcc48d39b164d3)
  • Date: Mon, 9 Oct 2006 05:14:16 -0500

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

php-pear/php/BUILD | 8 +++++++-
php-pear/php/CONFIGURE | 5 ++++-
php-pear/php/DEPENDS | 15 +++++++++++----
php-pear/php/HISTORY | 7 +++++++
4 files changed, 29 insertions(+), 6 deletions(-)

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 &&

depends flex &&
+depends readline "--with-readline=/usr" &&

# 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 &&

+if [ "$PHP5_GD" == "external" ]; then
+ depends gd "--with-gd=/usr --enable-gd-native-ttf"
+fi &&
+
optional_depends C-CLIENT \
"--with-imap" \
"--without-imap" \
@@ -142,7 +147,9 @@ optional_depends libpng
"--without-png-dir" \
"for PNG support (also required for GD)" &&

-optional_depends gd
\
- "--with-gd --enable-gd-native-ttf
--with-freetype-dir=/usr/lib" \
- "--without-gd"
\
- "for on the fly graphics creation (GD support)"
+if [ "$PHP5_GD" != "none" ]; then
+ optional_depends freetype2 \
+ "--with-freetype-dir=/usr" \
+ "--without-freetype-dir" \
+ "for freetype2 support"
+fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index b3bf7f1..82eb2b2 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,10 @@
+2006-10-09 George Sherwood <george AT beernabeer.com>
+ * CONFIGURE: Added query for usage of GD
+ * BUILD: Enable internal GD is requested
+ * DEPENDS: Add depends readline. Bug #8605
+ Add depends gd if external GD is requested
+ Add optional_depends freetype2. Bug #13132
+
2006-10-08 George Sherwood <george AT beernabeer.com>
* CONFIGURE: Ask if libxpm is desired. Bug #13132
* DEPENDS: Add depends X11-LIBS is desired. Bug #13132.



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (40ba20b8b770998b0b4bbe5a83fcc48d39b164d3), George Sherwood, 10/09/2006

Archive powered by MHonArc 2.6.24.

Top of Page