3acf4c24e2
Source general-purpose scripting language that is especially suited for Web development and can be embedded into HTML. Its syntax draws upon C, Java, and Perl, and is easy to learn. The main goal of the language is to allow web developers to write dynamically generated webpages quickly, but you can do much more with PHP. WWW: http://www.php.net/ PR: 145772 Submitted by: Alex Keda
53 lines
1.8 KiB
Text
53 lines
1.8 KiB
Text
--- acinclude.m4.orig 2009-05-09 22:28:02.000000000 +0200
|
|
+++ acinclude.m4 2009-06-25 08:08:05.000000000 +0200
|
|
@@ -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
|
|
@@ -968,15 +968,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
|
|
- case "$PHP_SAPI" in
|
|
- cgi|embed[)]
|
|
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
|
|
- EXT_STATIC="$EXT_STATIC $1"
|
|
- ;;
|
|
- *[)]
|
|
PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
|
|
- ;;
|
|
- esac
|
|
+ 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)
|
|
@@ -1026,12 +1019,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
|
|
])
|
|
|
|
@@ -2303,9 +2290,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
|
|
|