diff options
| -rw-r--r-- | TSRM/tsrm.m4 | 22 | ||||
| -rw-r--r-- | UPGRADING.INTERNALS | 3 | ||||
| -rw-r--r-- | Zend/Zend.m4 | 5 | ||||
| -rw-r--r-- | acinclude.m4 | 1 |
4 files changed, 2 insertions, 29 deletions
diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4 index bc10b3d956..d02f88ee94 100644 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@ -1,27 +1,5 @@ m4_include([TSRM/m4/ax_func_which_gethostbyname_r.m4]) -dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND) -AC_DEFUN([TSRM_CHECK_GCC_ARG],[ - gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_) - AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [ - echo 'void somefunc() { };' > conftest.c - cmd='$CC $1 -c conftest.c' - if eval $cmd 2>&1 | egrep -e $1 >/dev/null ; then - ac_result=no - else - ac_result=yes - fi - eval $gcc_arg_name=$ac_result - rm -f conftest.* - ]) - if eval test "\$$gcc_arg_name" = "yes"; then - $2 - else - : - $3 - fi -]) - AC_DEFUN([TSRM_BASIC_CHECKS],[ AC_REQUIRE([AC_PROG_CC])dnl diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS index 31b51408e4..37beea85e7 100644 --- a/UPGRADING.INTERNALS +++ b/UPGRADING.INTERNALS @@ -179,7 +179,8 @@ PHP 7.3 INTERNALS UPGRADE NOTES ======================== a. Unix build system changes - - PHP_PROG_LEX macro has been removed. + - PHP_PROG_LEX, TSRM_CHECK_GCC_ARG, and LIBZEND_CPLUSPLUS_CHECKS Autoconf + macros have been removed. b. Windows build system changes - ZEND_WIN32_FORCE_INLINE doesn't affect C++ anymore. zend_always_inline is diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 3be411fe43..8d5cfe5372 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -192,7 +192,6 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS" if test "$ZEND_MAINTAINER_ZTS" = "yes"; then AC_DEFINE(ZTS,1,[ ]) CFLAGS="$CFLAGS -DZTS" - LIBZEND_CPLUSPLUS_CHECKS fi changequote({,}) @@ -388,10 +387,6 @@ AC_MSG_RESULT($ZEND_SIGNALS) ]) -AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[ - -]) - AC_MSG_CHECKING(whether /dev/urandom exists) if test -r "/dev/urandom" && test -c "/dev/urandom"; then AC_DEFINE([HAVE_DEV_URANDOM], 1, [Define if the target system has /dev/urandom device]) diff --git a/acinclude.m4 b/acinclude.m4 index 6ad8070c9d..1deb50d298 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -283,7 +283,6 @@ dnl If successful, adds -rdynamic to PHP_LDFLAGS. dnl AC_DEFUN([PHP_TARGET_RDYNAMIC],[ if test -n "$GCC"; then - dnl we should use a PHP-specific macro here PHP_CHECK_GCC_ARG(-rdynamic, gcc_rdynamic=yes) if test "$gcc_rdynamic" = "yes"; then PHP_LDFLAGS="$PHP_LDFLAGS -rdynamic" |