01/02: gnu: gnome-keyring: Fix build with Automake 1.15.1.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 6915da225fc7fb6b7a2920a40f542f4d91591a5d
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jan 21 01:14:22 2018 +0100

    gnu: gnome-keyring: Fix build with Automake 1.15.1.
    
    * gnu/packages/gnome.scm (gnome-keyring)[arguments] <fix-docbook>:
    Invoke autoconf/aclocal/automake.
---
 gnu/packages/gnome.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ed9e167..8ddc022 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -686,7 +686,15 @@ GNOME Desktop.")
                               "/manpages/docbook.xsl")))
             (setenv "XML_CATALOG_FILES"
                     (string-append (assoc-ref inputs "docbook-xml")
-                                   "/xml/dtd/docbook/catalog.xml")))))))
+                                   "/xml/dtd/docbook/catalog.xml"))
+
+            ;; Rerun the whole thing to avoid version mismatch ("This is
+            ;; Automake 1.15.1, but the definition used by this
+            ;; AM_INIT_AUTOMAKE comes from Automake 1.15.").  Note: we don't
+            ;; use 'autoreconf' because it insists on running 'libtoolize'.
+            (invoke "autoconf")
+            (invoke "aclocal")
+            (invoke "automake" "-ac"))))))
     (inputs
      `(("libgcrypt" ,libgcrypt)
        ("linux-pam" ,linux-pam)