Partially fix ext/dba

- Configuration options synced a bit further
- Extension sources refactored
- Find modules updated
- Extension configuration improved for the *_INCLUDE_FILE macros

Author: petk

.github/workflows/ci.yaml

@@ -102,6 +102,11 @@ jobs:
             libxslt1-dev \
             libcapstone-dev \
             libedit-dev \
+            libcdb-dev \
+            libgdbm-dev \
+            libgdbm-compat-dev \
+            liblmdb-dev \
+            libtokyocabinet-dev \
             libsnmp-dev \
             snmpd \
             snmp-mibs-downloader \

cmake/cmake/modules/FindBerkeleyDB.cmake

@@ -5,28 +5,24 @@ Module defines the following `IMPORTED` target(s):
 
 * `BerkeleyDB::BerkeleyDB` - The package library, if found.
 
-Result variables:
+## Result variables
 
-  `BerkeleyDB_FOUND`
-    Whether the package has been found.
-  `BerkeleyDB_INCLUDE_DIRS`
-    Include directories needed to use this package.
-  `BerkeleyDB_LIBRARIES`
-    Libraries needed to link to the package library.
+* `BerkeleyDB_FOUND` - Whether the package has been found.
+* `BerkeleyDB_INCLUDE_DIRS`- Include directories needed to use this package.
+* `BerkeleyDB_LIBRARIES`- Libraries needed to link to the package library.
 
-Cache variables:
+## Cache variables
 
 * `BerkeleyDB_INCLUDE_DIR` - Directory containing package library headers.
 * `BerkeleyDB_LIBRARY` - The path to the package library.
 * `BerkeleyDB_DB1_INCLUDE_DIR` - Directory containing headers for DB1 emulation
   support in Berkeley DB.
 
-Hints:
+## Hints
 
-The `BerkeleyDB_ROOT` variable adds custom search path.
-
-Set `BerkeleyDB_USE_DB1` to `TRUE` before calling `find_package(BerkeleyDB)` to
-enable the Berkeley DB 1.x support/emulation.
+* The `BerkeleyDB_ROOT` variable adds custom search path.
+* Set `BerkeleyDB_USE_DB1` to `TRUE` before calling `find_package(BerkeleyDB)`
+  to enable the Berkeley DB 1.x support/emulation.
 #]=============================================================================]
 
 include(CheckSourceCompiles)

cmake/cmake/modules/FindCdb.cmake

@@ -5,21 +5,21 @@ Module defines the following `IMPORTED` target(s):
 
 * `Cdb::Cdb` - The package library, if found.
 
-Result variables:
+## Result variables
 
 * `Cdb_FOUND` - Whether the package has been found.
 * `Cdb_INCLUDE_DIRS` - Include directories needed to use this package.
 * `Cdb_LIBRARIES` - Libraries needed to link to the package library.
 * `Cdb_VERSION` - Package version, if found.
 
-Cache variables:
+## Cache variables
 
 * `Cdb_INCLUDE_DIR` - Directory containing package library headers.
 * `Cdb_LIBRARY` - The path to the package library.
 
-Hints:
+## Hints
 
-The `Cdb_ROOT` variable adds custom search path.
+* The `Cdb_ROOT` variable adds custom search path.
 #]=============================================================================]
 
 include(CheckLibraryExists)
@@ -52,7 +52,13 @@ endif()
 
 find_library(
   Cdb_LIBRARY
-  NAMES cdb
+  NAMES
+    cdb
+    # TODO: Which system still has cdb built in the default C library? In such
+    # case this find module should be refactored to search the built-in library
+    # similar to how FindIconv does it. Otherwise, more likely, this should be
+    # removed from here.
+    c
   PATHS ${PC_Cdb_LIBRARY_DIRS}
   DOC "The path to the cdb library"
 )

cmake/cmake/modules/FindDbm.cmake

@@ -8,22 +8,22 @@ Module defines the following `IMPORTED` target(s):
 
 * `Dbm::Dbm` - The package library, if found.
 
