com php-src: since libdb isn't bundled, it needs a config option as well: ext/dba/config.w32

Commit: 3efea8aed28d57a9f64495febb0482232e6ee464 Author: Anatol Belski <ab@php.net> Sat, 8 Oct 2016 20:43:24 +0200 Parents: 1f0346d26dd637f8bc0f12de39943737388f7b43 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3efea8aed28d57a9f64495febb0482232e6ee464 Log: since libdb isn't bundled, it needs a config option as well Changed paths: M ext/dba/config.w32 Diff: diff --git a/ext/dba/config.w32 b/ext/dba/config.w32 index 176f67e..d521e6a 100644 --- a/ext/dba/config.w32 +++ b/ext/dba/config.w32 @@ -3,6 +3,7 @@ ARG_WITH("dba", "DBA support", "no"); ARG_WITH("qdbm", "DBA: QDBM support", "no"); +ARG_WITH("db", "DBA: Berkeley DB support", "no"); if (PHP_DBA != "no") { 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"); @@ -11,11 +12,14 @@ if (PHP_DBA != "no") { ADD_SOURCES("ext/dba/libinifile", "inifile.c", "dba"); AC_DEFINE('HAVE_DBA', 1, 'DBA support'); 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"); - if (CHECK_LIB("libdb31s.lib;libdb61.lib", "dba", PHP_DBA) && - CHECK_HEADER_ADD_INCLUDE("db.h", "CFLAGS_DBA")) { - 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\\\"\""); - } else if (PHP_DBA != "yes") { - WARNING("dba: db handlers not enabled; libraries and headers not found"); + + if (PHP_DB != "no") { + if (CHECK_LIB("libdb31s.lib;libdb61.lib", "dba", PHP_DBA) && + CHECK_HEADER_ADD_INCLUDE("db.h", "CFLAGS_DBA")) { + 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\\\"\""); + } else { + WARNING("dba: db handlers not enabled; libraries and headers not found"); + } } if (PHP_QDBM != "no") {