ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make "guile-avahi" dependency optional.

Browse source 
* configure.ac (HAVE_GUILE_AVAHI): New conditional.
* Makefile.am (MODULES): Add "guix/avahi.scm" and "guix/scripts/discover.scm"
if HAVE_GUILE_AVAHI is set.
* guix/scripts/publish.scm: Autoload (guix avahi).
* guix/scripts/substitute.scm: Autoload (guix scripts discovery).
This commit is contained in:
Mathieu Othacehe 2020-11-29 18:05:11 +01:00
parent d9f05c70a6
commit 35a32fefb4
No known key found for this signature in database
GPG key ID: 8354763531769CA6
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -73,7 +73,6 @@ include gnu/local.mk
include po/doc/local.mk
MODULES = \
guix/avahi.scm \
guix/base16.scm \
guix/base32.scm \
guix/base64.scm \
@ -257,7 +256,6 @@ MODULES = \
guix/import/texlive.scm \
guix/import/utils.scm \
guix/scripts.scm \
guix/scripts/discover.scm \
guix/scripts/download.scm \
guix/scripts/perform-download.scm \
guix/scripts/build.scm \
@ -321,6 +319,14 @@ MODULES += \
endif HAVE_GUILE_SSH
if HAVE_GUILE_AVAHI
MODULES += \
guix/avahi.scm \
guix/scripts/discover.scm
endif HAVE_GUILE_AVAHI
if BUILD_DAEMON_OFFLOAD
MODULES += \

5
configure.ac
View file

@ -163,9 +163,8 @@ fi
dnl Check for Guile-Avahi.
GUILE_MODULE_AVAILABLE([have_guile_avahi], [(avahi)])
if test "x$have_guile_avahi" != "xyes"; then
AC_MSG_ERROR([Guile-Avahi is missing; please install it.])
fi
AM_CONDITIONAL([HAVE_GUILE_AVAHI],
[test "x$have_guile_avahi" = "xyes"])
dnl Guile-newt is used by the graphical installer.
GUILE_MODULE_AVAILABLE([have_guile_newt], [(newt)])

2
guix/scripts/publish.scm
View file

@ -42,7 +42,7 @@ (define-module (guix scripts publish)
#:use-module (web server)
#:use-module (web uri)
#:autoload (sxml simple) (sxml->xml)
#:use-module (guix avahi)
#:autoload (guix avahi) (avahi-publish-service-thread)
#:use-module (guix base32)
#:use-module (guix base64)
#:use-module (guix config)

2
guix/scripts/substitute.scm
View file

@ -27,7 +27,7 @@ (define-module (guix scripts substitute)
#:use-module (guix config)
#:use-module (guix records)
#:use-module ((guix serialization) #:select (restore-file))
#:use-module (guix scripts discover)
#:autoload (guix scripts discover) (read-substitute-urls)
#:use-module (gcrypt hash)
#:use-module (guix base32)
#:use-module (guix base64)