Changeset 15503

Show
Ignore:
Timestamp:
15.05.2008 16:03:58 (11 years ago)
Author:
mdewsnip
Message:

Some fixes to avoid errors when the Z39.50 stuff ISN'T enabled.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/src/z3950/Makefile.in

    r15501 r15503  
    4040USE_Z3950 = @USE_Z3950@ 
    4141ifeq ($(USE_Z3950), 1) 
    42 Z3950_INCLUDES = -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/include -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/client \ 
    43      -I$(GSDL_DIR)/packages/d2m 
    44 Z3950_LIBS = $(GSDL_DIR)/packages/yaz/lib/libyaz.a $(GSDL_DIR)/packages/d2m/libd2m.a -lxml2 
    45 else 
    46 Z3950_INCLUDES =  
    47 Z3950_LIBS =  
    48 endif 
    49  
    50  
    5142AR = ar 
    5243CC = @CC@ 
     
    5849# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 
    5950INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 
    60     -I$(INDEXERS_DIR)/mgpp/text $(Z3950_INCLUDES) 
     51    -I$(INDEXERS_DIR)/mgpp/text -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/include \ 
     52    -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/client -I$(GSDL_DIR)/packages/d2m 
    6153INSTALL = @INSTALL@ 
    6254LDFLAGS = @LDFLAGS@ 
    63 LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(GSDL_DIR)/packages/expat/lib -lexpat $(ACCENTFOLD_LIBS) $(Z3950_LIBS) 
     55LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(GSDL_DIR)/packages/expat/lib -lexpat $(ACCENTFOLD_LIBS) \ 
     56    $(GSDL_DIR)/packages/yaz/lib/libyaz.a $(GSDL_DIR)/packages/d2m/libd2m.a -lxml2 
    6457RANLIB = @RANLIB@ 
    6558 
     
    147140depend: 
    148141    makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES) 
     142 
     143else 
     144all: 
     145endif