Changeset View
Changeset View
Standalone View
Standalone View
lang/php72/files/patch-configure.in
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- configure.ac.orig 2016-07-20 13:11:23 UTC | |||||
+++ configure.ac | |||||
@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) | |||||
dnl . | |||||
dnl ------------------------------------------------------------------------- | |||||
-PTHREADS_CHECK | |||||
PHP_HELP_SEPARATOR([SAPI modules:]) | |||||
PHP_SHLIB_SUFFIX_NAMES | |||||
PHP_BUILD_PROGRAM | |||||
@@ -401,15 +400,9 @@ else | |||||
AC_MSG_RESULT([none]) | |||||
fi | |||||
-dnl Exit early | |||||
-if test -z "$PHP_INSTALLED_SAPIS"; then | |||||
- AC_MSG_ERROR([Nothing to build.]) | |||||
-fi | |||||
- | |||||
dnl force ZTS | |||||
if test "$enable_maintainer_zts" = "yes"; then | |||||
PTHREADS_ASSIGN_VARS | |||||
- PTHREADS_FLAGS | |||||
fi | |||||
dnl Starting system checks. | |||||
@@ -700,7 +693,7 @@ nanosleep \ | |||||
) | |||||
dnl Some systems (like OpenSolaris) do not have nanosleep in libc | |||||
-PHP_CHECK_FUNC_LIB(nanosleep, rt) | |||||
+PHP_CHECK_FUNC(nanosleep, rt) | |||||
dnl Check for getaddrinfo, should be a better way, but... | |||||
dnl Also check for working getaddrinfo | |||||
@@ -1251,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd | |||||
EXPANDED_DATADIR=$datadir | |||||
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` | |||||
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` | |||||
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR | |||||
+INCLUDE_PATH=.:${prefix}/share/pear | |||||
exec_prefix=$old_exec_prefix | |||||
libdir=$old_libdir | |||||
@@ -1460,7 +1453,7 @@ PHP_SUBST(all_targets) | |||||
PHP_SUBST(install_targets) | |||||
PHP_SUBST(install_binary_targets) | |||||
-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) | |||||
+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/]) | |||||
PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) | |||||