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

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/z3950/Makefile.in (modified) (1 diff)

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@