Ignore:
Timestamp:
2010-05-06T21:23:54+12:00 (14 years ago)
Author:
ak19
Message:

Changes to makefiles to 1. incorporate USE_GDBM and USE_JDBM flags (and USE_SQLITE) in most places so that the DEFINES variable is set at all times. This is necessary to ensure that all classes that contain objects with gdbm and jdbm members are of a consistent size. Else we've had experience with Greenstone crashing with memory errors (to do with the similar ENABLE_indexer flags). 2. ENABLE_JDBM is now USE_JDBM. 3. Not everything works now. It still compiles the default way, but the disable-gdbm flag is causing trouble when compiling argdb in recpt since it uses that.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/common-src/indexers/Makefile.in

    r21364 r22058  
    5858endif
    5959
     60USE_GDBM = @USE_GDBM@
     61ifeq ($(USE_GDBM), 1)
     62GDBM_DEFINES = -DUSE_GDBM
     63else
     64GDBM_DEFINES =
     65endif
     66
     67USE_JDBM = @USE_JDBM@
     68ifeq ($(USE_JDBM), 1)
     69JDBM_DEFINES = -DUSE_JDBM
     70else
     71JDBM_DEFINES =
     72endif
     73
     74USE_SQLITE = @USE_SQLITE@
     75ifeq ($(USE_SQLITE), 1)
     76USE_SQLITE = -DUSE_SQLITE
     77else
     78USE_SQLITE =
     79endif
     80
    6081INDEXERDIRS = $(UNAC) $(MG) $(MGPP) $(LUCENE)
    61 
     82DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    6283
    6384clean:
Note: See TracChangeset for help on using the changeset viewer.