Changeset 22378 for main/trunk/greenstone2/common-src/packages/configure

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

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

@@ -140 +140 @@
 fi
 
+#Configure and compile 32-bit expat
+if test -e Makefile ; then
+  echo make distclean && \
+  make distclean
+fi
+
 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" $HOSTTARGETFLAGS $ENVIRONMENT
 
@@ -151 +157 @@
 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" make install $ENVIRONMENT
 
+echo make distclean && \
+make distclean
+
+if test ! -z "$COMPAT32BITFLAGS" ; then
+#Configure and compile 64-bit expat
+  echo ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" --libdir="$PACKAGES/expat/lib64" $HOSTTARGETFLAGS $ENVIRONMENT
+
+  cd "$PACKAGES/expat/expat-1.95.8" && \
+  ./configure $CACHE_FILE --disable-shared --with-pic --prefix=$PACKAGES/expat --bindir="$bindir" --libdir="$PACKAGES/expat/lib64" $HOSTTARGETFLAGS $ENVIRONMENT
+
+  echo make $ENVIRONMENT
+  make $ENVIRONMENT
+
+  echo make install $ENVIRONMENT
+  make install $ENVIRONMENT
+fi
+
+echo make distclean && \
+make distclean
 
 # configure and compile libiconv during configuration stage
@@ -163 +188 @@
 
 # configure
+cd "$PACKAGES/iconv/libiconv-1.13.1"
+
+if test -e Makefile ; then
+  echo make distclean && \
+  make distclean
+fi
+
 echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
-cd "$PACKAGES/iconv/libiconv-1.13.1" && \
+
 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
 
@@ -176 +208 @@
 
 if test ! -z "$COMPAT32BITFLAGS" ; then
-  echo "Generating native 64-bit version as well"
+  echo "Generating native 64-bit version of iconv"
   # used in apache web server, for example
 
-  # dist clean
-  cd "$PACKAGES/iconv/libiconv-1.13.1" 
+  # distclean
   echo make distclean && \
   make distclean
 
   # configure
-  echo ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64" $HOSTTARGETFLAGS $ENVIRONMENT
+  echo ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
   ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" --libdir="$PACKAGES/iconv/lib64" $HOSTTARGETFLAGS $ENVIRONMENT
 
@@ -193 +224 @@
 
   # make install
+  echo make install $ENVIRONMENT
   make install $ENVIRONMENT
-  make install $ENVIRONMENT
-
-fi
+fi
+
+echo make distclean && \
+make distclean
 
 #./configure $CACHE_FILE --prefix="$PACKAGES/iconv" --disable-shared $HOSTTARGETFLAGS&&