Ignore:
Timestamp:
2009-12-09T21:41:14+13:00 (14 years ago)
Author:
ak19
Message:

Changes to makefiles, configure files, and source code to work with the new configure flags that allow indexers to be individually compiled up by setting each indexer to be enabled or disabled (enable-mg, enable-mgpp, enable-lucene)

Location:
main/trunk/greenstone2/runtime-src/src/corba
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/runtime-src/src/corba/Makefile.in

    r18233 r21324  
    4444endif
    4545
     46
     47ENABLE_MG = @ENABLE_MG@
     48ifeq ($(ENABLE_MG), 1)
     49MG_INDEXERS_LIBS = $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
     50    $(INDEXERS_DIR)/mg/lib/libmglib.a
     51else
     52MG_INDEXERS_LIBS =
     53endif
     54
     55ENABLE_MGPP = @ENABLE_MGPP@
     56ifeq ($(ENABLE_MGPP), 1)
     57MGPP_INDEXERS_LIBS = $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     58    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
     59MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text
     60else
     61MGPP_INDEXERS_LIBS =
     62MGPP_INCLUDES =
     63endif
     64
     65
    4666USE_SQLITE = @USE_SQLITE@
    4767ifeq ($(USE_SQLITE), 1)
    … …  
    7191CFLAGS = @CFLAGS@
    7292DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
    73 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text \
     93INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES) \
    7494    $(MICO_INCLUDES)
    7595INSTALL = @INSTALL@
    … …  
    113133    $(PROTOCOL_DIR)/gsdlprotocol.a \
    114134    $(COLSERVR_DIR)/gsdlcolservr.a \
    115     $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
    116     $(INDEXERS_DIR)/mg/lib/libmglib.a \
    117     $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    118     $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
     135    $(MG_INDEXERS_LIBS) \
     136    $(MGPP_INDEXERS_LIBS) \
    119137    $(COMMON_DIR)/src/lib/gsdllib.a
    120138

  • main/trunk/greenstone2/runtime-src/src/corba/corbaclient.mpp

    r18235 r21324  
    3333#include "browsefilter.h"
    3434#include "queryfilter.h"
     35#ifdef ENABLE_MG
    3536#include "mgsearch.h"
     37#endif
    3638#include "fileutil.h"
    3739#include <assert.h>
Note: See TracChangeset for help on using the changeset viewer.