Skip to content

Commit 693ec80

Browse files
authored
Autotools: Remove PDO dependency related errors (php#15347)
Follow-up of phpGH-15344 (687eb91) This removes the customized error messages in PDO extensions when PDO is not enabled (--disable-all or --disable-pdo) in favor of the default error done by PHP_ADD_EXTENSION_DEP.
1 parent 4f58d5b commit 693ec80

File tree

6 files changed

+0
-26
lines changed

6 files changed

+0
-26
lines changed

ext/pdo_dblib/config.m4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ PHP_ARG_WITH([pdo-dblib],
44
[PDO: DBLIB-DB support. DIR is the FreeTDS home directory])])
55

66
if test "$PHP_PDO_DBLIB" != "no"; then
7-
if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
8-
AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
9-
fi
10-
117
if test "$PHP_PDO_DBLIB" = "yes"; then
128
dnl FreeTDS must be on the default system include/library path.
139
dnl Only perform a sanity check that this is really the case.

ext/pdo_firebird/config.m4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ PHP_ARG_WITH([pdo-firebird],
55
[/opt/firebird]])])
66

77
if test "$PHP_PDO_FIREBIRD" != "no"; then
8-
if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
9-
AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
10-
fi
11-
128
AC_PATH_PROG([FB_CONFIG], [fb_config], [no])
139

1410
if test -x "$FB_CONFIG" && test "$PHP_PDO_FIREBIRD" = "yes"; then

ext/pdo_mysql/config.m4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ if test "$PHP_PDO_MYSQL" != "no"; then
1717
AC_MSG_RESULT([$PHP_MYSQL_SOCK])
1818
])
1919

20-
if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
21-
AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
22-
fi
23-
2420
dnl Whether to build with the mysqlnd extension or with the MySQL library.
2521
AS_CASE([$PHP_PDO_MYSQL], [yes|mysqlnd], [
2622
PHP_MYSQLND_ENABLED=yes

ext/pdo_odbc/config.m4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ AC_DEFUN([PHP_PDO_ODBC_CHECK_HEADER],
2828
])
2929

3030
if test "$PHP_PDO_ODBC" != "no"; then
31-
32-
if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
33-
AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
34-
fi
35-
3631
PHP_CHECK_PDO_INCLUDES
3732

3833
AC_MSG_CHECKING([for selected PDO ODBC flavour])

ext/pdo_pgsql/config.m4

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ PHP_ARG_WITH([pdo-pgsql],
77
the libpq paths.])])
88

99
if test "$PHP_PDO_PGSQL" != "no"; then
10-
if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
11-
AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
12-
fi
13-
1410
PHP_SETUP_PGSQL([PDO_PGSQL_SHARED_LIBADD],,, [$PHP_PDO_PGSQL])
1511
PHP_SUBST([PDO_PGSQL_SHARED_LIBADD])
1612

ext/pdo_sqlite/config.m4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ PHP_ARG_WITH([pdo-sqlite],
55
[$PHP_PDO])
66

77
if test "$PHP_PDO_SQLITE" != "no"; then
8-
9-
if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
10-
AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.])
11-
fi
12-
138
PHP_CHECK_PDO_INCLUDES
149

1510
PHP_SETUP_SQLITE([PDO_SQLITE_SHARED_LIBADD])

0 commit comments

Comments
 (0)