Reverting autotools compilation for backwards compatibility with Auto…

…conf 2.59 (issue #76).

git-svn-id: http://svn.gridway.org/gridway/trunk@215 9b4b2aa8-92f0-458a-8103-c3834d721760

bootstrap.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 # --------------------------------------------------------------------------
-# Copyright 2002-2006 GridWay Team, Distributed Systems Architecture
+# Copyright 2002-2010 GridWay Team, Distributed Systems Architecture
 # Group, Universidad Complutense de Madrid
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -17,49 +17,44 @@
 # --------------------------------------------------------------------------
 
 clean_bt(){
-    make clean > /dev/null 2>&1 
-	find -name .dirstamp -delete > /dev/null 2>&1 
+	make clean > /dev/null 2>&1 
+	find -name .dirstamp -exec rm {} \;
 	rm -rf `find -name .libs` > /dev/null 2>&1 
 	rm -rf autom4te.cache > /dev/null 2>&1 
 	rm Makefile > /dev/null 2>&1 	
-	rm doc/Makefile > /dev/null 2>&1 
-	rm doc/docbook/Makefile > /dev/null 2>&1 
 	rm src/Makefile > /dev/null 2>&1 
 	rm autoscan.log config.status libtool configure.scan config.log > /dev/null 2>&1 
-    rm makefile-header gpt_build_temp.sh> /dev/null 2>&1 
-    rm src/drmaa/drmaa.jar > /dev/null 2>&1 
+	rm makefile-header gpt_build_temp.sh> /dev/null 2>&1 
+	rm src/drmaa/drmaa.jar > /dev/null 2>&1 
 }
 
 clean_auto()
 {
 	rm config/compile config/config.guess config/config.sub > /dev/null 2>&1
 	rm config/install-sh config/ltmain.sh config/missing config/ylwrap > /dev/null 2>&1 
 	rm Makefile.in > /dev/null 2>&1 	
-	rm doc/Makefile.in > /dev/null 2>&1 	
-	rm doc/docbook/Makefile.in	> /dev/null 2>&1 	
 	rm src/Makefile.in > /dev/null 2>&1 	
 	rm aclocal.m4 configure > /dev/null 2>&1
-    rm configure > /dev/null 2>&1 	
+	rm configure > /dev/null 2>&1 	
 }
 
 if [ "x$1" = "xclean" ] ; then
-    clean_bt
+	clean_bt
 	exit 0 
 fi
 
 if [ "x$1" = "xclean_auto" ] ; then
-    clean_bt
-    clean_auto
+	clean_bt
+	clean_auto
 	exit 0 
 fi
 
-if [ ! -d config ] ; then
-    mkdir config
-    autoscan
-fi    
+if [ ! -d config ]; then 
+	mkdir config
+fi
 
-libtoolize --force 
-aclocal
 autoscan
+aclocal
+libtoolize --copy --force
 automake -i --foreign --copy --add-missing
-autoconf 
+autoconf

config/compile

@@ -1,10 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2004-09-10.20
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,7 +17,8 @@ scriptversion=2009-04-28.21; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -47,11 +47,11 @@ right script to run: please start by reading the file `INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
-    exit $?
+    exit 0
     ;;
   -v | --v*)
     echo "compile $scriptversion"
-    exit $?
+    exit 0
     ;;
 esac
 
@@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then
 fi
 
 # Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# Note: use `[/.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
 while true; do
   if mkdir "$lockdir" >/dev/null 2>&1; then
     break
@@ -125,8 +125,6 @@ ret=$?
 
 if test -f "$cofile"; then
   mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"
@@ -138,6 +136,5 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
 # End: