Changeset 22378 for main/trunk/greenstone2/runtime-src

Timestamp:

2010-07-12T15:06:25+12:00 (14 years ago)

Author:

sjm84

Message:

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

Location:

main/trunk/greenstone2/runtime-src

Files:

• packages/configure (modified) (1 diff)
• src/oaiservr/Makefile.in (modified) (1 diff)
• src/recpt/Makefile.in (modified) (1 diff)
• src/z3950/Makefile.in (modified) (1 diff)

main/trunk/greenstone2/runtime-src/packages/configure

@@ -211 +211 @@
   if [ ! -e httpd-2.2.11 ] ; then gzip -dc httpd-2.2.11-gs.tar.gz | tar -xf - ; fi
   cd httpd-2.2.11&& \
-    ./configure $CACHE_FILE --with-included-apr --with-iconv="${GSDLHOME}/common-src/packages/iconv" --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS
+
+if [ ! -z $COMPAT32BITFLAGS ] ; then
+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
+else
+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
+fi
+
 else
   echo "Apache httpd support disabled"

main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in

@@ -38 +38 @@
 ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@
 ifeq ($(ENABLE_ACCENTFOLD), 1)
+ifeq ($(COMPAT32BITFLAGS),)
 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a
+else
+ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib64/libiconv.a
+endif
 else
 ACCENTFOLD_LIBS = 

main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

@@ -41 +41 @@
 ENABLE_ACCENTFOLD = @ENABLE_ACCENTFOLD@
 ifeq ($(ENABLE_ACCENTFOLD), 1)
+ifeq ($(COMPAT32BITFLAGS),)
 ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(COMMON_PACKAGES_DIR)/iconv/lib/libiconv.a
+else
+ACCENTFOLD_LIBS = $(INDEXERS_DIR)/packages/unac/libunac.a $(INDEXERS_DIR)/packages/iconv/lib64/libiconv.a
+endif
 else
 ACCENTFOLD_LIBS = 

main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in

@@ -102 +102 @@
 INSTALL = @INSTALL@
 LDFLAGS = @LDFLAGS@
+ifeq ($(COMPAT32BITFLAGS),)
 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
     $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \
     $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2
+else
+LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib64 -lexpat \
+    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \
+    $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2
+endif
 RANLIB = @RANLIB@