| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647 |
- $OpenBSD: patch-acinclude_m4,v 1.2 2017/02/24 09:13:12 robert Exp $
- --- acinclude.m4.orig.port Tue Feb 14 14:50:52 2017
- +++ acinclude.m4 Thu Feb 23 18:50:53 2017
- @@ -985,15 +985,9 @@ dnl ---------------------------------------------- Sha
- 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($ext_dir,$2,$ac_extra,)
- - EXT_STATIC="$EXT_STATIC $1;$ext_dir"
- - ;;
- - *[)]
- PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cli)
- - ;;
- - esac
- + PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cgi)
- + PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,fpm)
- EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
- fi
- PHP_ADD_BUILD_DIR($ext_builddir)
- @@ -1043,12 +1037,6 @@ You either need to build $1 shared or build $2 statica
- 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
- ])
-
- @@ -2324,9 +2312,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
- 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
-
|