-Result variables:
+## Result variables
 
 * `Dbm_FOUND` - Whether the package has been found.
 * `Dbm_INCLUDE_DIRS` - Include directories needed to use this package.
 * `Dbm_LIBRARIES` - Libraries needed to link to the package library.
 * `Dbm_IMPLEMENTATION` - String of the library name that implements the dbm
   library.
 
-Cache variables:
+## Cache variables
 
 * `Dbm_INCLUDE_DIR` - Directory containing package library headers.
 * `Dbm_LIBRARY` - The path to the package library.
 
-Hints:
+## Hints
 
-The `Dbm_ROOT` variable adds custom search path.
+* The `Dbm_ROOT` variable adds custom search path.
 #]=============================================================================]
 
 include(CheckLibraryExists)
@@ -50,21 +50,22 @@ if(NOT Dbm_INCLUDE_DIR)
   string(APPEND _reason "dbm.h not found. ")
 endif()
 
-# TODO: Fix the search names and the sanity check.
 find_library(
   Dbm_LIBRARY
-  NAMES gdbm_compat
-  DOC "The path to the dbm compat library"
+  NAMES
+    gdbm_compat
+    dbm
+    # TODO: Which system still has dbm built in the default C library? In such
+    # case this find module should be refactored to search the built-in library
+    # similar to how FindIconv does it. Otherwise, more likely, this should be
+    # removed from here.
+    c
+  DOC "The path to the dbm library"
 )
 
-if(Dbm_LIBRARY)
+if(Dbm_LIBRARY MATCHES "gdbm_compat")
   set(Dbm_IMPLEMENTATION "GDBM")
-else()
-  find_library(
-    Dbm_LIBRARY
-    NAMES dbm c
-    DOC "The path to the dbm library"
-  )
+elseif(Dbm_LIBRARY)
   set(Dbm_IMPLEMENTATION "DBM")
 endif()
 

cmake/cmake/modules/FindGDBM.cmake

@@ -5,20 +5,20 @@ Module defines the following `IMPORTED` target(s):
 
 * `GDBM::GDBM` - The package library, if found.
 
-Result variables:
+## Result variables
 
 * `GDBM_FOUND` - Whether the package has been found.
 * `GDBM_INCLUDE_DIRS` - Include directories needed to use this package.
 * `GDBM_LIBRARIES` - Libraries needed to link to the package library.
 
-Cache variables:
+## Cache variables
 
 * `GDBM_INCLUDE_DIR` - Directory containing package library headers.
 * `GDBM_LIBRARY` - The path to the package library.
 
-Hints:
+## Hints
 
-The `GDBM_ROOT` variable adds custom search path.
+* The `GDBM_ROOT` variable adds custom search path.
 #]=============================================================================]
 
 include(CheckLibraryExists)

cmake/cmake/modules/FindLMDB.cmake

@@ -5,21 +5,21 @@ Module defines the following `IMPORTED` target(s):
 
 * `LMDB::LMDB` - The package library, if found.
 
-Result variables:
+## Result variables
 
 * `LMDB_FOUND` - Whether the package has been found.
 * `LMDB_INCLUDE_DIRS` - Include directories needed to use this package.
 * `LMDB_LIBRARIES` - Libraries needed to link to the package library.
 * `LMDB_VERSION` - Package version, if found.
 
-Cache variables:
+## Cache variables
 
 * `LMDB_INCLUDE_DIR` - Directory containing package library headers.
 * `LMDB_LIBRARY` - The path to the package library.
 
-Hints:
+## Hints
 
-The `LMDB_ROOT` variable adds custom search path.
+* The `LMDB_ROOT` variable adds custom search path.
 #]=============================================================================]
 
 include(CheckLibraryExists)

cmake/cmake/modules/FindNdbm.cmake

@@ -1,27 +1,28 @@
 #[=============================================================================[
 Find the ndbm library.
 
