com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/dba/config.w32

Commit: 61344c6d662374ba1ab7988c7fa1b3ccd4414cde Author: Christoph M. Becker <cmbecker69@gmx.de> Fri, 19 Aug 2016 16:38:53 +0200 Parents: 2d123a916d46117a7952e6ac1090ff615ca5df0e 057278b759fde998c62f3a500724824d45ad0290 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=61344c6d662374ba1ab7988c7fa1b3ccd4414cde Log: Merge branch 'PHP-5.6' into PHP-7.0 Changed paths: MM ext/dba/config.w32 Diff: diff --cc ext/dba/config.w32 index ac0e1f7,4f3514e..4abba8d --- a/ext/dba/config.w32 +++ b/ext/dba/config.w32 @@@ -4,16 -4,15 +4,15 @@@ ARG_WITH("dba", "DBA 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"); - ADD_SOURCES("ext/dba/libcdb", "cdb.c cdb_make.c uint32.c", "dba"); - ADD_SOURCES("ext/dba/libflatfile", "flatfile.c", "dba"); - 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", "dba", PHP_DBA) && + 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"); + 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"); + ADD_SOURCES("ext/dba/libcdb", "cdb.c cdb_make.c uint32.c", "dba"); + ADD_SOURCES("ext/dba/libflatfile", "flatfile.c", "dba"); + ADD_SOURCES("ext/dba/libinifile", "inifile.c", "dba"); + AC_DEFINE('HAVE_DBA', 1, 'DBA support'); + 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"); + } else { + WARNING("dba not enabled; libraries and headers not found"); } }