Changeset 25149 for main/trunk/greenstone2/build-src/packages

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/build-src/packages/configure (modified) (2 diffs)

main/trunk/greenstone2/build-src/packages/configure

@@ -182 +182 @@
 gzip -dc wget.tar.gz | tar -xf -
 cd "$PACKAGES/wget/wget-1.13.4" && \
-./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS 
-
+#./configure $CACHE_FILE --prefix=$PACKAGES/wget --with-ssl=openssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS 
+./configure $CACHE_FILE --prefix=$PACKAGES/wget --without-ssl --bindir="$bindir" -disable-nls $HOSTTARGETFLAGS 
 
 # configure XML::Parser perl module
@@ -197 +197 @@
 
 #Use 64-bit expat library on 64-bit machines, otherwise use 32-bit
-if test ! -z "$COMPAT32BITFLAGS" ; then
+if test ! -z "$ARCH_DEP_FLAGS" ; then
 perl Makefile.PL \
   PREFIX="$GSDLHOME/perllib/cpan/XML" \