-Depending on the system, the nbdm library can be part of other libraries as an
-interface.
+Depending on the system, the nbdm ("new" dbm) library can be part of other
+libraries as an interface. For example, GNU dbm library (GDBM) has a
+compatibility interface that provides ndbm.h header and gdbm_compat library.
 
 Module defines the following `IMPORTED` target(s):
 
 * `Ndbm::Ndbm` - The package library, if found.
 
-Result variables:
+## Result variables
 
 * `Ndbm_FOUND` - Whether the package has been found.
 * `Ndbm_INCLUDE_DIRS` - Include directories needed to use this package.
 * `Ndbm_LIBRARIES` - Libraries needed to link to the package library.
 
-Cache variables:
+## Cache variables
 
 * `Ndbm_INCLUDE_DIR` - Directory containing package library headers.
 * `Ndbm_LIBRARY` - The path to the package library.
 
-Hints:
+## Hints
 
-The `Ndbm_ROOT` variable adds custom search path.
+* The `Ndbm_ROOT` variable adds custom search path.
 #]=============================================================================]
 
 include(CheckLibraryExists)
@@ -50,7 +51,15 @@ endif()
 
 find_library(
   Ndbm_LIBRARY
-  NAMES ndbm db1 gdbm_compat c
+  NAMES
+    ndbm
+    gdbm_compat
+    db1
+    # TODO: Which system still has ndbm built in the default C library? In such
+    # case this find module should be refactored to search the built-in library
+    # similar to how FindIconv does it. Otherwise, more likely, this should be
+    # removed from here.
+    c
   DOC "The path to the ndbm library"
 )
 

cmake/cmake/modules/FindQDBM.cmake

@@ -5,21 +5,21 @@ Module defines the following `IMPORTED` target(s):
 
 * `QDBM::QDBM` - The package library, if found.
 
-Result variables:
+## Result variables
 
 * `QDBM_FOUND` - Whether the package has been found.
 * `QDBM_INCLUDE_DIRS` - Include directories needed to use this package.
 * `QDBM_LIBRARIES` - Libraries needed to link to the package library.
 * `QDBM_VERSION` - Package version, if found.
 
-Cache variables:
+## Cache variables
 
 * `QDBM_INCLUDE_DIR` - Directory containing package library headers.
 * `QDBM_LIBRARY` - The path to the package library.
 
-Hints:
+## Hints
 
-The `QDBM_ROOT` variable adds custom search path.
+* The `QDBM_ROOT` variable adds custom search path.
 #]=============================================================================]
 
 include(CheckLibraryExists)

cmake/cmake/modules/FindTokyoCabinet.cmake

@@ -5,21 +5,21 @@ Module defines the following `IMPORTED` target(s):
 
 * `TokyoCabinet::TokyoCabinet` - The package library, if found.
 
-Result variables:
+## Result variables
 
 * `TokyoCabinet_FOUND` - Whether the package has been found.
 * `TokyoCabinet_INCLUDE_DIRS` - Include directories needed to use this package.
 * `TokyoCabinet_LIBRARIES` - Libraries needed to link to the package library.
 * `TokyoCabinet_VERSION` - Package version, if found.
 
-Cache variables:
+## Cache variables
 
 * `TokyoCabinet_INCLUDE_DIR` - Directory containing package library headers.
 * `TokyoCabinet_LIBRARY` - The path to the package library.
 
-Hints:
+## Hints
 
-The `TokyoCabinet_ROOT` variable adds custom search path.
+* The `TokyoCabinet_ROOT` variable adds custom search path.
 #]=============================================================================]
 
 include(CheckLibraryExists)

cmake/cmake/modules/PHP/FeatureSummary.cmake

@@ -43,7 +43,7 @@ block()
     list(REMOVE_DUPLICATES enabledFeatures)
   endif()
 
-  list(SORT enabledFeatures COMPARE NATURAL)
+  list(SORT enabledFeatures COMPARE NATURAL CASE INSENSITIVE)
 
   set(sapis "")
   set(extensions "")