[kaffe] CVS kaffe (dalibor): Really use autoreconf for libltdl

[Kaffe CVS]

PatchSet 4700 
Date: 2004/04/27 09:27:13
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Really use autoreconf for libltdl

2004-04-27  Dalibor Topic  <robilad at kaffe.org>

        * developers/autogen.sh: Really use autoreconf
        this time.

Members: 
	ChangeLog:1.2276->1.2277 
	developers/autogen.sh:1.36->1.37 
	libltdl/install-sh:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2276 kaffe/ChangeLog:1.2277
--- kaffe/ChangeLog:1.2276	Tue Apr 27 08:21:28 2004
+++ kaffe/ChangeLog	Tue Apr 27 09:27:13 2004
@@ -1,3 +1,8 @@
+2004-04-27  Dalibor Topic  <robilad at kaffe.org>
+
+	* developers/autogen.sh: Really use autoreconf 
+	this time.
+
 2004-04-27  Ean Schuessler <ean at brainfood.com>
 
 	* kaffe/scripts/nm2as.awk:
Index: kaffe/developers/autogen.sh
diff -u kaffe/developers/autogen.sh:1.36 kaffe/developers/autogen.sh:1.37
--- kaffe/developers/autogen.sh:1.36	Mon Apr 26 16:47:53 2004
+++ kaffe/developers/autogen.sh	Tue Apr 27 09:27:16 2004
@@ -128,14 +128,11 @@
  cd ..
 )
 
-( 
- cd libltdl 	 
+(
+ cd libltdl
  # Need to regenerate things because patching 	 
  # screws up timestamps 	 
- aclocal -I . 	 
- automake --add-missing --force-missing --copy -Wall 	 
- touch config-h.in 	 
- autoconf -Wall 	 
- patch < ../developers/patch-config.sub-superh.diff 	 
+ autoreconf -i -Wall
+ patch < ../developers/patch-config.sub-superh.diff
 ) 	 
  
Index: kaffe/libltdl/install-sh
diff -u kaffe/libltdl/install-sh:1.4 kaffe/libltdl/install-sh:1.5
--- kaffe/libltdl/install-sh:1.4	Mon Apr 26 16:48:16 2004
+++ kaffe/libltdl/install-sh	Tue Apr 27 09:27:16 2004
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2004-04-01.17
+scriptversion=2004-02-15.20
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -280,35 +280,26 @@
       && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
       && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
 
+    # Now remove or move aside any old file at destination location.  We
+    # try this two ways since rm can't unlink itself on some systems and
+    # the destination file might be busy for other reasons.  In this case,
+    # the final cleanup might fail but the new file should still install
+    # successfully.
+    {
+      if test -f "$dstdir/$dstfile"; then
+        $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+        || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+        || {
+	  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+	  (exit 1); exit
+        }
+      else
+        :
+      fi
+    } &&
+
     # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
+    $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
   fi || { (exit 1); exit; }
 done