fiddlerwoaroof/crawl - Change ODXSZBNRJW7RT2SQQLG4HFDMXVQFXQ4UXO4XRLB6POMI34N6QI5QC

[2412841] Removing fragile support for Berkely dbm and using SQLite instead.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9066 c06c8d41-db1a-0410-9941-cceddc491573

Created by ennewalker on February 14, 2009

ODXSZBNRJW7RT2SQQLG4HFDMXVQFXQ4UXO4XRLB6POMI34N6QI5QC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/makefile_tiles.unix at line 74 [7.5756330]
B:BD[7.5758171] → [7.5758171:5758288]
B:BD[7.5758288] → [5.2592:2668]
∅:D[5.2668] → [7.5758340:5758341]
B:BD[7.5758340] → [7.5758340:5758341]
B:BD[7.5758341] → [6.3048:3078]
∅:D[6.3078] → [7.5758362:5758452]
B:BD[7.5758362] → [7.5758362:5758452]
```
DBH_FILE  := /usr/include/db.h
NDBM_FILE := /usr/include/ndbm.h
HAVE_DBH  := $(shell [ -f $(DBH_FILE) ] && echo y)
HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a "`uname`" = "Darwin" ] && echo y)
ifeq ($(strip $(HAVE_DBH)),y)
ifneq ($(shell grep dbm_open $(DBH_FILE)),)
SELDBM := -DDB_DBH
LIBDBM := -ldb
endif
endif
```
Deletion in crawl-ref/source/makefile_tiles.unix at line 75 [7.5756330]
B:BD[7.5758453] → [6.3079:3110]
∅:D[6.3110] → [7.5758475:5758551]
B:BD[7.5758475] → [7.5758475:5758551]
```
ifeq ($(strip $(HAVE_NDBM)),y)
SELDBM ?= -DDB_NDBM
ifeq ($(SELDBM),-DDB_NDBM)
LIBDBM := -ldbm
endif
endif
```
Replacement in crawl-ref/source/makefile_tiles.unix at line 80 [7.5756330]
B:BD[7.5758656] → [6.3111:3138]
∅:D[6.3138] → [7.5758674:5758714]
B:BD[7.5758674] → [7.5758674:5758714]
```
ifeq ($(strip $(LIBDBM)),)
LIBDBM         := -L$(SQLSRC) -lsqlite3
```
[7.5758656]
[7.5758714]
```
LIBDBM         := -L$(SQLSRC) -l$(SQLLIB)
```
Deletion in crawl-ref/source/makefile_tiles.unix at line 83 [7.5756330]
B:BD[7.5758774] → [7.5758774:5758780]
```
endif
```
Deletion in crawl-ref/source/makefile_tiles.unix at line 127 [7.5756330]
B:BD[7.5759181] → [7.5759181:5759204]
```
CFOTHERS += $(SELDBM)
```
Deletion in crawl-ref/source/makefile.unix at line 59 [9.604320]
∅:D[8.170] → [9.604890:604891]
∅:D[10.272] → [9.604890:604891]
∅:D[11.985841] → [9.604890:604891]
B:BD[9.604890] → [9.604890:604891]
B:BD[12.2239890] → [12.2239890:2240006]
B:BD[12.2240006] → [4.2542:2618]
∅:D[4.2618] → [12.2240058:2240059]
B:BD[12.2240058] → [12.2240058:2240059]
B:BD[12.2240059] → [3.495:525]
∅:D[3.525] → [12.2240080:2240170]
B:BD[12.2240080] → [12.2240080:2240170]
```
DBH_FILE  := /usr/include/db.h
NDBM_FILE := /usr/include/ndbm.h
HAVE_DBH  := $(shell [ -f $(DBH_FILE) ] && echo y)
HAVE_NDBM := $(shell [ -f $(NDBM_FILE) -a "`uname`" = "Darwin" ] && echo y)
ifeq ($(strip $(HAVE_DBH)),y)
ifneq ($(shell grep dbm_open $(DBH_FILE)),)
SELDBM := -DDB_DBH
LIBDBM := -ldb
endif
endif
```
Deletion in crawl-ref/source/makefile.unix at line 60 [9.604320]
B:BD[12.2240171] → [3.526:557]
∅:D[3.557] → [12.2240193:2240213]
B:BD[12.2240193] → [12.2240193:2240213]
B:BD[12.2240213] → [2.262:289]
∅:D[2.289] → [12.2240241:2240270]
B:BD[12.2240241] → [12.2240241:2240270]
```
ifeq ($(strip $(HAVE_NDBM)),y)
SELDBM ?= -DDB_NDBM
ifeq ($(SELDBM),-DDB_NDBM)
LIBDBM := -ldbm
endif
endif
```
Replacement in crawl-ref/source/makefile.unix at line 65 [9.604320]
B:BD[12.2240375] → [3.558:585]
∅:D[3.585] → [12.2240393:2240433]
B:BD[12.2240393] → [12.2240393:2240433]
```
ifeq ($(strip $(LIBDBM)),)
LIBDBM         := -L$(SQLSRC) -lsqlite3
```
[12.2240375]
[12.2240433]
```
LIBDBM         := -L$(SQLSRC) -l$(SQLLIB)
```
Deletion in crawl-ref/source/makefile.unix at line 68 [9.604320]
B:BD[12.2240493] → [12.2240493:2240499]
```
endif
```
Deletion in crawl-ref/source/makefile.unix at line 120 [9.604320]
B:BD[13.278] → [12.2240617:2240639]
∅:D[12.2240639] → [9.605126:605127]
B:BD[9.605126] → [9.605126:605127]
```
CFOTHERS += $(SELDBM)
```

[2412841] Removing fragile support for Berkely dbm and using SQLite instead.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/makefile_tiles.unix at line 74 [7.5756330]

Deletion in crawl-ref/source/makefile_tiles.unix at line 75 [7.5756330]

Replacement in crawl-ref/source/makefile_tiles.unix at line 80 [7.5756330]

Deletion in crawl-ref/source/makefile_tiles.unix at line 83 [7.5756330]

Deletion in crawl-ref/source/makefile_tiles.unix at line 127 [7.5756330]

Deletion in crawl-ref/source/makefile.unix at line 59 [9.604320]

Deletion in crawl-ref/source/makefile.unix at line 60 [9.604320]

Replacement in crawl-ref/source/makefile.unix at line 65 [9.604320]

Deletion in crawl-ref/source/makefile.unix at line 68 [9.604320]

Deletion in crawl-ref/source/makefile.unix at line 120 [9.604320]