Changeset 25149 for main/trunk/greenstone2/runtime-src/src/recpt/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/recpt/Makefile.in (modified) (3 diffs)

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

@@ -42 +42 @@
 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 = 
@@ -163 +159 @@
 AR = ar
 CC = @CC@
-CFLAGS=@CFLAGS@ @COMPAT32BITFLAGS@
+CFLAGS=@CFLAGS@ @ARCH_DEP_FLAGS@
 CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
+CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@
 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(RSS_DEFINES) $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(Z3950_DEFS)
 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \
@@ -172 +168 @@
         -I$(COMMON_PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(GDBM_INCLUDES) $(Z3950_INCLUDES)
 INSTALL = @INSTALL@
-LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
+LDFLAGS = @LDFLAGS@ @ARCH_DEP_FLAGS@
 LIBS = @LIBS@ $(GDBM_LIBS) \
     $(COMMON_PACKAGES_DIR)/expat/lib/libexpat.a \