diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-03-05 10:32:55 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-03-05 10:41:18 +0100 |
| commit | 234d7ef567bd98ace98dd784472f19d2ee84f73d (patch) | |
| tree | 6baca77dcaef687cc0d528a020039449d199e18b /config-daemon.ac | |
| parent | ca041ec1a3dc9319ca8ac72bbdd984f0bd36ba48 (diff) | |
build: Always use https substitute URLs.
* config-daemon.ac: Remove GUILE_MODULE_AVAILABLE check for (gnutls).
Diffstat (limited to 'config-daemon.ac')
| -rw-r--r-- | config-daemon.ac | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/config-daemon.ac b/config-daemon.ac index d409ce01171..825b5971dfa 100644 --- a/config-daemon.ac +++ b/config-daemon.ac | |||
| @@ -118,14 +118,10 @@ if test "x$guix_build_daemon" = "xyes"; then | |||
| 118 | dnl Check for <linux/fs.h> (for immutable file support). | 118 | dnl Check for <linux/fs.h> (for immutable file support). |
| 119 | AC_CHECK_HEADERS([linux/fs.h]) | 119 | AC_CHECK_HEADERS([linux/fs.h]) |
| 120 | 120 | ||
| 121 | dnl Determine the appropriate default list of substitute URLs. | 121 | dnl Determine the appropriate default list of substitute URLs (GnuTLS |
| 122 | GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)]) | 122 | dnl is required so we can default to 'https'.) |
| 123 | if test "x$have_gnutls" = "xyes"; then | 123 | guix_substitute_urls="https://mirror.hydra.gnu.org" |
| 124 | guix_substitute_urls="https://mirror.hydra.gnu.org" | 124 | |
| 125 | else | ||
| 126 | AC_MSG_WARN([GnuTLS is missing, substitutes will be downloaded in the clear]) | ||
| 127 | guix_substitute_urls="http://mirror.hydra.gnu.org" | ||
| 128 | fi | ||
| 129 | AC_MSG_CHECKING([for default substitute URLs]) | 125 | AC_MSG_CHECKING([for default substitute URLs]) |
| 130 | AC_MSG_RESULT([$guix_substitute_urls]) | 126 | AC_MSG_RESULT([$guix_substitute_urls]) |
| 131 | 127 | ||