Changeset 25149 for main/trunk/greenstone2/runtime-src/src/oaiservr

Timestamp:

2012-02-28T14:18:52+13:00 (12 years ago)

Author:

kjdon

Message:

getting greenstone to work properly on 64 bit machines. COMPAT32BITFLAGS is no more. Don't need -m32 option. Instead, have ARCH_DEP_FLAGS, which gets -fPIC on 64 bit machines. Note that I have used version 2.63 of autoconf. SOme configure files had previously been generated with v 2.65. Have also got rid of lib64 for compiling expat and iconv - only need one version now, not 32 bit version for greenstone and 64 bit version for apache

File:

• main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/oaiservr/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 $(COMMON_PACKAGES_DIR)/iconv/lib64/libiconv.a
-endif
 else
 ACCENTFOLD_LIBS = 
@@ -63 +59 @@
 MGPP_INDEXERS_LIBS = $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
     $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
-MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text 
+MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text   -I$(INDEXERS_DIR)/mgpp/lib
 else
 MGPP_INDEXERS_LIBS =
@@ -96 +92 @@
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
+CFLAGS = @CFLAGS@ @ARCH_DEP_FLAGS@
 CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
+CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@
 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES)
-LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
+LDFLAGS = @LDFLAGS@ @ARCH_DEP_FLAGS@
 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \
     $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)