Skip to content

Commit ad76e8a

Browse files
committed
Fix dba configuration for Windows
To be able to build the dba extension on Windows, libdb was required. This is contrary to *nix where each handler can be configured individually. To avoid BC breaks, we only do minimal modifications, instead of adjusting the Windows configuration to match the *nix configuration, for now.
1 parent bc1214f commit ad76e8a

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

ext/dba/config.w32

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
ARG_WITH("dba", "DBA support", "no");
55

66
if (PHP_DBA != "no") {
7+
EXTENSION("dba", "dba.c dba_cdb.c dba_db1.c dba_db2.c dba_db3.c dba_dbm.c dba_flatfile.c dba_gdbm.c dba_ndbm.c dba_inifile.c");
8+
ADD_SOURCES("ext/dba/libcdb", "cdb.c cdb_make.c uint32.c", "dba");
9+
ADD_SOURCES("ext/dba/libflatfile", "flatfile.c", "dba");
10+
ADD_SOURCES("ext/dba/libinifile", "inifile.c", "dba");
11+
AC_DEFINE('HAVE_DBA', 1, 'DBA support');
12+
ADD_FLAG("CFLAGS_DBA", "/D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /D DBA_INIFILE=1");
713
if (CHECK_LIB("libdb31s.lib", "dba", PHP_DBA) &&
814
CHECK_HEADER_ADD_INCLUDE("db.h", "CFLAGS_DBA")) {
9-
EXTENSION("dba", "dba.c dba_cdb.c dba_db1.c dba_db2.c dba_db3.c dba_dbm.c dba_flatfile.c dba_gdbm.c dba_ndbm.c dba_inifile.c");
10-
ADD_SOURCES("ext/dba/libcdb", "cdb.c cdb_make.c uint32.c", "dba");
11-
ADD_SOURCES("ext/dba/libflatfile", "flatfile.c", "dba");
12-
ADD_SOURCES("ext/dba/libinifile", "inifile.c", "dba");
13-
AC_DEFINE('HAVE_DBA', 1, 'DBA support');
14-
ADD_FLAG("CFLAGS_DBA", "/D DBA_DB1=0 /D DB1_VERSION=\"\\\"Berkeley DB 1.85 emulation in DB3\\\"\" /D DB1_INCLUDE_FILE=\"\\\"db_185.h\\\"\" /D DBA_DB3=1 /D DB3_INCLUDE_FILE=\"\\\"db.h\\\"\" /D DBA_FLATFILE=1 /D DBA_CDB=1 /D DBA_CDB_MAKE=1 /D DBA_CDB_BUILTIN=1 /D DBA_INIFILE=1");
15-
} else {
16-
WARNING("dba not enabled; libraries and headers not found");
15+
ADD_FLAG("CFLAGS_DBA", "/D DBA_DB1=0 /D DB1_VERSION=\"\\\"Berkeley DB 1.85 emulation in DB3\\\"\" /D DB1_INCLUDE_FILE=\"\\\"db_185.h\\\"\" /D DBA_DB3=1 /D DB3_INCLUDE_FILE=\"\\\"db.h\\\"\"");
16+
} else if (PHP_DBA != "yes") {
17+
WARNING("dba: db handlers not enabled; libraries and headers not found");
1718
}
1819
}

0 commit comments

Comments
 (0)