Changeset 25149 for main/trunk/greenstone2/runtime-src/src/protocol/Makefile.in

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/protocol/Makefile.in (modified) (2 diffs)

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

@@ -35 +35 @@
 ENABLE_MGPP = @ENABLE_MGPP@
 ifeq ($(ENABLE_MGPP), 1)
-MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text
+MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib
 else
 MGPP_INCLUDES =
@@ -66 +66 @@
 AR = ar
 CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
+CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@
 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!