Show
Ignore:
Timestamp:
12.07.2010 15:06:25 (9 years ago)
Author:
sjm84
Message:

Greenstone 2 now compiles and installs on 64-bit linux machines

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

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/configure

    r22058 r22378  
    211211  if [ ! -e httpd-2.2.11 ] ; then gzip -dc httpd-2.2.11-gs.tar.gz | tar -xf - ; fi 
    212212  cd httpd-2.2.11&& \ 
    213     ./configure $CACHE_FILE --with-included-apr --with-iconv="${GSDLHOME}/common-src/packages/iconv" --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS 
     213 
     214if [ ! -z $COMPAT32BITFLAGS ] ; then 
     215CFLAGS="$CFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" CXXFLAGS="$CXXFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" LDFLAGS="$LDFLAGS -L${GSDLHOME}/common-src/packages/iconv/lib64" ./configure $CACHE_FILE --with-included-apr --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS --with-iconv 
     216else 
     217CFLAGS="$CFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" CXXFLAGS="$CXXFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" LDFLAGS="$LDFLAGS -L${GSDLHOME}/common-src/packages/iconv/lib" ./configure $CACHE_FILE --with-included-apr --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS --with-iconv 
     218fi 
     219 
    214220else 
    215221  echo "Apache httpd support disabled" 
  • main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in

    r22078 r22378  
    3838ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 
    3939ifeq ($(ENABLE_ACCENTFOLD), 1) 
     40ifeq ($(COMPAT32BITFLAGS),) 
    4041ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a 
     42else 
     43ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib64/libiconv.a 
     44endif 
    4145else 
    4246ACCENTFOLD_LIBS =  
  • main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

    r22078 r22378  
    4141ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 
    4242ifeq ($(ENABLE_ACCENTFOLD), 1) 
     43ifeq ($(COMPAT32BITFLAGS),) 
    4344ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a 
     45else 
     46ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(INDEXERS_DIR)/packages/iconv/lib64/libiconv.a 
     47endif 
    4448else 
    4549ACCENTFOLD_LIBS =  
  • main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in

    r22078 r22378  
    102102INSTALL = @INSTALL@ 
    103103LDFLAGS = @LDFLAGS@ 
     104ifeq ($(COMPAT32BITFLAGS),) 
    104105LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 
    105106    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ 
    106107    $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2 
     108else 
     109LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib64 -lexpat \ 
     110    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ 
     111    $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2 
     112endif 
    107113RANLIB = @RANLIB@ 
    108114