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

Diff for /embedaddon/php/aclocal.m4 between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 12:34:34 version 1.1.1.3, 2013/07/22 01:31:35
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)        ;;
        PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)    esac
     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 1036  You either need to build $1 shared or build $2 statica Line 1042  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 1820  AC_TRY_COMPILE([ Line 1832  AC_TRY_COMPILE([
 ])  ])
   
 dnl -------------------------------------------------------------------------  dnl -------------------------------------------------------------------------
dnl Library/function existance and build sanity checksdnl Library/function existence and build sanity checks
 dnl -------------------------------------------------------------------------  dnl -------------------------------------------------------------------------
   
 dnl  dnl
Line 2308  AC_DEFUN([PHP_SETUP_OPENSSL],[ Line 2320  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 -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then  if test "$PHP_OPENSSL" != "no"; then
     PHP_OPENSSL_DIR=$PHP_OPENSSL      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      PHP_OPENSSL_DIR=$PHP_IMAP_SSL
   fi    fi
   
Line 2330  AC_DEFUN([PHP_SETUP_OPENSSL],[ Line 2342  AC_DEFUN([PHP_SETUP_OPENSSL],[
       AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])        AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
     fi      fi
   
    if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then    if test -n "$OPENSSL_LIBS"; then
       PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)        PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
       fi
       if test -n "$OPENSSL_INCS"; then
       PHP_EVAL_INCLINE($OPENSSL_INCS)        PHP_EVAL_INCLINE($OPENSSL_INCS)
     fi      fi
   fi    fi
Line 2437  AC_DEFUN([PHP_SETUP_ICONV], [ Line 2451  AC_DEFUN([PHP_SETUP_ICONV], [
   dnl    dnl
   dnl Check libc first if no path is provided in --with-iconv    dnl Check libc first if no path is provided in --with-iconv
   dnl    dnl
   
   if test "$PHP_ICONV" = "yes"; then    if test "$PHP_ICONV" = "yes"; then
       dnl Reset LIBS temporarily as it may have already been included
       dnl -liconv in.
       LIBS_save="$LIBS"
       LIBS=
     AC_CHECK_FUNC(iconv, [      AC_CHECK_FUNC(iconv, [
       found_iconv=yes        found_iconv=yes
     ],[      ],[
Line 2447  AC_DEFUN([PHP_SETUP_ICONV], [ Line 2466  AC_DEFUN([PHP_SETUP_ICONV], [
         found_iconv=yes          found_iconv=yes
       ])        ])
     ])      ])
       LIBS="$LIBS_save"
   fi    fi
   
   dnl    dnl
Line 4485  dgux*) Line 4505  dgux*)
   shlibpath_var=LD_LIBRARY_PATH    shlibpath_var=LD_LIBRARY_PATH
   ;;    ;;
   
freebsd1.*)freebsd1*)
   dynamic_linker=no    dynamic_linker=no
   ;;    ;;
   
Line 4496  freebsd* | dragonfly*) Line 4516  freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`      objformat=`/usr/bin/objformat`
   else    else
     case $host_os in      case $host_os in
    freebsd[[123]].*) objformat=aout ;;    freebsd[[123]]*) objformat=aout ;;
     *) objformat=elf ;;      *) objformat=elf ;;
     esac      esac
   fi    fi
Line 6112  case $host_os in Line 6132  case $host_os in
         ;;          ;;
     esac      esac
     ;;      ;;
  freebsd[[12]].*)  freebsd[[12]]*)
     # C++ shared libraries reported to be fairly broken before switch to ELF      # C++ shared libraries reported to be fairly broken before switch to ELF
     _LT_AC_TAGVAR(ld_shlibs, $1)=no      _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;      ;;
Line 8795  _LT_EOF Line 8815  _LT_EOF
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;        ;;
   
    freebsd1.*)    freebsd1*)
       _LT_AC_TAGVAR(ld_shlibs, $1)=no        _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;        ;;
   
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

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