--- embedaddon/php/acinclude.m4	2012/05/29 12:34:34	1.1.1.2
+++ embedaddon/php/acinclude.m4	2013/07/22 01:44:13	1.1.1.2.2.1
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.1.1.2 2012/05/29 12:34:34 misho Exp $
+dnl $Id: acinclude.m4,v 1.1.1.2.2.1 2013/07/22 01:44:13 misho Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -984,9 +984,15 @@ 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(PHP_EXT_DIR($1),$2,$ac_extra,)
+        EXT_STATIC="$EXT_STATIC $1"
+        ;;
+      *[)]
         PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
-        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
-        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
+        ;;
+    esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
   fi
   PHP_ADD_BUILD_DIR($ext_builddir)
@@ -1036,6 +1042,12 @@ 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
 ])
 
@@ -2308,9 +2320,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
   test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
 
   dnl Fallbacks for different configure options
-  if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then
+  if test "$PHP_OPENSSL" != "no"; then
     PHP_OPENSSL_DIR=$PHP_OPENSSL
-  elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then
+  elif test "$PHP_IMAP_SSL" != "no"; then
     PHP_OPENSSL_DIR=$PHP_IMAP_SSL
   fi