From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 19 Aug 2016 14:35:31 +0000 (+0200)
Subject: Revert "Fix dba configuration for Windows"
X-Git-Tag: php-7.0.11RC1~44^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=057278b759fde998c62f3a500724824d45ad0290;p=php

Revert "Fix dba configuration for Windows"

This reverts commit ad76e8a529eabf150f17d313bb035b329bc68dec.

After a discussion with Anatol it seems to be better QA wise to not make
this change in stable versions or betas.
---

diff --git a/ext/dba/config.w32 b/ext/dba/config.w32
index c747323221..4f3514e62f 100644
--- a/ext/dba/config.w32
+++ b/ext/dba/config.w32
@@ -4,16 +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) &&
 		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");
 	}
 }