From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbCA5-00074z-Vc for guix-patches@gnu.org; Fri, 28 Jul 2017 16:47:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dbCA2-0000it-Bp for guix-patches@gnu.org; Fri, 28 Jul 2017 16:47:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57717) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dbCA2-0000in-9N for guix-patches@gnu.org; Fri, 28 Jul 2017 16:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dbCA2-0000ly-3s for guix-patches@gnu.org; Fri, 28 Jul 2017 16:47:02 -0400 Subject: [bug#27865] [PATCH 1/3] build: Make Guile-Git a hard requirement. References: <20170728202814.5355-1-ludo@gnu.org> In-Reply-To: <20170728202814.5355-1-ludo@gnu.org> Resent-Message-ID: From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 28 Jul 2017 22:45:37 +0200 Message-Id: <20170728204539.21879-1-ludo@gnu.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27865@debbugs.gnu.org * configure.ac: Error out when (git) is missing. * doc/guix.texi (Requirements): Mention Guile-Git. * Makefile.am (MODULES): Add guix/git.scm unconditionally. --- Makefile.am | 8 +------- configure.ac | 10 ++++++---- doc/guix.texi | 4 ++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5888bc026..0a7e375c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,7 @@ MODULES = \ guix/gnu-maintenance.scm \ guix/upstream.scm \ guix/licenses.scm \ + guix/git.scm \ guix/graph.scm \ guix/cache.scm \ guix/cve.scm \ @@ -207,13 +208,6 @@ MODULES += \ endif HAVE_GUILE_SSH -if HAVE_GUILE_GIT - -MODULES += \ - guix/git.scm - -endif HAVE_GUILE_GIT - if BUILD_DAEMON_OFFLOAD MODULES += \ diff --git a/configure.ac b/configure.ac index 2b75c900c..9ad7598f8 100644 --- a/configure.ac +++ b/configure.ac @@ -100,14 +100,16 @@ if test "x$have_gnutls" != "xyes"; then AC_MSG_ERROR([The Guile bindings of GnuTLS are missing; please install them.]) fi +dnl Check for Guile-Git. +GUILE_MODULE_AVAILABLE([have_guile_git], [(git)]) +if test "x$have_guile_git" != "xyes"; then + AC_MSG_ERROR([Guile-Git is missing; please install it.]) +fi + dnl Guile-JSON is used in various places. GUILE_MODULE_AVAILABLE([have_guile_json], [(json)]) AM_CONDITIONAL([HAVE_GUILE_JSON], [test "x$have_guile_json" = "xyes"]) -dnl Check for Guile-Git. -GUILE_MODULE_AVAILABLE([have_guile_git], [(git)]) -AM_CONDITIONAL([HAVE_GUILE_GIT], [test "x$have_guile_git" = "xyes"]) - dnl Make sure we have a full-fledged Guile. GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads]) diff --git a/doc/guix.texi b/doc/guix.texi index e8c4e0eaf..3a58c389c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -579,6 +579,10 @@ later, including 2.2.x; @uref{http://gnutls.org/, GnuTLS}, specifically its Guile bindings (@pxref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile}); +@item +@c FIXME: Specify a version number once a release has been made. +@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August +2017 or later; @item @url{http://www.gnu.org/software/make/, GNU Make}. @end itemize -- 2.13.3