Skip to content

Commit 5ba69ab

Browse files
committed
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
1 parent 0ba1db7 commit 5ba69ab

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

build/Makefile.global

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ PHP_TEST_SHARED_EXTENSIONS = ` \
8080
fi; \
8181
if test "x$(PHP_ZEND_EX)" != "x"; then \
8282
for i in $(PHP_ZEND_EX)""; do \
83-
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
83+
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d zend_extension=$(top_builddir)/modules/$$dlname"; \
8484
done; \
8585
fi`
8686
PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='

configure.ac

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ test -z "$CFLAGS" && auto_cflags=1
165165
abs_srcdir=`(cd $srcdir; pwd)`
166166
abs_builddir=`pwd`
167167

168-
php_abs_top_srcdir=$abs_srcdir
169-
php_abs_top_builddir=$abs_builddir
170-
171168
dnl Because `make install` is often performed by the superuser, we create the
172169
dnl libs subdirectory as the user who configures PHP. Otherwise, the current
173170
dnl user will not be able to delete libs or the contents of libs.
@@ -1381,8 +1378,6 @@ PHP_SUBST(EXT_LIBS)
13811378

13821379
PHP_SUBST_OLD(abs_builddir)
13831380
PHP_SUBST_OLD(abs_srcdir)
1384-
PHP_SUBST_OLD(php_abs_top_builddir)
1385-
PHP_SUBST_OLD(php_abs_top_srcdir)
13861381

13871382
PHP_SUBST(bindir)
13881383
PHP_SUBST(sbindir)
@@ -1458,9 +1453,6 @@ if test "$PHP_WERROR" = "yes"; then
14581453
CPPFLAGS="$CPPFLAGS -Werror"
14591454
fi
14601455

1461-
ZEND_EXT_TYPE="zend_extension"
1462-
PHP_SUBST(ZEND_EXT_TYPE)
1463-
14641456
dnl
14651457
dnl Libtool creation.
14661458
dnl

scripts/phpize.m4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,6 @@ php_zts_is_enabled
111111
CPPFLAGS=$old_CPPFLAGS
112112
AC_MSG_RESULT([$PHP_THREAD_SAFETY])
113113

114-
dnl Support for building and testing Zend extensions.
115-
ZEND_EXT_TYPE="zend_extension"
116-
PHP_SUBST(ZEND_EXT_TYPE)
117-
118114
dnl Discard optimization flags when debugging is enabled.
119115
if test "$PHP_DEBUG" = "yes"; then
120116
PHP_DEBUG=1

0 commit comments

Comments
 (0)