From 36d4d49e694f87aa950101724800171baa74f8b3 Mon Sep 17 00:00:00 2001
From: Nikita Karetnikov <nikita@karetnikov.org>
Date: Thu, 22 Nov 2012 00:50:28 +0000
Subject: distro: Move (distro packages libtool) to (distro packages
 autotools).

* distro/packages/autotools.scm (libtool): Add it.
* distro/packages/libtool.scm: Remove it.
* distro/packages/guile.scm (distro packages guile): Adjust accordingly.
* Makefile.am (MODULES): Adjust accordingly.
---
 distro/packages/autotools.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'distro/packages/autotools.scm')

diff --git a/distro/packages/autotools.scm b/distro/packages/autotools.scm
index 55b052bbae..61e7029cde 100644
--- a/distro/packages/autotools.scm
+++ b/distro/packages/autotools.scm
@@ -1,5 +1,6 @@
 ;;; Guix --- Nix package management from Guile.         -*- coding: utf-8 -*-
 ;;; Copyright (C) 2012 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of Guix.
 ;;;
@@ -17,6 +18,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages autotools)
+  #:use-module (distro)
   #:use-module (distro packages perl)
   #:use-module (distro packages m4)
   #:use-module (guix packages)
@@ -81,3 +83,33 @@ (define-public automake
 `Makefile.in' files compliant with the GNU Coding
 Standards.  Automake requires the use of Autoconf.")
     (license "GPLv2+"))) ; some files are under GPLv3+
+
+(define-public libtool
+  (package
+    (name "libtool")
+    (version "2.4.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "mirror://gnu/libtool/libtool-"
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("m4" ,m4)
+                     ("perl" ,perl)))
+    (arguments
+     ;; TODO: Use `TESTSUITEFLAGS=-jN' for tests.
+     `(#:patches (list (assoc-ref %build-inputs "patch/skip-tests"))))
+    (inputs `(("patch/skip-tests"
+               ,(search-patch "libtool-skip-tests.patch"))))
+    (synopsis "GNU Libtool, a generic library support script")
+    (description
+     "GNU libtool is a generic library support script.  Libtool hides the
+complexity of using shared libraries behind a consistent, portable interface.
+
+To use libtool, add the new generic library building commands to your
+Makefile, Makefile.in, or Makefile.am.  See the documentation for
+details.")
+    (license "GPLv3+")
+    (home-page "http://www.gnu.org/software/libtool/")))
-- 
cgit v1.2.3