Changeset 22378 for main/trunk/greenstone2/runtime-src/packages

Timestamp:

2010-07-12T15:06:25+12:00 (14 years ago)

Author:

sjm84

Message:

Greenstone 2 now compiles and installs on 64-bit linux machines

File:

• main/trunk/greenstone2/runtime-src/packages/configure (modified) (1 diff)

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

@@ -211 +211 @@
   if [ ! -e httpd-2.2.11 ] ; then gzip -dc httpd-2.2.11-gs.tar.gz | tar -xf - ; fi
   cd httpd-2.2.11&& \
-    ./configure $CACHE_FILE --with-included-apr --with-iconv="${GSDLHOME}/common-src/packages/iconv" --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS
+
+if [ ! -z $COMPAT32BITFLAGS ] ; then
+CFLAGS="$CFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" CXXFLAGS="$CXXFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" LDFLAGS="$LDFLAGS -L${GSDLHOME}/common-src/packages/iconv/lib64" ./configure $CACHE_FILE --with-included-apr --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS --with-iconv
+else
+CFLAGS="$CFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" CXXFLAGS="$CXXFLAGS -I${GSDLHOME}/common-src/packages/iconv/include" LDFLAGS="$LDFLAGS -L${GSDLHOME}/common-src/packages/iconv/lib" ./configure $CACHE_FILE --with-included-apr --with-layout=BinaryDistribution --enable-most --prefix="${prefix}/apache-httpd/${GSDLOS}" $HOSTTARGETFLAGS --with-iconv
+fi
+
 else
   echo "Apache httpd support disabled"