* Provide a wrapper around `aclocal' (in Automake) that automatically

adds all directories specified in `ACLOCAL_PATH' to the `aclocal'
  command line as `-I' flags.  Also, it provides a setup hook that
  adds the `.../share/aclocal' directory of every build input to
  `ACLOCAL_PATH'.

* Upgraded Libtool.

* Graphviz requires the X Athena widgets, which in turn requires the X
  miscellaneous utilities library; added those.  However it doesn't
  work yet since libXt is broken.
  

svn path=/nixpkgs/trunk/; revision=888

pkgs/development/tools/misc/libtool/builder.sh

@@ -1,8 +0,0 @@
-buildinputs="$m4 $perl"
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd libtool-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs/development/tools/misc/libtool/default.nix

@@ -1,11 +1,10 @@
 {stdenv, fetchurl, m4, perl}:
+
 stdenv.mkDerivation {
-  name = "libtool-1.5";
-  builder = ./builder.sh;
+  name = "libtool-1.5.2";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.tar.gz;
-    md5 = "0e1844f25e2ad74c3715b5776d017545";
+    url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.2.tar.gz;
+    md5 = "db66ba05502f533ad0cfd84dc0e03bd5";
   };
-  m4 = m4;
-  perl = perl;
+  buildInputs = [m4 perl];
 }