Diff for /embedaddon/php/configure.in between versions 1.1.1.2 and 1.1.1.5

version 1.1.1.2, 2012/05/29 12:34:34 version 1.1.1.5, 2014/06/15 20:03:40
Line 9  dnl Basic autoconf + automake initialization, generati Line 9  dnl Basic autoconf + automake initialization, generati
 dnl -------------------------------------------------------------------------  dnl -------------------------------------------------------------------------
   
 AC_PREREQ(2.59)  AC_PREREQ(2.59)
AC_INIT(README.SVN-RULES)AC_INIT(README.GIT-RULES)
 ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])  ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
   
 PHP_CONFIG_NICE(config.nice)  PHP_CONFIG_NICE(config.nice)
Line 119  int zend_sprintf(char *buffer, const char *format, ... Line 119  int zend_sprintf(char *buffer, const char *format, ...
   
 PHP_MAJOR_VERSION=5  PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=4  PHP_MINOR_VERSION=4
PHP_RELEASE_VERSION=3PHP_RELEASE_VERSION=29
 PHP_EXTRA_VERSION=""  PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"  PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`  PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
Line 370  sinclude(TSRM/tsrm.m4) Line 370  sinclude(TSRM/tsrm.m4)
 dnl .  dnl .
 dnl -------------------------------------------------------------------------  dnl -------------------------------------------------------------------------
   
   PTHREADS_CHECK
 PHP_HELP_SEPARATOR([SAPI modules:])  PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAMES  PHP_SHLIB_SUFFIX_NAMES
 PHP_BUILD_PROGRAM  PHP_BUILD_PROGRAM
Line 408  fi Line 409  fi
 dnl force ZTS  dnl force ZTS
 if test "$enable_maintainer_zts" = "yes"; then  if test "$enable_maintainer_zts" = "yes"; then
   PTHREADS_ASSIGN_VARS    PTHREADS_ASSIGN_VARS
     PTHREADS_FLAGS
 fi  fi
   
 dnl Starting system checks.  dnl Starting system checks.
Line 686  nanosleep \ Line 688  nanosleep \
 )  )
   
 dnl Some systems (like OpenSolaris) do not have nanosleep in libc  dnl Some systems (like OpenSolaris) do not have nanosleep in libc
PHP_CHECK_FUNC(nanosleep, rt)PHP_CHECK_FUNC_LIB(nanosleep, rt)
   
 dnl Check for getaddrinfo, should be a better way, but...  dnl Check for getaddrinfo, should be a better way, but...
 dnl Also check for working getaddrinfo  dnl Also check for working getaddrinfo
Line 782  if test "$PHP_GCOV" = "yes"; then Line 784  if test "$PHP_GCOV" = "yes"; then
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])      AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi    fi
       
  ltp_version_list="1.5 1.6 1.7"  ltp_version_list="1.5 1.6 1.7 1.9 1.10"
   
   AC_CHECK_PROG(LTP, lcov, lcov)    AC_CHECK_PROG(LTP, lcov, lcov)
   AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)    AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)
Line 1223  EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` Line 1225  EXPANDED_SYSCONFDIR=`eval echo $sysconfdir`
 EXPANDED_DATADIR=$datadir  EXPANDED_DATADIR=$datadir
 EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`  EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
 EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`  EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
INCLUDE_PATH=.:${prefix}/share/pearINCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
   
 exec_prefix=$old_exec_prefix  exec_prefix=$old_exec_prefix
 libdir=$old_libdir  libdir=$old_libdir
Line 1433  PHP_SUBST(all_targets) Line 1435  PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)  PHP_SUBST(install_targets)
 PHP_SUBST(install_binary_targets)  PHP_SUBST(install_binary_targets)
   
PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/ sapi/cli/cli.h])PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
   
 PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)  PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
   
Line 1465  PHP_ADD_SOURCES(Zend, \ Line 1467  PHP_ADD_SOURCES(Zend, \
     zend_ini_parser.c zend_ini_scanner.c \      zend_ini_parser.c zend_ini_scanner.c \
     zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c zend_dtrace.c \      zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c zend_dtrace.c \
     zend_execute_API.c zend_highlight.c zend_llist.c \      zend_execute_API.c zend_highlight.c zend_llist.c \
    zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \    zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
     zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \      zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
     zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \      zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
     zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \      zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
Line 1580  cat <<X Line 1582  cat <<X
 | see the file debug.log for error messages.                         |  | see the file debug.log for error messages.                         |
 |                                                                    |  |                                                                    |
 | If you are unable to fix this, send the file debug.log to the      |  | If you are unable to fix this, send the file debug.log to the      |
| php-install@lists.php.net mailing list and include appropiate      || php-install@lists.php.net mailing list and include appropriate      |
 | information about your setup.                                      |  | information about your setup.                                      |
 X  X
   fi    fi

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.5


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