Skip to content

Commit

Permalink
Remove TSRM_CHECK_GCC_ARG and LIBZEND_CPLUSPLUS_CHECKS
Browse files Browse the repository at this point in the history
This removes two old Autoconf macro definitions since they are not used
anymore.
  • Loading branch information
petk committed Jul 31, 2018
1 parent b719aa4 commit 7c1e093
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 29 deletions.
22 changes: 0 additions & 22 deletions TSRM/tsrm.m4
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion UPGRADING.INTERNALS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions Zend/Zend.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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({,})
Expand Down Expand Up @@ -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])
Expand Down
1 change: 0 additions & 1 deletion acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 7c1e093

Please sign in to comment.