Changeset 30878

Show
Ignore:
Timestamp:
18.10.2016 16:52:37 (3 years ago)
Author:
ak19
Message:

Modifications to get GS2 compiling to work again on Macs after the recent ElCapitan? changes around libiconv for a GS3 release.

Location:
main/trunk/greenstone2/runtime-src/src
Files:
4 modified

Legend:

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

    r25231 r30878  
    2828COMMON_DIR = $(GSDL_DIR)/common-src 
    2929RUNTIME_DIR = $(GSDL_DIR)/runtime-src 
     30 
     31GSDLOS = @gsdlos@ 
     32GSLDARCH = @gsdlarch@ 
    3033 
    3134INDEXERS_DIR = $(COMMON_DIR)/indexers 
     
    3942ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 
    4043ifeq ($(ENABLE_ACCENTFOLD), 1) 
     44ifeq ($(GSDLOS),darwin) 
     45ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a -liconv 
     46else 
    4147ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a 
     48endif 
    4249else 
    4350ACCENTFOLD_LIBS =  
  • main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in

    r25237 r30878  
    4141ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 
    4242ifeq ($(ENABLE_ACCENTFOLD), 1) 
     43ifeq ($(GSDLOS),darwin) 
     44ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a -liconv 
     45else 
    4346ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a 
     47endif 
    4448else 
    4549ACCENTFOLD_LIBS =  
  • main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

    r29046 r30878  
    4242ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 
    4343ifeq ($(ENABLE_ACCENTFOLD), 1) 
     44ifeq ($(GSDLOS),darwin) 
     45ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a -liconv 
     46else 
    4447ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a 
     48endif 
    4549else 
    4650ACCENTFOLD_LIBS =  
  • main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in

    r25149 r30878  
    2828COMMON_DIR = $(GSDL_DIR)/common-src 
    2929RUNTIME_DIR = $(GSDL_DIR)/runtime-src 
     30 
     31GSDLOS = @gsdlos@ 
     32GSDLARCH = @gsdlarch@ 
    3033 
    3134INDEXERS_DIR = $(COMMON_DIR)/indexers 
     
    3841ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 
    3942ifeq ($(ENABLE_ACCENTFOLD), 1) 
     43ifeq ($(GSDLOS),darwin) 
     44ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a -liconv 
     45else 
    4046ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a 
     47endif 
    4148else 
    4249ACCENTFOLD_LIBS =