[BACK]Return to acinclude.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php

Diff for /embedaddon/php/acinclude.m4 between versions 1.1.1.4 and 1.1.1.4.2.1

version 1.1.1.4, 2013/10/14 08:02:06 version 1.1.1.4.2.1, 2013/10/14 08:17:37
Line 984  dnl ---------------------------------------------- Sha Line 984  dnl ---------------------------------------------- Sha
   if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then    if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
 dnl ---------------------------------------------- CLI static module  dnl ---------------------------------------------- CLI static module
     [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no      [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,cli)
        ;;        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
    esac        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
     EXT_CLI_STATIC="$EXT_CLI_STATIC $1"      EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
   fi    fi
   PHP_ADD_BUILD_DIR($ext_builddir)    PHP_ADD_BUILD_DIR($ext_builddir)
Line 1042  You either need to build $1 shared or build $2 statica Line 1036  You either need to build $1 shared or build $2 statica
 build to be successful.  build to be successful.
 ])  ])
   fi    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    dnl Some systems require that we link $2 to $1 when building
 ])  ])
   
Line 2320  AC_DEFUN([PHP_SETUP_OPENSSL],[ Line 2308  AC_DEFUN([PHP_SETUP_OPENSSL],[
   test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no    test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
   
   dnl Fallbacks for different configure options    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      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      PHP_OPENSSL_DIR=$PHP_IMAP_SSL
   fi    fi
   
Removed from v.1.1.1.4  
changed lines
  Added in v.1.1.1.4.2.1

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>