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
Files:
23 edited

Legend:

Unmodified
Added
Removed

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

    r18224 r21324  
    3131COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    3232
     33# NOTE: phrasequeryfilter inherits from mgqueryfilter and uses mgsearch
     34ENABLE_MG = @ENABLE_MG@
     35ifeq ($(ENABLE_MG), 1)
     36MG_SOURCES = mgq.c \
     37    mgqueryfilter.cpp \
     38    mgsearch.cpp \
     39    mgsource.cpp \
     40    phrasequeryfilter.cpp
     41MG_OBJECTS = mgq.o \
     42    mgqueryfilter.o \
     43    mgsearch.o \
     44    mgsource.o \
     45    phrasequeryfilter.o
     46MG_INCLUDES = -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text
     47else
     48MG_SOURCES =
     49MG_OBJECTS =
     50MG_INCLUDES =
     51endif
     52
     53ENABLE_MGPP = @ENABLE_MGPP@
     54ifeq ($(ENABLE_MGPP), 1)
     55MGPP_SOURCES = mgppqueryfilter.cpp \
     56    mgppsearch.cpp \
     57    mgppsource.cpp
     58MGPP_OBJECTS = mgppqueryfilter.o \
     59    mgppsearch.o \
     60    mgppsource.o
     61MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text
     62else
     63MGPP_SOURCES =
     64MGPP_OBJECTS =
     65MGPP_INCLUDES =
     66endif
     67
     68
     69ENABLE_LUCENE = @ENABLE_LUCENE@
     70ifeq ($(ENABLE_LUCENE), 1)
     71LUCENE_SOURCES = lucenequeryfilter.cpp \
     72    lucenesearch.cpp \
     73    lucenesource.cpp
     74LUCENE_OBJECTS = lucenequeryfilter.o \
     75    lucenesearch.o \
     76    lucenesource.o
     77else
     78LUCENE_SOURCES =
     79LUCENE_OBJECTS =
     80endif
     81
    3382
    3483USE_SQLITE = @USE_SQLITE@
    … …  
    5099# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
    51100INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \
    52     -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mg/src/text \
    53     -I$(INDEXERS_DIR)/mgpp/lib -I$(INDEXERS_DIR)/mgpp/text \
     101    $(MG_INCLUDES) \
     102    $(MGPP_INCLUDES) \
    54103    -I$(COMMON_PACKAGES_DIR)/expat/include $(SQLITE_INCLUDES)
    55104RANLIB = @RANLIB@
    … …  
    79128    expat_resultset.cpp \
    80129    filter.cpp \
    81     lucenequeryfilter.cpp \
    82     lucenesearch.cpp \
    83     lucenesource.cpp \
     130    $(LUCENE_SOURCES) \
    84131    maptools.cpp \
    85     mgq.c \
    86     mgqueryfilter.cpp \
    87     mgsearch.cpp \
    88     mgsource.cpp \
    89     mgppqueryfilter.cpp \
    90     mgppsearch.cpp \
    91     phrasequeryfilter.cpp \
     132    $(MG_SOURCES) \
     133    $(MGPP_SOURCES) \
    92134    phrasesearch.cpp \
    93135    querycache.cpp \
    … …  
    107149    expat_resultset.o \
    108150    filter.o \
    109     lucenequeryfilter.o \
    110     lucenesearch.o \
    111     lucenesource.o \
     151    $(LUCENE_OBJECTS) \
    112152    maptools.o \
    113     mgq.o \
    114     mgqueryfilter.o \
    115     mgsearch.o \
    116     mgsource.o \
    117     mgppqueryfilter.o \
    118     mgppsearch.o \
    119     phrasequeryfilter.o \
     153    $(MG_OBJECTS) \
     154    $(MGPP_OBJECTS) \
    120155    phrasesearch.o \
    121156    querycache.o \

  • main/trunk/greenstone2/runtime-src/src/colservr/collectserver.cpp

    r20799 r21324  
    2929#include <assert.h>
    3030#include "display.h"
     31
     32void check_if_valid_buildtype(const text_t& buildtype)
     33{
     34  if (buildtype=="mg") {
     35#ifndef ENABLE_MG
     36    cerr << "Warning: Greenstone installation has not been compiled to support buildtype 'mg'." << endl;
     37#endif
     38  }
     39
     40  else if (buildtype=="mgpp") {
     41#ifndef ENABLE_MGPP
     42    cerr << "Warning: Greenstone installation has not been compiled to support buildtype 'mgpp'." << endl;
     43#endif
     44  }
     45
     46  else if (buildtype=="lucene") {
     47#ifndef ENABLE_LUCENE
     48    cerr << "Warning: Greenstone installation has not been compiled to support buildtype 'lucene'." << endl;
     49#endif
     50  }
     51
     52  else {
     53    cerr << "Error: buildtype '" << buildtype << "' is not a recognized indexer for Greenstone." << endl;
     54  }
     55
     56}
     57
    3158
    3259
    … …  
    202229    else if (key == "httpprefix") collectinfo.httpprefix = value;
    203230    else if (key == "receptionist") collectinfo.receptionist = value;
    204     else if (key == "buildtype") collectinfo.buildType = value;
     231    else if (key == "buildtype") {
     232      check_if_valid_buildtype(value); // prints warning if value (indexer) is invalid
     233      collectinfo.buildType = value;
     234    }
    205235    // backwards compatibility - searchytpes is now a format statement
    206236    else if (key == "searchtype") { // means buildtype is mgpp
    207237      if (collectinfo.buildType.empty()) {
     238    check_if_valid_buildtype("mgpp"); // prints warning if value (indexer) is invalid
    208239    collectinfo.buildType = "mgpp";
    209240      }

  • main/trunk/greenstone2/runtime-src/src/colservr/collectset.cpp

    r19806 r21324  
    3636#include "sqlbrowsefilter.h"
    3737#include "queryfilter.h"
     38
     39#ifdef ENABLE_MG
    3840#include "mgqueryfilter.h"
     41#include "mgsource.h"
     42#endif
     43#ifdef ENABLE_MGPP
    3944#include "mgppqueryfilter.h"
    40 #include "mgsource.h"
     45#include "mgppsource.h"
     46#endif
     47#ifdef ENABLE_LUCENE
    4148#include "lucenequeryfilter.h"
    4249#include "lucenesource.h"
     50#endif
    4351
    4452#include <assert.h>
    … …  
    6169  text_tarray collections;
    6270
     71#ifdef ENABLE_MG
    6372  mgsearch = NULL;
     73#endif
     74#ifdef ENABLE_MGPP
    6475  mgppsearch = NULL;
     76#endif
     77#ifdef ENABLE_LUCENE
    6578  lucenesearch = NULL;
     79#endif
    6680
    6781  // get gsdlhome (if we fail the error will be picked up later -- in
    … …  
    100114  httpprefix = httpprefix_arg;
    101115
     116#ifdef ENABLE_MG
    102117  mgsearch = NULL;
     118#endif
     119#ifdef ENABLE_MGPP
    103120  mgppsearch = NULL;
     121#endif
     122#ifdef ENABLE_LUCENE
    104123  lucenesearch = NULL;
     124#endif
    105125
    106126}
    … …  
    108128collectset::collectset ()
    109129{
     130#ifdef ENABLE_MG
    110131  mgsearch = NULL;
     132#endif
     133#ifdef ENABLE_MGPP
    111134  mgppsearch = NULL;
     135#endif
     136#ifdef ENABLE_LUCENE
    112137  lucenesearch = NULL;
     138#endif
    113139}
    114140
    … …  
    310336
    311337    if (buildtype == "mg") {
     338#ifdef ENABLE_MG
    312339      mgsearch = new mgsearchclass();
    313340 
    … …  
    323350      mgsource->set_textsearchptr (mgsearch);
    324351      cserver->add_source (mgsource);
     352#else
     353      cerr << "Error: buildtype " << buildtype << " not enabled." << endl;
     354#endif
    325355    }
    326356    else if (buildtype == "mgpp") {
     357#ifdef ENABLE_MGPP
    327358      mgppsearch = new mgppsearchclass();
    328359
    … …  
    333364      cserver->add_filter (queryfilter);
    334365     
    335       // add a mg source
    336       mgsourceclass *mgsource = new mgsourceclass ();
    337       mgsource->set_db_ptr(db_ptr);
    338       mgsource->set_textsearchptr (mgppsearch);
    339       cserver->add_source (mgsource);
     366      // add a mgpp source
     367      mgppsourceclass *mgppsource = new mgppsourceclass ();
     368      mgppsource->set_db_ptr(db_ptr);
     369      mgppsource->set_textsearchptr (mgppsearch);
     370      cserver->add_source (mgppsource);
     371#else
     372      cerr << "Error: buildtype " << buildtype << " not enabled." << endl;
     373#endif
    340374    }
    341375    else if (buildtype == "lucene") {
     376#ifdef ENABLE_LUCENE
    342377      lucenesearch = new lucenesearchclass();
    343378      lucenesearch->set_gsdlhome(gsdlhome);
    … …  
    354389      lucenesource->set_textsearchptr (lucenesearch);
    355390      cserver->add_source (lucenesource);
     391#else
     392      cerr << "Error: buildtype " << buildtype << " not enabled." << endl;
     393#endif
    356394    }
    357395    else {
    358       cerr << "Warning: unrecognized buildtype" << buildtype << endl;
     396      cerr << "Warning: unrecognized buildtype " << buildtype << endl;
    359397    }
    360398
    … …  
    414452void collectset::remove_all_collections () {
    415453
     454#ifdef ENABLE_MG
    416455  // first unload any cached mg databases
    417456  if (mgsearch != NULL) {
    418457    mgsearch->unload_database();
    419458  }
     459#endif
    420460
    421461  // now delete the collection server objects
    … …  
    512552  if (cservers.getcollectserver(collection) == NULL) return;
    513553
     554#ifdef ENABLE_MG
    514555  // first unload any cached mg databases - we may need to do something
    515556  // similar to this for mgpp and lucene too
    … …  
    517558    mgsearch->unload_database();
    518559  }
     560#endif
    519561
    520562  // now delete the collection server object

  • main/trunk/greenstone2/runtime-src/src/colservr/collectset.h

    r19365 r21324  
    1010#include "collectserver.h"
    1111#include "cnfgable.h"
     12
     13#ifdef ENABLE_MG
    1214#include "mgsearch.h"
     15#endif
     16#ifdef ENABLE_MGPP
    1317#include "mgppsearch.h"
     18#endif
     19#ifdef ENABLE_LUCENE
    1420#include "lucenesearch.h"
     21#endif
    1522
    1623class collectset : public configurable
    … …  
    1825 protected:
    1926  collectservermapclass cservers;
     27#ifdef ENABLE_MG
    2028  mgsearchclass         *mgsearch;
     29#endif
     30#ifdef ENABLE_MGPP
    2131  mgppsearchclass       *mgppsearch;
     32#endif
     33#ifdef ENABLE_LUCENE
    2234  lucenesearchclass     *lucenesearch;
     35#endif
     36
    2337  int                   noofservers;
    2438  text_t                httpdomain;

  • main/trunk/greenstone2/runtime-src/src/colservr/phrasesearch.cpp

    r15558 r21324  
    111111}
    112112
     113#ifdef ENABLE_MG
    113114bool doc_phrase_search (unsigned char *doc, int doclen,
    114115            const termfreqclassarray &phrase) {
    … …  
    258259  return result;
    259260}
     261#endif

  • main/trunk/greenstone2/runtime-src/src/colservr/phrasesearch.h

    r15595 r21324  
    3131#include "text_t.h"
    3232#include "unitool.h"
     33
     34#ifdef ENABLE_MG
    3335#include "mgsearch.h"
     36#endif
     37
    3438#include "dbclass.h"
    3539
    … …  
    3842// a document number. This function has not been coded with all
    3943// situations in mind and expects mgsearch and db set up ready to go
     44#ifdef ENABLE_MG
    4045bool OID_phrase_search (mgsearchclass &mgsearch,
    4146            dbclass &db,
    … …  
    4752            const termfreqclassarray &phrase,
    4853            int docnum);
     54#endif
    4955
    5056#endif

  • main/trunk/greenstone2/runtime-src/src/colservr/win32.mak

    r19521 r21324  
    3939USE_SQLITE = 1
    4040USE_MSSQL = 0
     41ENABLE_MG = 1
     42ENABLE_MGPP = 1
     43ENABLE_LUCENE = 1
    4144
    4245!IF $(DEBUG)
    … …  
    6164!ENDIF
    6265
    63 !IF $(USE_SQLITE)
     66!IF "$(USE_SQLITE)" == "0"
     67SQLITE_DEFINES =
     68SQLITE_INCLUDES =
     69!ELSE
    6470SQLITE_DEFINES = -DUSE_SQLITE
    6571SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include"
    66 !ELSE
    67 SQLITE_DEFINES =
    68 SQLITE_INCLUDES =
    6972!ENDIF
    7073
    … …  
    7376!ELSE
    7477MSSQL_DEFINES =
     78!ENDIF
     79
     80!IF "$(ENABLE_MG)" == "0"
     81MG_DEFS =
     82MG_SOURCES =
     83MG_OBJECTS =
     84MG_INCLUDES =
     85!ELSE
     86MG_DEFS = -DENABLE_MG
     87MG_SOURCES = mgq.c \
     88    mgqueryfilter.cpp \
     89    mgsearch.cpp \
     90    phrasequeryfilter.cpp \
     91    mgsource.cpp
     92MG_OBJECTS = mgq.obj \
     93    mgqueryfilter.obj \
     94    mgsearch.obj \
     95    phrasequeryfilter.obj \
     96    mgsource.obj
     97MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text"
     98!ENDIF
     99
     100!IF "$(ENABLE_MGPP)" == "0"
     101MGPP_DEFS =
     102MGPP_SOURCES =
     103MGPP_OBJECTS =
     104MGPP_INCLUDES =
     105!ELSE
     106MGPP_DEFS = -DENABLE_MGPP
     107MGPP_SOURCES = mgppqueryfilter.cpp \
     108    mgppsearch.cpp \
     109    mgppsource.cpp
     110MGPP_OBJECTS = mgppqueryfilter.obj \
     111    mgppsearch.obj \
     112    mgppsource.obj
     113MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
     114!ENDIF
     115
     116!IF "$(ENABLE_LUCENE)" == "0"
     117LUCENE_DEFS =
     118!ELSE
     119LUCENE_DEFS = -DENABLE_LUCENE
    75120!ENDIF
    76121
    … …  
    79124CC = cl
    80125DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    81         -DXML_STATIC $(SQLITE_DEFINES) $(MSSQL_DEFINES)
     126        -DXML_STATIC $(SQLITE_DEFINES) $(MSSQL_DEFINES) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
    82127# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
    83128INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" \
    84     -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
    85     -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
     129    $(MG_INCLUDES) \
     130    $(MGPP_INCLUDES) \
    86131    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
    87132    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" $(SQLITE_INCLUDES)
    … …  
    119164    lucenesource.cpp \
    120165    maptools.cpp \
    121     mgq.c \
    122     mgqueryfilter.cpp \
    123     mgsearch.cpp \
    124     mgsource.cpp \
    125     mgppqueryfilter.cpp \
    126     mgppsearch.cpp \
    127     phrasequeryfilter.cpp \
     166    $(MG_SOURCES) \
     167    $(MGPP_SOURCES) \
    128168    phrasesearch.cpp \
    129169    querycache.cpp \
    … …  
    147187    lucenesource.obj \
    148188    maptools.obj \
    149     mgq.obj \
    150     mgqueryfilter.obj \
    151     mgsearch.obj \
    152     mgsource.obj \
    153     mgppqueryfilter.obj \
    154     mgppsearch.obj \
    155     phrasequeryfilter.obj \
     189    $(MG_OBJECTS) \
     190    $(MGPP_OBJECTS) \
    156191    phrasesearch.obj \
    157192    querycache.obj \

  • 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>

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

    r20851 r21324  
    4343endif
    4444
     45
     46ENABLE_MG = @ENABLE_MG@
     47ifeq ($(ENABLE_MG), 1)
     48MG_INDEXERS_LIBS = $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
     49    $(INDEXERS_DIR)/mg/lib/libmglib.a
     50else
     51MG_INDEXERS_LIBS =
     52endif
     53
     54ENABLE_MGPP = @ENABLE_MGPP@
     55ifeq ($(ENABLE_MGPP), 1)
     56MGPP_INDEXERS_LIBS = $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     57    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
     58MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text
     59else
     60MGPP_INDEXERS_LIBS =
     61MGPP_INCLUDES =
     62endif
     63
     64
    4565USE_SQLITE = @USE_SQLITE@
    4666ifeq ($(USE_SQLITE), 1)
    … …  
    5575CXX = @CXX@
    5676CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    57 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
     77INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES)
    5878LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    5979LIBS = @LIBS@ $(COMMON_PACKAGES_DIR)/gdbm/lib/libgdbm.a -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
    … …  
    120140    $(PROTOCOL_DIR)/gsdlprotocol.a \
    121141    $(COLSERVR_DIR)/gsdlcolservr.a \
    122     $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
    123     $(INDEXERS_DIR)/mg/lib/libmglib.a \
    124     $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    125     $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
     142    $(MG_INDEXERS_LIBS) \
     143    $(MGPP_INDEXERS_LIBS) \
    126144    $(COMMON_DIR)/src/lib/gsdllib.a
    127145

  • main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak

    r19521 r21324  
    4444ENABLE_ACCENTFOLD = 1
    4545USE_SQLITE = 1
     46ENABLE_MG = 1
     47ENABLE_MGPP = 1
     48ENABLE_LUCENE = 1
    4649
    4750!IF $(DEBUG)
    … …  
    7174!ENDIF
    7275
    73 !IF $(USE_SQLITE)
     76!IF "$(USE_SQLITE)" == "0"
     77SQLITE_LIBS =
     78!ELSE
    7479SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    75 !ELSE
    76 SQLITE_LIBS =
    77 !ENDIF
     80!ENDIF
     81
     82!IF "$(ENABLE_MG)" == "0"
     83MG_LIBS =
     84!ELSE
     85MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
     86    "$(INDEXERS_DIR)\mg\lib\libmglib.lib"   
     87!ENDIF
     88
     89!IF "$(ENABLE_MGPP)" == "0"
     90MGPP_LIBS =
     91MGPP_INCLUDES =
     92!ELSE
     93MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
     94    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
     95MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text"
     96!ENDIF
     97
    7898
    7999
    … …  
    83103        -DGSDL_NOCACHE
    84104INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    85         -I"$(INDEXERS_DIR)\mgpp\text" -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \
     105        $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \
    86106    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
    87107    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat"
    … …  
    157177    "$(PROTOCOL_DIR)\gsdlprotocol.lib" \
    158178    "$(COLSERVR_DIR)\gsdlcolservr.lib" \
    159     "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
    160     "$(INDEXERS_DIR)\mg\lib\libmglib.lib" \
    161     "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
    162     "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
     179    $(MG_LIBS) \
     180    $(MGPP_LIBS) \
    163181    "$(COMMON_DIR)\src\lib\gsdllib.lib"
    164182

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

    r18224 r21324  
    3333COLSERVR_DIR = $(RUNTIME_DIR)/src/colservr
    3434
     35ENABLE_MGPP = @ENABLE_MGPP@
     36ifeq ($(ENABLE_MGPP), 1)
     37MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text
     38else
     39MGPP_INCLUDES =
     40endif
    3541
    3642AR = ar
    … …  
    4046# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    4147INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \
    42     -I$(COLSERVR_DIR) -I$(INDEXERS_DIR)/mgpp/text
     48    -I$(COLSERVR_DIR) $(MGPP_INCLUDES)
    4349RANLIB = @RANLIB@
    4450

  • main/trunk/greenstone2/runtime-src/src/protocol/win32.mak

    r19521 r21324  
    3838DLL = 0
    3939DLLDEBUG = 0
     40ENABLE_MGPP = 1
    4041
    4142!IF $(DEBUG)
    … …  
    5960!ENDIF
    6061
     62!IF $(ENABLE_MGPP) == "0"
     63MGPP_INCLUDES =
     64!ELSE
     65MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text"
     66!ENDIF
    6167
    6268AR = lib
    … …  
    6470DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    6571# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    66 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \
     72INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \
    6773     -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"
    6874

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

    r20849 r21324  
    4444else
    4545ACCENTFOLD_LIBS =
     46endif
     47
     48ENABLE_MG = @ENABLE_MG@
     49ifeq ($(ENABLE_MG), 1)
     50MG_INDEXERS_LIBS = $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
     51    $(INDEXERS_DIR)/mg/lib/libmglib.a
     52MG_INCLUDES = -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib
     53else
     54MG_INDEXERS_LIBS =
     55MG_INCLUDES =
     56endif
     57
     58ENABLE_MGPP = @ENABLE_MGPP@
     59ifeq ($(ENABLE_MGPP), 1)
     60MGPP_SOURCES = phindaction.cpp
     61MGPP_OBJECTS = phindaction.o
     62MGPP_INDEXERS_LIBS = $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     63    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
     64MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib
     65else
     66MGPP_SOURCES =
     67MGPP_OBJECTS =
     68MGPP_INDEXERS_LIBS =
     69MGPP_INCLUDES =
    4670endif
    4771
    … …  
    104128INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \
    105129        -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
    106     -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \
     130    $(MG_INCLUDES) $(MGPP_INCLUDES) \
    107131        -I$(COMMON_PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES)
    108132INSTALL = @INSTALL@
    … …  
    149173    pageaction.cpp \
    150174    pagedbrowserclass.cpp \
    151     phindaction.cpp \
     175    $(MGPP_SOURCES) \
    152176    phindbrowserclass.cpp \
    153177    pingaction.cpp \
    … …  
    194218    pageaction.o \
    195219    pagedbrowserclass.o \
    196     phindaction.o \
     220    $(MGPP_OBJECTS) \
    197221    phindbrowserclass.o \
    198222    pingaction.o \
    … …  
    213237    $(PROTOCOL_DIR)/gsdlprotocol.a \
    214238    $(COLSERVR_DIR)/gsdlcolservr.a \
    215     $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
    216     $(INDEXERS_DIR)/mg/lib/libmglib.a \
    217     $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    218     $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
     239    $(MG_INDEXERS_LIBS) \
     240    $(MGPP_INDEXERS_LIBS) \
    219241    $(COMMON_DIR)/src/lib/gsdllib.a
    220242

  • main/trunk/greenstone2/runtime-src/src/recpt/gsdl_modules_cfg.h

    r11998 r21324  
    5656#define GSDL_USE_EXTLINK_ACTION
    5757#undef  GSDL_USE_GTI_ACTION
     58
     59#ifdef ENABLE_MGPP
    5860#define GSDL_USE_PHIND_ACTION
     61#endif
     62
    5963#define GSDL_USE_PING_ACTION
    6064#define GSDL_USE_STATUS_ACTION

  • main/trunk/greenstone2/runtime-src/src/recpt/librarymain.cpp

    r19611 r21324  
    4444#include "extlinkaction.h"
    4545#include "pageaction.h"
     46#ifdef ENABLE_MGPP
    4647#include "phindaction.h"
     48#endif
    4749#include "pingaction.h"
    4850#include "queryaction.h"

  • main/trunk/greenstone2/runtime-src/src/recpt/mod_gsdl.cpp

    r19259 r21324  
    6969#include "filter.h"
    7070#include "browsefilter.h"
    71 #include "mgqueryfilter.h"
     71
     72//#ifdef ENABLE_MG
     73//#include "mgqueryfilter.h"
     74//#include "mgsearch.h"
     75//#endif
     76
    7277#include "infodbclass.h"
    73 #include "mgsource.h"
    74 #include "mgsearch.h"
    7578#include "collectset.h"
    7679
    … …  
    8285#include "documentaction.h"
    8386#include "extlinkaction.h"
     87#ifdef ENABLE_MGPP
    8488#include "phindaction.h"
     89#endif
    8590#if defined(USE_MYSQL) || defined(USE_ACCESS)
    8691#include "orderaction.h"
    … …  
    266271  recpt.add_action(anextlinkaction);
    267272
     273  // phindaction is for MGPP and uses MGQuery
     274#ifdef ENABLE_MGPP
    268275  phindaction *aphindaction = new phindaction();
    269276  recpt.add_action(aphindaction);
     277#endif
    270278
    271279#if defined(USE_MYSQL) || defined(USE_ACCESS)

  • main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

    r19521 r21324  
    4545ENABLE_ACCENTFOLD = 1
    4646USE_SQLITE = 1
     47ENABLE_MG = 1
     48ENABLE_MGPP = 1
     49ENABLE_LUCENE = 1
    4750
    4851!IF $(DEBUG)
    … …  
    7275!ENDIF
    7376
    74 !IF $(USE_SQLITE)
     77!IF "$(USE_SQLITE)" == "0"
     78SQLITE_LIBS =
     79!ELSE
    7580SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    76 !ELSE
    77 SQLITE_LIBS =
    7881!ENDIF
    7982
    … …  
    8891!ENDIF
    8992
     93!IF "$(ENABLE_MG)" == "0"
     94MG_DEFS =
     95MG_LIBS =
     96MG_INCLUDES =
     97!ELSE
     98MG_DEFS = -DENABLE_MG
     99MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
     100    "$(INDEXERS_DIR)\mg\lib\libmglib.lib"
     101MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib"
     102!ENDIF
     103
     104!IF "$(ENABLE_MGPP)" == "0"
     105MGPP_DEFS =
     106MGPP_SOURCES =
     107MGPP_OBJECTS =
     108MGPP_LIBS =
     109MGPP_INCLUDES =
     110!ELSE
     111MGPP_DEFS = -DENABLE_MGPP
     112MGPP_SOURCES = phindaction.cpp
     113MGPP_OBJECTS = phindaction.obj
     114MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
     115    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
     116MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text"
     117!ENDIF
    90118
    91119AR = lib
    92120CC = cl
    93121DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    94         -DGSDL_NOCACHE $(Z3950_DEFS)
     122        -DGSDL_NOCACHE $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS)
    95123INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
    96     -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
     124    $(MG_INCLUDES) $(MGPP_INCLUDES) \
    97125    -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" \
    98126    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
    … …  
    152180    pageaction.cpp \
    153181    pagedbrowserclass.cpp \
    154     phindaction.cpp \
     182    $(MGPP_SOURCES) \
    155183    phindbrowserclass.cpp \
    156184    pingaction.cpp \
    … …  
    197225    pageaction.obj \
    198226    pagedbrowserclass.obj \
    199     phindaction.obj \
     227    $(MGPP_OBJECTS) \
    200228    phindbrowserclass.obj \
    201229    pingaction.obj \
    … …  
    216244    "$(PROTOCOL_DIR)\gsdlprotocol.lib" \
    217245    "$(COLSERVR_DIR)\gsdlcolservr.lib" \
    218     "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
    219     "$(INDEXERS_DIR)\mg\lib\libmglib.lib" \
    220     "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
    221     "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
     246    $(MG_LIBS) \
     247    $(MGPP_LIBS) \
    222248    "$(COMMON_DIR)\src\lib\gsdllib.lib"
    223249

  • main/trunk/greenstone2/runtime-src/src/recpt/wizardaction.cpp

    r19821 r21324  
    555555  text_t indextype = args[macro_prefix+"buildtype"];
    556556  if(indextype == "") {
     557#ifdef ENABLE_MG
    557558    indextype = "mg";
     559#else
     560    cerr << "Unable to choose mg as the default indextype, since the Greenstone installation was not compiled with MG enabled." << endl;
     561#endif
    558562  }
    559563  options += " -indextype \"" + indextype + "\"";

  • main/trunk/greenstone2/runtime-src/src/w32server/cgiwrapper.cpp

    r19788 r21324  
    6969#include "extlinkaction.h"
    7070#include "collectoraction.h"
     71#ifdef ENABLE_MGPP
    7172#include "phindaction.h"
     73#endif
    7274#include "configaction.h"
    7375
    … …  
    350352collectoraction *acollectoraction = NULL;
    351353authenaction *aauthenaction = NULL;
     354#ifdef ENABLE_MGPP
    352355phindaction *aphindaction = NULL;
     356#endif
    353357configaction *aconfigaction = NULL;
    354358vlistbrowserclass *avlistbrowserclass = NULL;
    … …  
    584588  }
    585589
     590#ifdef ENABLE_MGPP
    586591  if (aphindaction == NULL) {
    587592    aphindaction = new phindaction();
    588593    recpt.add_action (aphindaction);
    589594  }
     595#endif
    590596 
    591597  if (aconfigaction == NULL) {

  • main/trunk/greenstone2/runtime-src/src/w32server/win32.mak

    r19521 r21324  
    4141ENABLE_ACCENTFOLD = 1
    4242USE_SQLITE = 1
     43ENABLE_MG = 1
     44ENABLE_MGPP = 1
     45ENABLE_LUCENE = 1
    4346
    4447!IF $(DEBUG)
    … …  
    6366!ENDIF
    6467
    65 !IF $(USE_SQLITE)
     68!IF "$(USE_SQLITE)" == "0"
     69SQLITE_LIBS =
     70!ELSE
    6671SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    67 !ELSE
    68 SQLITE_LIBS =
    69 !ENDIF
    70 
     72!ENDIF
     73
     74!IF "$(ENABLE_MG)" == "0"
     75MG_LIBS =
     76MG_INCLUDES =
     77!ELSE
     78MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
     79    "$(INDEXERS_DIR)\mg\lib\libmglib.lib"
     80MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text"
     81!ENDIF
     82
     83!IF "$(ENABLE_MGPP)" == "0"
     84MGPP_DEFS =
     85MGPP_LIBS =
     86MGPP_INCLUDES =
     87!ELSE
     88MGPP_DEFS = -DENABLE_MGPP
     89MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
     90    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
     91MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
     92!ENDIF
    7193
    7294AR = lib
    7395CC = cl
    74 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
     96DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE $(MGPP_DEFS)
    7597INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    76     -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mg" \
    7798    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
    78         -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
    79         -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
     99    -I"$(COLSERVR_DIR)" \
     100    $(MG_INCLUDES) \
     101        $(MGPP_INCLUDES)
    80102
    81103LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
    … …  
    141163    "$(PROTOCOL_DIR)\gsdlprotocol.lib" \
    142164    "$(COLSERVR_DIR)\gsdlcolservr.lib" \
    143     "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
    144     "$(INDEXERS_DIR)\mg\lib\libmglib.lib" \
    145     "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
    146     "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
     165    $(MG_LIBS) \
     166    $(MGPP_LIBS) \
    147167    "$(COMMON_DIR)\src\lib\gsdllib.lib"
    148168

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

    r18226 r21324  
    4343endif
    4444
     45
     46ENABLE_MG = @ENABLE_MG@
     47ifeq ($(ENABLE_MG), 1)
     48MG_INDEXERS_LIBS = $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
     49    $(INDEXERS_DIR)/mg/lib/libmglib.a
     50else
     51MG_INDEXERS_LIBS =
     52endif
     53
     54ENABLE_MGPP = @ENABLE_MGPP@
     55ifeq ($(ENABLE_MGPP), 1)
     56MGPP_INDEXERS_LIBS = $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     57    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
     58MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text
     59else
     60MGPP_INDEXERS_LIBS =
     61MGPP_INCLUDES =
     62endif
     63
     64
    4565USE_SQLITE = @USE_SQLITE@
    4666ifeq ($(USE_SQLITE), 1)
    … …  
    6181# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
    6282INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
    63     -I$(INDEXERS_DIR)/mgpp/text -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/include \
     83    $(MGPP_INCLUDES) -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/include \
    6484    -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(RUNTIME_PACKAGES_DIR)/d2m
    6585INSTALL = @INSTALL@
    … …  
    118138    $(PROTOCOL_DIR)/gsdlprotocol.a \
    119139    $(COLSERVR_DIR)/gsdlcolservr.a \
    120     $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
    121     $(INDEXERS_DIR)/mg/lib/libmglib.a \
    122     $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
    123     $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
     140    $(MG_INDEXERS_LIBS) \
     141    $(MGPP_INDEXERS_LIBS) \
    124142    $(COMMON_DIR)/src/lib/gsdllib.a
    125143

  • main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

    r19521 r21324  
    4242ENABLE_ACCENTFOLD = 1
    4343USE_SQLITE = 1
     44ENABLE_MG = 1
     45ENABLE_MGPP = 1
     46ENABLE_LUCENE = 1
    4447
    4548!IF $(DEBUG)
    … …  
    6972!ENDIF
    7073
    71 !IF $(USE_SQLITE)
     74!IF "$(USE_SQLITE)" == "0"
     75SQLITE_LIBS =
     76!ELSE
    7277SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    73 !ELSE
    74 SQLITE_LIBS =
    7578!ENDIF
    7679
     80!IF "$(ENABLE_MG)" == "0"
     81MG_LIBS =
     82!ELSE
     83MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
     84    "$(INDEXERS_DIR)\mg\lib\libmglib.lib"
     85!ENDIF
     86
     87!IF "$(ENABLE_MGPP)" == "0"
     88MGPP_LIBS =
     89MGPP_INCLUDES =
     90!ELSE
     91MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
     92    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
     93MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text"
     94!ENDIF
    7795
    7896AR = lib
    … …  
    8199# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
    82100INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
    83     -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
     101    $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
    84102    -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \
    85103    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
    … …  
    142160    $(PROTOCOL_DIR)\gsdlprotocol.lib \
    143161    $(COLSERVR_DIR)\gsdlcolservr.lib \
    144     $(INDEXERS_DIR)\mg/src/text/libmgtext.lib \
    145     $(INDEXERS_DIR)\mg/lib/libmglib.lib \
    146     $(INDEXERS_DIR)\mgpp/text/libmgpptext.lib \
    147     $(INDEXERS_DIR)\mgpp/lib/libmgpplib.lib \
     162    $(MG_LIBS) \
     163    $(MGPP_LIBS) \
    148164    $(COMMON_DIR)\src\lib\gsdllib.lib
    149165
Note: See TracChangeset for help on using the changeset viewer.