[Lunar-commits] r24990 - moonbase/trunk/compilers/php5
Auke Kok
sofar at lunar-linux.org
Fri Jun 22 22:12:24 CEST 2007
Author: sofar
Date: 2007-06-22 22:12:24 +0200 (Fri, 22 Jun 2007)
New Revision: 24990
Modified:
moonbase/trunk/compilers/php5/BUILD
moonbase/trunk/compilers/php5/CONFIGURE
moonbase/trunk/compilers/php5/CONFLICTS
moonbase/trunk/compilers/php5/DEPENDS
Log:
Cleaned up DEPENDS ("&&"), added _correct_ using of gd (now it uses real gd, not bundled with php).
Added clear fastcgi depend (cause PHP now builds cli version by default and cgi-fcgi version as an addition).
Removed useless spaces.
From: stelzy at gmail.com
Modified: moonbase/trunk/compilers/php5/BUILD
===================================================================
--- moonbase/trunk/compilers/php5/BUILD 2007-06-22 20:11:33 UTC (rev 24989)
+++ moonbase/trunk/compilers/php5/BUILD 2007-06-22 20:12:24 UTC (rev 24990)
@@ -10,38 +10,6 @@
OPTS="$OPTS "
fi
- if [ "$USE_FTP" == "y" ]; then
- OPTS="$OPTS --enable-ftp"
- fi
-
- if [ "$USE_SESSIONID" == "y" ]; then
- OPTS="$OPTS --enable-trans-sid"
- fi
-
- if [ "$USE_SQLITE" == "y" ]; then
- OPTS="$OPTS --enable-sqlite-utf8"
- fi
-
- if [ "$USE_SOCKETS" == "y" ]; then
- OPTS="$OPTS --enable-sockets"
- fi
-
- if [ "$USE_NCURSES" == "y" ]; then
- OPTS="$OPTS --with-ncurses"
- fi
-
- if [ "$USE_FASTCGI" == "y" ]; then
- OPTS="$OPTS --enable-fastcgi"
- fi
-
- if [ "$USE_MBYTESTR" == "y" ]; then
- OPTS="$OPTS --enable-mbstring"
- fi
-
- if [ "$USE_MBYTEREGEX" == "n" ]; then
- OPTS="$OPTS --disable-mbregex"
- fi
-
if module_installed apache || module_installed apache-mod_ssl ; then
OPTS="$OPTS --with-apxs=/usr/sbin/apxs"
elif module_installed apache2 ; then
@@ -59,6 +27,7 @@
# sedit "s:^:#include <errno.h>\n:" ext/mysql/libmysql/mysys_err.h &&
verbose_msg "OPTS=$OPTS" &&
+
./configure --prefix=/usr \
--sysconfdir=/etc \
--with-config-file-path=/etc \
@@ -70,6 +39,7 @@
--enable-force-cgi-redirect \
--enable-discard-path \
$OPTS &&
+
default_make
) > $C_FIFO 2>&1
Modified: moonbase/trunk/compilers/php5/CONFIGURE
===================================================================
--- moonbase/trunk/compilers/php5/CONFIGURE 2007-06-22 20:11:33 UTC (rev 24989)
+++ moonbase/trunk/compilers/php5/CONFIGURE 2007-06-22 20:12:24 UTC (rev 24990)
@@ -1,12 +1,9 @@
mquery USE_IMAP "Install imap support?" y
mquery USE_REGGLOBALS "Enable global variable support (potential security risk)?" n
-mquery USE_FTP "Install ftp support?" y
-mquery USE_SESSIONID "Enable transparent session id?" y
-mquery USE_SQLITE "Enable UTF-8 support for SQLite?" y
-mquery USE_SOCKETS "Enable sockets support (experimental)?" y
-mquery USE_NCURSES "Enable ncurses support (experimental)?" y
-if module_installed lighttpd; then
- mquery USE_FASTCGI "Build FastCGI version (required by lighttpd)?" y
-fi
-mquery USE_MBYTESTR "Enable multibyte string support?" n
-mquery USE_MBYTEREGEX "Enable multibyte regular expression functions?" n
+mquery USE_FTP "Install ftp support?" y "--enable-ftp" ""
+mquery USE_SESSIONID "Enable transparent session id?" y "--enable-trans-sid" ""
+mquery USE_SQLITE "Enable UTF-8 support for SQLite?" y "--enable-sqlite-utf8" ""
+mquery USE_SOCKETS "Enable sockets support (experimental)?" y "--enable-sockets" ""
+mquery USE_NCURSES "Enable ncurses support (experimental)?" y "--with-ncurses" ""
+mquery USE_MBYTESTR "Enable multibyte string support?" n "--enable-mbstring" ""
+mquery USE_MBYTEREGEX "Enable multibyte regular expression functions?" n "" "--disable-mbregex"
Modified: moonbase/trunk/compilers/php5/CONFLICTS
===================================================================
--- moonbase/trunk/compilers/php5/CONFLICTS 2007-06-22 20:11:33 UTC (rev 24989)
+++ moonbase/trunk/compilers/php5/CONFLICTS 2007-06-22 20:12:24 UTC (rev 24990)
@@ -1,3 +1,2 @@
-conflicts php &&
+conflicts php
conflicts php5-suhosin
-
Modified: moonbase/trunk/compilers/php5/DEPENDS
===================================================================
--- moonbase/trunk/compilers/php5/DEPENDS 2007-06-22 20:11:33 UTC (rev 24989)
+++ moonbase/trunk/compilers/php5/DEPENDS 2007-06-22 20:12:24 UTC (rev 24990)
@@ -1,105 +1,110 @@
-depends readline &&
-depends libxml2 &&
+depends readline
+depends libxml2
-optional_depends "aspell" \
- "--with-pspell" \
- "" \
- "for spelling functions" &&
+optional_depends "lighttpd" \
+ "--enable-fastcgi" \
+ "" \
+ "build FastCGI version also (for LigHTTPD)"
-optional_depends "mhash" \
- "--with-mhash" \
- "" \
- "for hash functions support" &&
+optional_depends "aspell" \
+ "--with-pspell" \
+ "" \
+ "for spelling functions"
-optional_depends "mcrypt" \
- "--with-mcrypt" \
- "" \
- "for crypto library" &&
+optional_depends "mhash" \
+ "--with-mhash" \
+ "" \
+ "for hash functions support"
-optional_depends "gmp" \
- "--with-gmp" \
- "" \
- "GNU math lib support" &&
+optional_depends "mcrypt" \
+ "--with-mcrypt" \
+ "" \
+ "for crypto library"
-optional_depends "openssl" \
- "--with-openssl" \
- "" \
- "for OpenSSL support" &&
+optional_depends "gmp" \
+ "--with-gmp" \
+ "" \
+ "GNU math lib support"
-optional_depends "gettext" \
- "--with-gettext" \
- "" \
- "for GNU gettext support" &&
-
-optional_depends "db" \
- "--with-db4" \
- "" \
- "for Berkeley DB4 support" &&
+optional_depends "openssl" \
+ "--with-openssl" \
+ "" \
+ "for OpenSSL support"
-optional_depends "gdbm" \
- "--with-gdbm" \
- "" \
- "for GNU dbm support" &&
+optional_depends "gettext" \
+ "--with-gettext" \
+ "" \
+ "for GNU gettext support"
-optional_depends "sqlite" \
- "--with-pdo-sqlite=/usr" \
- "" \
- "for PDO SQLite support" &&
+optional_depends "db" \
+ "--with-db4" \
+ "" \
+ "for Berkeley DB4 support"
-optional_depends "postgresql" \
- "--with-pgsql=/usr" \
- "" \
- "for Postgresql support" &&
-
-optional_depends "mysql" \
- "--with-mysql=/usr --with-mysqli" \
- "" \
- "for native MySQL support" &&
+optional_depends "gdbm" \
+ "--with-gdbm" \
+ "" \
+ "for GNU dbm support"
-optional_depends "freetds" \
- "--with-sybase=/usr" \
- "" \
- "for SyBase support" &&
+optional_depends "sqlite" \
+ "--with-pdo-sqlite=/usr" \
+ "" \
+ "for PDO SQLite support"
-optional_depends "freetype2" \
- "--with-freetype-dir=/usr" \
- "" \
- "for freetype2 support" &&
+optional_depends "postgresql" \
+ "--with-pgsql=/usr" \
+ "" \
+ "for PostgreSQL support"
-optional_depends "pdflib" \
- "--with-pdflib" \
- "" \
- "for pdflib support" &&
+optional_depends "mysql" \
+ "--with-mysql=/usr --with-mysqli" \
+ "" \
+ "for native MySQL support"
-optional_depends "gd" \
- "--with-gd \
- --enable-gd-native-ttf \
- --with-jpeg-dir=/usr \
- --with-png-dir=/usr" \
- "" \
- "for on the fly graphics" &&
+optional_depends "freetds" \
+ "--with-sybase=/usr" \
+ "" \
+ "for SyBase support"
-optional_depends "curl" \
- "--with-curl" \
- "" \
- "for curl support" &&
+optional_depends "freetype2" \
+ "--with-freetype-dir=/usr" \
+ "" \
+ "for freetype2 support"
-optional_depends "ming" \
- "--with-ming" \
- "--without-ming" \
- "dynamic FLASH generation" &&
+optional_depends "pdflib" \
+ "--with-pdflib" \
+ "" \
+ "for pdflib support"
-optional_depends "expat" \
- "--with-expat-dir=/usr" \
- "" \
- "for expat xml support" &&
+optional_depends "gd" \
+ "--with-gd=/usr \
+ --enable-gd-native-ttf \
+ --with-jpeg-dir=/usr \
+ --with-png-dir=/usr" \
+ "" \
+ "for on the fly graphics"
-optional_depends "libxslt" \
- "--with-xsl=/usr" \
- "" \
- "for DOM Xslt support" &&
+optional_depends "curl" \
+ "--with-curl" \
+ "" \
+ "for cURL support"
-optional_depends "openldap" \
- "--with-ldap" \
- "" \
- "For ldap support"
+optional_depends "ming" \
+ "--with-ming" \
+ "--without-ming" \
+ "dynamic FLASH generation"
+
+optional_depends "expat" \
+ "--with-expat-dir=/usr" \
+ "" \
+ "for expat XML support"
+
+optional_depends "libxslt" \
+ "--with-xsl=/usr" \
+ "" \
+ "for DOM XSLT support"
+
+optional_depends "openldap" \
+ "--with-ldap" \
+ "" \
+ "for ldap support"
More information about the Lunar-commits
mailing list