diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 2007-12-31 12:35:17 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 2007-12-31 12:35:17 +0000 |
commit | 18a56320c9602155ab8efec1503104da172eb882 (patch) | |
tree | e6c9bc10db8d29a4e76a24cac3a7ecc376035aec /lang/php53/files/patch-acinclude.m4 | |
parent | 07bcc4091010f79f8d929d6ce22e51c7e3743b3f (diff) | |
download | ports-release/6.3.0.tar.gz ports-release/6.3.0.zip |
This commit was manufactured by cvs2svn to create tag 'RELEASE_6_3_0'.release/6.3.0
Diffstat (limited to 'lang/php53/files/patch-acinclude.m4')
-rw-r--r-- | lang/php53/files/patch-acinclude.m4 | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/lang/php53/files/patch-acinclude.m4 b/lang/php53/files/patch-acinclude.m4 deleted file mode 100644 index 9c4094b8fd82..000000000000 --- a/lang/php53/files/patch-acinclude.m4 +++ /dev/null @@ -1,50 +0,0 @@ ---- acinclude.m4.orig Mon Apr 10 14:17:36 2006 -+++ acinclude.m4 Thu May 4 08:10:56 2006 -@@ -194,7 +194,7 @@ - dnl - dnl which array to append to? - AC_DEFUN([PHP_ADD_SOURCES],[ -- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS))) -+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS)))) - ]) - - dnl -@@ -966,12 +966,8 @@ - if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then - dnl ---------------------------------------------- CLI static module - [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no -- if test "$PHP_SAPI" = "cgi"; then -- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) -- EXT_STATIC="$EXT_STATIC $1" -- else - PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) -- fi -+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi) - EXT_CLI_STATIC="$EXT_CLI_STATIC $1" - fi - PHP_ADD_BUILD_DIR($ext_builddir) -@@ -1021,12 +1017,6 @@ - build to be successful. - ]) - fi -- if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then -- AC_MSG_ERROR([ --You've configured extension $1, which depends on extension $2, --but you've either not enabled $2, or have disabled it. --]) -- fi - dnl Some systems require that we link $2 to $1 when building - ]) - -@@ -2158,9 +2148,9 @@ - test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no - - dnl Fallbacks for different configure options -- if test "$PHP_OPENSSL" != "no"; then -+ if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_OPENSSL -- elif test "$PHP_IMAP_SSL" != "no"; then -+ elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_IMAP_SSL - fi - |