From 5ba69ab3addf17b0b854a20148f92e25b3790ef7 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Mon, 8 Jul 2019 10:18:17 +0200 Subject: [PATCH] Remove some unused variables - Variables php_abs_top_srcdir php_abs_top_builddir are no longer used. - ZEND_EXT_TYPE is always zend_extension and variable is no longer used. Closes GH-4378 --- build/Makefile.global | 2 +- configure.ac | 8 -------- scripts/phpize.m4 | 4 ---- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/build/Makefile.global b/build/Makefile.global index 7774e70c454..82e0d69f35e 100644 --- a/build/Makefile.global +++ b/build/Makefile.global @@ -80,7 +80,7 @@ PHP_TEST_SHARED_EXTENSIONS = ` \ fi; \ if test "x$(PHP_ZEND_EX)" != "x"; then \ for i in $(PHP_ZEND_EX)""; do \ - . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \ + . $$i; $(top_srcdir)/build/shtool echo -n -- " -d zend_extension=$(top_builddir)/modules/$$dlname"; \ done; \ fi` PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' diff --git a/configure.ac b/configure.ac index 741406503e4..4f03e74cdf6 100644 --- a/configure.ac +++ b/configure.ac @@ -165,9 +165,6 @@ test -z "$CFLAGS" && auto_cflags=1 abs_srcdir=`(cd $srcdir; pwd)` abs_builddir=`pwd` -php_abs_top_srcdir=$abs_srcdir -php_abs_top_builddir=$abs_builddir - dnl Because `make install` is often performed by the superuser, we create the dnl libs subdirectory as the user who configures PHP. Otherwise, the current dnl user will not be able to delete libs or the contents of libs. @@ -1381,8 +1378,6 @@ PHP_SUBST(EXT_LIBS) PHP_SUBST_OLD(abs_builddir) PHP_SUBST_OLD(abs_srcdir) -PHP_SUBST_OLD(php_abs_top_builddir) -PHP_SUBST_OLD(php_abs_top_srcdir) PHP_SUBST(bindir) PHP_SUBST(sbindir) @@ -1458,9 +1453,6 @@ if test "$PHP_WERROR" = "yes"; then CPPFLAGS="$CPPFLAGS -Werror" fi -ZEND_EXT_TYPE="zend_extension" -PHP_SUBST(ZEND_EXT_TYPE) - dnl dnl Libtool creation. dnl diff --git a/scripts/phpize.m4 b/scripts/phpize.m4 index 880309bce7f..f583a521469 100644 --- a/scripts/phpize.m4 +++ b/scripts/phpize.m4 @@ -111,10 +111,6 @@ php_zts_is_enabled CPPFLAGS=$old_CPPFLAGS AC_MSG_RESULT([$PHP_THREAD_SAFETY]) -dnl Support for building and testing Zend extensions. -ZEND_EXT_TYPE="zend_extension" -PHP_SUBST(ZEND_EXT_TYPE) - dnl Discard optimization flags when debugging is enabled. if test "$PHP_DEBUG" = "yes"; then PHP_DEBUG=1