@@ -66,13 +66,6 @@ Enable the legacy (original) Berkeley DB style (Database Manager) handler.
6666
6767Enable the bundled flat-file DBA handler.
6868
69- ## PHP_EXT_DBA_GDBM
70-
71- * Default: `OFF`
72- * Values: `ON|OFF`
73-
74- Enable the GNU dbm (GDBM) handler.
75-
7669## PHP_EXT_DBA_INIFILE
7770
7871* Default: `ON`
@@ -218,20 +211,6 @@ add_feature_info(
218211 "bundled flat-file handler"
219212)
220213
221- cmake_dependent_option(
222- PHP_EXT_DBA_GDBM
223- "DBA: Enable the GNU dbm (GDBM) handler"
224- OFF
225- [[PHP_EXT_DBA AND NOT PHP_EXT_DBA_QDBM]]
226- OFF
227- )
228- mark_as_advanced (PHP_EXT_DBA_GDBM)
229- add_feature_info(
230- "ext/dba GDBM"
231- PHP_EXT_DBA_GDBM
232- "GNU dbm handler"
233- )
234-
235214cmake_dependent_option(
236215 PHP_EXT_DBA_INIFILE
237216 "DBA: Enable the bundled INI-file handler"
@@ -277,21 +256,15 @@ cmake_dependent_option(
277256 PHP_EXT_DBA_QDBM
278257 "DBA: Enable the Quick Database Manager (QDBM) handler"
279258 OFF
280- [[PHP_EXT_DBA AND NOT PHP_EXT_DBA_DBM AND NOT PHP_EXT_DBA_GDBM ]]
259+ [[PHP_EXT_DBA AND NOT PHP_EXT_DBA_DBM]]
281260 OFF
282261)
283262add_feature_info(
284263 "ext/dba QDBM"
285264 PHP_EXT_DBA_QDBM
286265 "Quick Database Manager handler"
287266)
288- if (PHP_EXT_DBA_QDBM AND PHP_EXT_DBA_GDBM)
289- message (
290- FATAL_ERROR
291- "You cannot combine 'PHP_EXT_DBA_GDBM' with 'PHP_EXT_DBA_QDBM'. Please "
292- "select either GDBM or QDBM."
293- )
294- elseif (PHP_EXT_DBA_QDBM AND PHP_EXT_DBA_DBM)
267+ if (PHP_EXT_DBA_QDBM AND PHP_EXT_DBA_DBM)
295268 message (
296269 FATAL_ERROR
297270 "You cannot combine 'PHP_EXT_DBA_DBM' with 'PHP_EXT_DBA_QDBM'. Please "
@@ -452,24 +425,13 @@ if(PHP_EXT_DBA_DBM)
452425 PURPOSE "Necessary to enable the DBM handler in the dba extension."
453426 )
454427
455- if (Dbm_LIBRARY MATCHES "gdbm" )
456- message (
457- WARNING
458- "The GNU dbm (GDBM) library is licensed under the GNU GPL 3, which is "
459- "not compatible with the PHP license. PHP then shouldn't be distributed. "
460- "The PHP_EXT_DBA_DBM is a legacy artifact for testing purposes. The "
461- "recommendation for using and distributing the PHP 'dba' extension is to "
462- "disable the PHP_EXT_DBA_DBM."
463- )
464- endif ()
465-
466428 target_link_libraries (php_ext_dba PRIVATE Dbm::Dbm)
467429
468430 target_sources (php_ext_dba PRIVATE dba_dbm.c)
469431
470432 set (DBM_INCLUDE_FILE "<dbm.h>" )
471433 set (DBA_DBM TRUE )
472- set (DBM_VERSION "${Dbm_IMPLEMENTATION} " )
434+ set (DBM_VERSION "DBM " )
473435endif ()
474436
475437################################################################################
@@ -486,34 +448,6 @@ if(PHP_EXT_DBA_FLATFILE)
486448 set (DBA_FLATFILE TRUE )
487449endif ()
488450
489- ################################################################################
490- # GDBM.
491- ################################################################################
492- if (PHP_EXT_DBA_GDBM)
493- message (
494- WARNING
495- "The GNU dbm (GDBM) library is licensed under the GNU GPL 3, which is not "
496- "compatible with the PHP license. PHP then shouldn't be distributed. The "
497- "recommendation for using and distributing the PHP 'dba' extension is to "
498- "disable PHP_EXT_DBA_GDBM."
499- )
500-
501- find_package (GDBM)
502- set_package_properties(
503- GDBM
504- PROPERTIES
505- TYPE REQUIRED
506- PURPOSE "Necessary to enable the GDBM handler in the dba extension."
507- )
508-
509- target_link_libraries (php_ext_dba PRIVATE GDBM::GDBM)
510-
511- target_sources (php_ext_dba PRIVATE dba_gdbm.c)
512-
513- set (GDBM_INCLUDE_FILE "<gdbm.h>" )
514- set (DBA_GDBM TRUE )
515- endif ()
516-
517451################################################################################
518452# INI-file.
519453################################################################################
@@ -560,17 +494,6 @@ if(PHP_EXT_DBA_NDBM)
560494 PURPOSE "Necessary to enable the ndbm handler in the dba extension."
561495 )
562496
563- if (Ndbm_LIBRARY MATCHES "gdbm" )
564- message (
565- WARNING
566- "The GNU dbm (GDBM) library is licensed under the GNU GPL 3, which is "
567- "not compatible with the PHP license. PHP then shouldn't be distributed. "
568- "The PHP_EXT_DBA_NDBM is a legacy artifact for testing purposes. The "
569- "recommendation for using and distributing the PHP 'dba' extension is to "
570- "disable the PHP_EXT_DBA_NDBM."
571- )
572- endif ()
573-
574497 target_link_libraries (php_ext_dba PRIVATE Ndbm::Ndbm)
575498
576499 target_sources (php_ext_dba PRIVATE dba_ndbm.c)
@@ -582,7 +505,7 @@ endif()
582505################################################################################
583506# QDBM.
584507################################################################################
585- if (PHP_EXT_DBA_QDBM AND NOT PHP_EXT_DBA_DBM AND NOT PHP_EXT_DBA_GDBM )
508+ if (PHP_EXT_DBA_QDBM AND NOT PHP_EXT_DBA_DBM)
586509 find_package (QDBM)
587510 set_package_properties(
588511 QDBM
0 commit comments