From: Marcus Boerger <helly@php.net>
Date: Sat, 26 Feb 2005 01:05:33 +0000 (+0000)
Subject: - Prepare for db1.85 emulation with db3
X-Git-Tag: RELEASE_0_3~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74dba529336f254b50b0548163fcced1c4b0d707;p=php

- Prepare for db1.85 emulation with db3
---

diff --git a/ext/dba/config.w32 b/ext/dba/config.w32
index 7ed74955ec..4f3514e62f 100644
--- a/ext/dba/config.w32
+++ b/ext/dba/config.w32
@@ -6,12 +6,12 @@ ARG_WITH("dba", "DBA support", "no");
 if (PHP_DBA != "no") {
 	if (CHECK_LIB("libdb31s.lib", "dba", PHP_DBA) &&
 		CHECK_HEADER_ADD_INCLUDE("db.h", "CFLAGS_DBA")) {
-		EXTENSION("dba", "dba.c dba_cdb.c dba_db2.c dba_db3.c dba_dbm.c dba_flatfile.c dba_gdbm.c dba_ndbm.c dba_inifile.c");
+		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_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");
+		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");
 	}