Changeset 25149 for main/trunk/greenstone2/common-src/configure.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/common-src/configure.in (modified) (1 diff)

main/trunk/greenstone2/common-src/configure.in

@@ -224 +224 @@
 if test "$arch_64bit" = yes; then
   AC_MSG_RESULT(yes)
-  if test -z "$COMPAT32BITFLAGS" ; then
-    COMPAT32BITFLAGS="-m32"
+  if test -z "$ARCH_DEP_FLAGS" ; then
+    ARCH_DEP_FLAGS="-fPIC"
     gsdlarch='64'
   fi
 else
   AC_MSG_RESULT(no)
-  if test -z "$COMPAT32BITFLAGS" ; then
-    COMPAT32BITFLAGS=
+  if test -z "$ARCH_DEP_FLAGS" ; then
+    ARCH_DEP_FLAGS=
     gsdlarch='32'
   fi
 fi
 
-# Only need compat32bitflag if using MG or MGPP
-if test "$ENABLE_MG" = "0" ; then
-  COMPAT32BITFLAGS=
-else
-  if test "$ENABLE_MGPP" = "0" ; then
-    COMPAT32BITFLAGS=
-  fi
-fi
-
-export COMPAT32BITFLAGS
-AC_SUBST(COMPAT32BITFLAGS)
+export ARCH_DEP_FLAGS
+AC_SUBST(ARCH_DEP_FLAGS)