Changeset 21702

Show
Ignore:
Timestamp:
02.02.2010 15:14:17 (9 years ago)
Author:
mdewsnip
Message:

Now expat_document.cpp and expat_resultset.cpp are only compiled if Lucene support is enabled.

Location:
main/trunk/gs2-core/runtime-src/src/colservr
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2-core/runtime-src/src/colservr/Makefile.am

    r21692 r21702  
    4646    colservrconfig.cpp \ 
    4747    comtypes.cpp \ 
    48     expat_document.cpp \ 
    49     expat_resultset.cpp \ 
    5048    filter.cpp \ 
    5149    lucenequeryfilter.cpp \ 
     
    6462if ENABLE_LUCENE 
    6563  libgsdlcolservr_a_CPPFLAGS += -I$(GSDL_DIR)/common-src/packages/expat/include 
     64  libgsdlcolservr_a_SOURCES += expat_document.cpp expat_resultset.cpp 
    6665endif 
    6766 
  • main/trunk/gs2-core/runtime-src/src/colservr/win32.mak

    r21699 r21702  
    4343    colservrconfig.obj \ 
    4444    comtypes.obj \ 
    45     expat_document.obj \ 
    46     expat_resultset.obj \ 
    4745    filter.obj \ 
    4846    lucenequeryfilter.obj \ 
     
    6260!IF $(ENABLE_LUCENE) 
    6361LIBCOLSERVR_CPPFLAGS = -DENABLE_LUCENE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\windows\expat\expat" 
     62LIBCOLSERVR_OBJECTS = $(LIBCOLSERVR_OBJECTS) expat_document.obj expat_resultset.obj 
    6463!ENDIF 
    6564