clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove conditional calls of always available macros

Browse Source 
These checks were once relevant for these extensions in PECL and PHP
versions without availability of the checked macros.

Closes GH-4405
This commit is contained in:
Peter Kokot 2019-07-14 22:24:21 +02:00
parent e39296d10b
commit 94421e5724
7 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/hash/config.m4
View File

@ -45,6 +45,4 @@ EXT_HASH_HEADERS="php_hash.h php_hash_md.h php_hash_sha.h php_hash_ripemd.h \
php_hash_fnv.h php_hash_joaat.h php_hash_sha3.h"
PHP_NEW_EXTENSION(hash, $EXT_HASH_SOURCES, 0,,$PHP_HASH_CFLAGS)
ifdef([PHP_INSTALL_HEADERS], [
PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS)
])
PHP_INSTALL_HEADERS(ext/hash, $EXT_HASH_HEADERS)

12
ext/pdo/config.m4
View File

@ -10,16 +10,8 @@ if test "$PHP_PDO" != "no"; then
PHP_PDO=yes
PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared)
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo, spl, true)
])
ifdef([PHP_INSTALL_HEADERS],
[
dnl Sadly, this is a complete NOP for pecl extensions
PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h php_pdo_error.h])
])
PHP_ADD_EXTENSION_DEP(pdo, spl, true)
PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h php_pdo_error.h])
dnl so we always include the known-good working hack.
PHP_ADD_MAKEFILE_FRAGMENT

5
ext/pdo_dblib/config.m4
View File

@ -63,8 +63,5 @@ if test "$PHP_PDO_DBLIB" != "no"; then
AC_DEFINE(HAVE_FREETDS,1,[ ])
PHP_SUBST(PDO_DBLIB_SHARED_LIBADD)
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo)
])
PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo)
fi

5
ext/pdo_oci/config.m4
View File

@ -218,10 +218,7 @@ if test "$PHP_PDO_OCI" != "no"; then
PHP_SUBST_OLD(PDO_OCI_DIR)
PHP_SUBST_OLD(PDO_OCI_VERSION)
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
])
PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ])
fi

5
ext/pdo_odbc/config.m4
View File

@ -140,8 +140,5 @@ functions required for PDO support.
PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_ODBC_INCLUDE)
PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
])
PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
fi

5
ext/pdo_pgsql/config.m4
View File

@ -86,8 +86,5 @@ if test "$PHP_PDO_PGSQL" != "no"; then
PHP_CHECK_PDO_INCLUDES
PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
])
PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
fi

5
ext/pdo_sqlite/config.m4
View File

@ -42,8 +42,5 @@ if test "$PHP_PDO_SQLITE" != "no"; then
dnl Solaris fix
PHP_CHECK_LIBRARY(rt, fdatasync, [PHP_ADD_LIBRARY(rt,, PDO_SQLITE_SHARED_LIBADD)])
ifdef([PHP_ADD_EXTENSION_DEP],
[
PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
])
PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
fi