Skip to Content.
Sympa Menu

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

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 (1b9e51f9bdca156d46529051104089f83483beff)
  • Date: Sun, 8 Oct 2006 06:24:47 -0500

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

php-pear/php/BUILD | 11 ++++++-----
php-pear/php/CONFIGURE | 3 ++-
php-pear/php/DEPENDS | 14 ++++++++------
php-pear/php/HISTORY | 6 ++++++
php-pear/php/INSTALL | 4 +---
5 files changed, 23 insertions(+), 15 deletions(-)

New commits:
commit 1b9e51f9bdca156d46529051104089f83483beff
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

Added fixes in php for Bug #13132. Also fixed to use
install_config_file.

diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index 522c930..6a03811 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -35,10 +35,12 @@ 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"
+if [ "$PHP5_X11LIBS" == "y" ]; then
+ if check_if_xorg_modular_libs; then
+ OPTS="$OPTS --with-xpm-dir=/usr"
+ else
+ OPTS="$OPTS --with-xpm-dir=/usr/X11R6"
+ fi
fi &&

./configure --prefix=${INSTALL_ROOT}/usr \
@@ -67,7 +69,6 @@ fi &&
--enable-pdo \
--with-layout=GNU \
$OPTS &&
-invoke_gcc &&
make &&

# safety precaution against earlier PHP installations removing httpd.conf
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 70fad22..1018712 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -24,5 +24,6 @@ config_query_option PHP4_FCGI 'Ena
'--disable-fastcgi' &&

config_query_list PHP4_APACHE 'Which Apache module to build?' \
- none handler filter

+ none handler filter &&

+config_query PHP5_X11LIBS "Would you like to use libxpm? (Requires
X11-libs)" n
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index b870a1b..9b170ee 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -14,6 +14,13 @@ case "$PHP4_APACHE" in
filter) depends APACHE2;;
esac &&

+if [ "$PHP5_X11LIBS" == "y" ]; then
+ depends X11-LIBS
+ if check_if_xorg_modular_libs; then
+ depends libxpm
+ fi
+fi &&
+
optional_depends C-CLIENT \
"--with-imap" \
"--without-imap" \
@@ -138,9 +145,4 @@ optional_depends libpng
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 check_if_xorg_modular_libs; then
- depends libxpm
-fi
-
+ "for on the fly graphics creation (GD support)"
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 56f967a..b3bf7f1 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,9 @@
+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.
+ * BUILD: Only add option for --with-xpm-dir is desired. Bug #13132
+ * INSTALL: use install_config_file
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.

diff --git a/php-pear/php/INSTALL b/php-pear/php/INSTALL
index 4fdf8d2..71c8fec 100755
--- a/php-pear/php/INSTALL
+++ b/php-pear/php/INSTALL
@@ -1,5 +1,3 @@
default_install &&

-if ! [ -e ${INSTALL_ROOT}/etc/php.ini ]; then
- cp php.ini-dist ${INSTALL_ROOT}/etc/php.ini
-fi
+install_config_file php.ini-dist /etc/php.ini



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (1b9e51f9bdca156d46529051104089f83483beff), George Sherwood, 10/08/2006

Archive powered by MHonArc 2.6.24.

Top of Page