From: Peter Kokot <peterkokot@gmail.com>
Date: Sun, 14 Jul 2019 20:24:21 +0000 (+0200)
Subject: Remove conditional calls of always available macros
X-Git-Tag: php-7.4.0beta1~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94421e5724e1942499d024ae7537a329fe426133;p=php

Remove conditional calls of always available macros

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

Closes GH-4405
---

diff --git a/ext/hash/config.m4 b/ext/hash/config.m4
index 0fa4526501..111574e749 100644
--- a/ext/hash/config.m4
+++ b/ext/hash/config.m4
@@ -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)
diff --git a/ext/pdo/config.m4 b/ext/pdo/config.m4
index b8e6f4e129..9b9a3e36df 100644
--- a/ext/pdo/config.m4
+++ b/ext/pdo/config.m4
@@ -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
diff --git a/ext/pdo_dblib/config.m4 b/ext/pdo_dblib/config.m4
index fe81dd8031..880baf9472 100644
--- a/ext/pdo_dblib/config.m4
+++ b/ext/pdo_dblib/config.m4
@@ -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
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4
index fe0fecddd6..ab8c7bfa66 100644
--- a/ext/pdo_oci/config.m4
+++ b/ext/pdo_oci/config.m4
@@ -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
diff --git a/ext/pdo_odbc/config.m4 b/ext/pdo_odbc/config.m4
index 9532a8d4d8..72b604199b 100644
--- a/ext/pdo_odbc/config.m4
+++ b/ext/pdo_odbc/config.m4
@@ -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
diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
index e0c2df24f2..7655357de4 100644
--- a/ext/pdo_pgsql/config.m4
+++ b/ext/pdo_pgsql/config.m4
@@ -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
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index c45d73f526..873dd36544 100644
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -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