Changeset 22378 for main/trunk/greenstone2/runtime-src
- Timestamp:
- 2010-07-12T15:06:25+12:00 (14 years ago)
- Location:
- main/trunk/greenstone2/runtime-src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/packages/configure
r22058 r22378 211 211 if [ ! -e httpd-2.2.11 ] ; then gzip -dc httpd-2.2.11-gs.tar.gz | tar -xf - ; fi 212 212 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 214 if [ ! -z $COMPAT32BITFLAGS ] ; then 215 CFLAGS="$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 216 else 217 CFLAGS="$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 218 fi 219 214 220 else 215 221 echo "Apache httpd support disabled" -
main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in
r22078 r22378 38 38 ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 39 39 ifeq ($(ENABLE_ACCENTFOLD), 1) 40 ifeq ($(COMPAT32BITFLAGS),) 40 41 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a 42 else 43 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib64/libiconv.a 44 endif 41 45 else 42 46 ACCENTFOLD_LIBS = -
main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in
r22078 r22378 41 41 ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@ 42 42 ifeq ($(ENABLE_ACCENTFOLD), 1) 43 ifeq ($(COMPAT32BITFLAGS),) 43 44 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a 45 else 46 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(INDEXERS_DIR)/packages/iconv/lib64/libiconv.a 47 endif 44 48 else 45 49 ACCENTFOLD_LIBS = -
main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in
r22078 r22378 102 102 INSTALL = @INSTALL@ 103 103 LDFLAGS = @LDFLAGS@ 104 ifeq ($(COMPAT32BITFLAGS),) 104 105 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 105 106 $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ 106 107 $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2 108 else 109 LIBS = @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 112 endif 107 113 RANLIB = @RANLIB@ 108 114
Note:
See TracChangeset
for help on using the changeset viewer.