2012-06-13 16:01:25 +00:00
|
|
|
# -*- Autoconf -*-
|
|
|
|
# Process this file with autoconf to produce a configure script.
|
|
|
|
|
|
|
|
AC_PREREQ(2.68)
|
2017-05-04 19:54:13 +00:00
|
|
|
AC_INIT([GNU Guix],
|
|
|
|
[m4_esyscmd([build-aux/git-version-gen .tarball-version])],
|
|
|
|
[bug-guix@gnu.org], [guix],
|
|
|
|
[https://www.gnu.org/software/guix/])
|
2012-06-13 16:01:25 +00:00
|
|
|
AC_CONFIG_AUX_DIR([build-aux])
|
|
|
|
|
2017-10-06 17:27:20 +00:00
|
|
|
AM_INIT_AUTOMAKE([1.14 gnu silent-rules subdir-objects \
|
2015-04-14 21:19:29 +00:00
|
|
|
color-tests parallel-tests -Woverride -Wno-portability])
|
2012-06-13 16:01:25 +00:00
|
|
|
|
2015-04-08 08:42:48 +00:00
|
|
|
# Enable silent rules by default.
|
|
|
|
AM_SILENT_RULES([yes])
|
|
|
|
|
2012-06-13 16:01:25 +00:00
|
|
|
AC_CONFIG_SRCDIR([guix.scm])
|
|
|
|
AC_CONFIG_MACRO_DIR([m4])
|
|
|
|
|
2012-12-03 22:04:47 +00:00
|
|
|
dnl For the C++ code. This must be used early.
|
|
|
|
AC_USE_SYSTEM_EXTENSIONS
|
|
|
|
|
2012-06-29 20:22:48 +00:00
|
|
|
AM_GNU_GETTEXT([external])
|
2014-07-22 19:35:07 +00:00
|
|
|
AM_GNU_GETTEXT_VERSION([0.18.1])
|
2012-06-29 20:22:48 +00:00
|
|
|
|
2012-12-03 22:04:47 +00:00
|
|
|
GUIX_SYSTEM_TYPE
|
2013-07-05 19:54:52 +00:00
|
|
|
GUIX_ASSERT_SUPPORTED_SYSTEM
|
2012-12-03 22:04:47 +00:00
|
|
|
|
2020-04-23 21:20:26 +00:00
|
|
|
AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = "xyes"])
|
|
|
|
|
2012-12-03 22:04:47 +00:00
|
|
|
AC_ARG_WITH(store-dir,
|
|
|
|
AC_HELP_STRING([--with-store-dir=PATH],
|
2014-03-09 21:09:12 +00:00
|
|
|
[file name of the store (defaults to /gnu/store)]),
|
2012-12-03 22:04:47 +00:00
|
|
|
[storedir="$withval"],
|
2014-03-09 21:09:12 +00:00
|
|
|
[storedir="/gnu/store"])
|
2012-12-03 22:04:47 +00:00
|
|
|
AC_SUBST(storedir)
|
2012-06-15 08:11:29 +00:00
|
|
|
|
2015-04-09 21:44:14 +00:00
|
|
|
AC_ARG_WITH([bash-completion-dir],
|
|
|
|
AC_HELP_STRING([--with-bash-completion-dir=DIR],
|
|
|
|
[name of the Bash completion directory]),
|
|
|
|
[bashcompletiondir="$withval"],
|
|
|
|
[bashcompletiondir='${sysconfdir}/bash_completion.d'])
|
|
|
|
AC_SUBST([bashcompletiondir])
|
|
|
|
|
2016-09-07 05:57:38 +00:00
|
|
|
AC_ARG_WITH([zsh-completion-dir],
|
|
|
|
AC_HELP_STRING([--with-zsh-completion-dir=DIR],
|
|
|
|
[name of the Zsh completion directory]),
|
|
|
|
[zshcompletiondir="$withval"],
|
|
|
|
[zshcompletiondir='${datadir}/zsh/site-functions'])
|
|
|
|
AC_SUBST([zshcompletiondir])
|
|
|
|
|
2018-01-14 17:23:00 +00:00
|
|
|
AC_ARG_WITH([fish-completion-dir],
|
|
|
|
AC_HELP_STRING([--with-fish-completion-dir=DIR],
|
|
|
|
[name of the Fish completion directory]),
|
|
|
|
[fishcompletiondir="$withval"],
|
|
|
|
[fishcompletiondir='${datadir}/fish/vendor_completions.d'])
|
|
|
|
AC_SUBST([fishcompletiondir])
|
|
|
|
|
2018-01-25 14:21:07 +00:00
|
|
|
AC_ARG_WITH([selinux-policy-dir],
|
|
|
|
AC_HELP_STRING([--with-selinux-policy-dir=DIR],
|
|
|
|
[name of the SELinux policy directory]),
|
|
|
|
[selinux_policydir="$withval"],
|
|
|
|
[selinux_policydir='${datadir}/selinux/'])
|
|
|
|
AC_SUBST([selinux_policydir])
|
|
|
|
|
2014-03-09 21:09:12 +00:00
|
|
|
dnl Better be verbose.
|
|
|
|
AC_MSG_CHECKING([for the store directory])
|
|
|
|
AC_MSG_RESULT([$storedir])
|
|
|
|
|
2012-12-12 23:26:41 +00:00
|
|
|
AC_ARG_ENABLE([daemon],
|
2016-11-06 17:01:54 +00:00
|
|
|
[AS_HELP_STRING([--disable-daemon], [do not build the Nix daemon (C++)])],
|
2012-12-12 23:26:41 +00:00
|
|
|
[guix_build_daemon="$enableval"],
|
2012-12-12 23:27:27 +00:00
|
|
|
[guix_build_daemon="yes"])
|
2012-12-12 23:26:41 +00:00
|
|
|
|
2013-12-29 14:52:50 +00:00
|
|
|
# Prepare a version of $localstatedir & co. that does not contain references
|
2012-12-05 22:02:47 +00:00
|
|
|
# to shell variables.
|
2014-01-11 16:11:14 +00:00
|
|
|
guix_prefix="`eval echo $prefix | sed -e"s|NONE|/usr/local|g"`"
|
|
|
|
guix_localstatedir="`eval echo $localstatedir | sed -e "s|NONE|$guix_prefix|g"`"
|
|
|
|
guix_sysconfdir="`eval echo $sysconfdir | sed -e "s|NONE|$guix_prefix|g"`"
|
|
|
|
guix_sbindir="`eval echo $sbindir | sed -e "s|NONE|$guix_prefix|g"`"
|
2012-12-05 22:02:47 +00:00
|
|
|
AC_SUBST([guix_localstatedir])
|
2013-12-29 14:52:50 +00:00
|
|
|
AC_SUBST([guix_sysconfdir])
|
2014-01-11 16:11:14 +00:00
|
|
|
AC_SUBST([guix_sbindir])
|
2012-12-05 22:02:47 +00:00
|
|
|
|
2016-01-12 15:37:45 +00:00
|
|
|
GUIX_CHECK_FILE_NAME_LIMITS([can_run_tests])
|
|
|
|
AM_CONDITIONAL([CAN_RUN_TESTS], [test "x$can_run_tests" = "xyes"])
|
2015-02-24 22:05:45 +00:00
|
|
|
|
2015-03-19 15:09:34 +00:00
|
|
|
dnl We require pkg.m4 (from pkg-config) and guile.m4 (from Guile.)
|
|
|
|
dnl Make sure they are available.
|
2013-11-23 15:24:52 +00:00
|
|
|
m4_pattern_forbid([PKG_CHECK_MODULES])
|
2015-03-19 15:09:34 +00:00
|
|
|
m4_pattern_forbid([GUILE_MODULE_AVAILABLE])
|
2018-10-12 13:09:56 +00:00
|
|
|
m4_pattern_forbid([^GUILE_P])
|
|
|
|
m4_pattern_allow([^GUILE_PKG_ERRORS])
|
2018-10-12 13:04:44 +00:00
|
|
|
m4_pattern_forbid([^GUIX_])
|
2013-11-23 15:24:52 +00:00
|
|
|
|
2017-03-15 14:18:39 +00:00
|
|
|
dnl Search for 'guile' and 'guild'. This macro defines
|
|
|
|
dnl 'GUILE_EFFECTIVE_VERSION'.
|
2020-01-17 16:14:20 +00:00
|
|
|
GUILE_PKG([3.0 2.2])
|
2016-09-20 14:36:53 +00:00
|
|
|
GUILE_PROGS
|
2012-08-26 11:37:37 +00:00
|
|
|
if test "x$GUILD" = "x"; then
|
2020-03-11 15:13:03 +00:00
|
|
|
AC_MSG_ERROR(['guild' binary not found; please check your Guile installation.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "x$GUILE_EFFECTIVE_VERSION" = "x2.2"; then
|
|
|
|
PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.3])
|
2012-08-26 11:37:37 +00:00
|
|
|
fi
|
2012-06-13 16:01:25 +00:00
|
|
|
|
2017-03-20 21:13:27 +00:00
|
|
|
dnl Installation directories for .scm and .go files.
|
2016-10-25 12:00:33 +00:00
|
|
|
guilemoduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION"
|
2017-03-20 21:13:27 +00:00
|
|
|
guileobjectdir="${libdir}/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"
|
2016-10-25 12:00:33 +00:00
|
|
|
AC_SUBST([guilemoduledir])
|
2017-03-20 21:13:27 +00:00
|
|
|
AC_SUBST([guileobjectdir])
|
2016-10-25 12:00:33 +00:00
|
|
|
|
2017-03-11 23:37:33 +00:00
|
|
|
dnl The GnuTLS bindings are necessary for substitutes over HTTPS and for 'guix
|
|
|
|
dnl pull', among other things.
|
|
|
|
GUILE_MODULE_AVAILABLE([have_gnutls], [(gnutls)])
|
|
|
|
if test "x$have_gnutls" != "xyes"; then
|
|
|
|
AC_MSG_ERROR([The Guile bindings of GnuTLS are missing; please install them.])
|
|
|
|
fi
|
|
|
|
|
2017-07-28 15:47:19 +00:00
|
|
|
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
|
|
|
|
|
2018-12-02 02:46:22 +00:00
|
|
|
dnl Check for Guile-JSON.
|
2019-07-21 21:05:54 +00:00
|
|
|
GUIX_CHECK_GUILE_JSON
|
|
|
|
if test "x$guix_cv_have_recent_guile_json" != "xyes"; then
|
2018-12-02 02:46:22 +00:00
|
|
|
AC_MSG_ERROR([Guile-JSON is missing; please install it.])
|
|
|
|
fi
|
2014-09-27 14:16:23 +00:00
|
|
|
|
2018-05-27 13:43:52 +00:00
|
|
|
dnl Guile-Sqlite3 is used by the (guix store ...) modules.
|
|
|
|
GUIX_CHECK_GUILE_SQLITE3
|
2018-06-04 20:31:48 +00:00
|
|
|
if test "x$guix_cv_have_recent_guile_sqlite3" != "xyes"; then
|
|
|
|
AC_MSG_ERROR([A recent Guile-SQLite3 could not be found; please install it.])
|
|
|
|
fi
|
2018-05-27 13:43:52 +00:00
|
|
|
|
2020-05-27 12:28:00 +00:00
|
|
|
GUIX_CHECK_GUILE_GCRYPT
|
|
|
|
if test "x$guix_cv_have_recent_guile_gcrypt" != "xyes"; then
|
|
|
|
AC_MSG_ERROR([A recent Guile-Gcrypt could not be found; please install it.])
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
fi
|
|
|
|
|
Use "guile-zlib" and "guile-lzlib" instead of (guix config).
* Makefile.am (MODULES): Remove guix/zlib.scm and guix/lzlib.scm,
(SCM_TESTS): remove tests/zlib.scm, tests/lzlib.scm.
* build-aux/build-self.scm (make-config.scm): Remove unused %libz variable.
* configure.ac: Remove LIBZ and LIBLZ variables and check instead for
Guile-zlib and Guile-lzlib.
* doc/guix.texi ("Requirements"): Remove zlib requirement and add Guile-zlib
and Guile-lzlib instead.
* gnu/packages/package-management.scm (guix)[native-inputs]: Add "guile-zlib"
and "guile-lzlib",
[inputs]: remove "zlib" and "lzlib",
[propagated-inputs]: ditto,
[arguments]: add "guile-zlib" and "guile-lzlib" to Guile load path.
* guix/config.scm.in (%libz, %liblz): Remove them.
* guix/lzlib.scm: Remove it.
* guix/man-db.scm: Use (zlib) instead of (guix zlib).
* guix/profiles.scm (manual-database): Do not stub (guix config) in imported
modules list, instead add "guile-zlib" to the extension list.
* guix/scripts/publish.scm: Use (zlib) instead of (guix zlib) and (lzlib)
instead of (guix lzlib),
(string->compression-type, effective-compression): do not check for zlib and
lzlib availability.
* guix/scripts/substitute.scm (%compression-methods): Do not check for lzlib
availability.
* guix/self.scm (specification->package): Add "guile-zlib" and "guile-lzlib"
and remove "zlib" and "lzlib",
(compiled-guix): remove "zlib" and "lzlib" arguments and add guile-zlib and
guile-lzlib to the dependencies, also do not pass "zlib" and "lzlib" to
"make-config.scm" procedure,
(make-config.scm): remove "zlib" and "lzlib" arguments as well as %libz and
%liblz variables.
* guix/utils.scm (lzip-port): Use (lzlib) instead of (guix lzlib) and do not
check for lzlib availability.
* guix/zlib.scm: Remove it.
* m4/guix.m4 (GUIX_LIBZ_LIBDIR, GUIX_LIBLZ_FILE_NAME): Remove them.
* tests/lzlib.scm: Use (zlib) instead of (guix zlib) and (lzlib)
instead of (guix lzlib), and do not check for zlib and lzlib availability.
* tests/publish.scm: Ditto.
* tests/substitute.scm: Do not check for lzlib availability.
* tests/utils.scm: Ditto.
* tests/zlib.scm: Remove it.
2020-07-27 14:36:39 +00:00
|
|
|
dnl Check for Guile-zlib.
|
|
|
|
GUILE_MODULE_AVAILABLE([have_guile_zlib], [(zlib)])
|
|
|
|
if test "x$have_guile_zlib" != "xyes"; then
|
|
|
|
AC_MSG_ERROR([Guile-zlib is missing; please install it.])
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl Check for Guile-lzlib.
|
|
|
|
GUILE_MODULE_AVAILABLE([have_guile_lzlib], [(lzlib)])
|
|
|
|
if test "x$have_guile_lzlib" != "xyes"; then
|
|
|
|
AC_MSG_ERROR([Guile-lzlib is missing; please install it.])
|
|
|
|
fi
|
|
|
|
|
2018-11-16 11:43:55 +00:00
|
|
|
dnl Guile-newt is used by the graphical installer.
|
|
|
|
GUILE_MODULE_AVAILABLE([have_guile_newt], [(newt)])
|
2018-11-23 01:56:49 +00:00
|
|
|
|
|
|
|
AC_ARG_ENABLE([installer],
|
|
|
|
AS_HELP_STRING([--enable-installer], [Build the graphical installer sources.]))
|
|
|
|
|
|
|
|
AS_IF([test "x$enable_installer" = "xyes"], [
|
2018-11-16 11:43:55 +00:00
|
|
|
if test "x$have_guile_newt" != "xyes"; then
|
|
|
|
AC_MSG_ERROR([Guile-newt could not be found; please install it.])
|
|
|
|
fi
|
2018-11-23 01:56:49 +00:00
|
|
|
])
|
|
|
|
|
|
|
|
AM_CONDITIONAL([ENABLE_INSTALLER],
|
|
|
|
[test "x$enable_installer" = "xyes"])
|
2018-11-16 11:43:55 +00:00
|
|
|
|
2013-05-09 20:26:51 +00:00
|
|
|
dnl Make sure we have a full-fledged Guile.
|
|
|
|
GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads])
|
|
|
|
|
2018-01-17 16:14:24 +00:00
|
|
|
AC_PROG_SED
|
|
|
|
|
2015-12-09 18:22:08 +00:00
|
|
|
dnl Decompressors, for use by the substituter and other modules.
|
|
|
|
AC_PATH_PROG([GZIP], [gzip])
|
|
|
|
AC_PATH_PROG([BZIP2], [bzip2])
|
|
|
|
AC_PATH_PROG([XZ], [xz])
|
|
|
|
AC_SUBST([GZIP])
|
|
|
|
AC_SUBST([BZIP2])
|
|
|
|
AC_SUBST([XZ])
|
|
|
|
|
2012-06-13 16:01:25 +00:00
|
|
|
AC_ARG_WITH([nix-prefix],
|
2013-12-29 18:53:05 +00:00
|
|
|
[AS_HELP_STRING([--with-nix-prefix=DIR],
|
|
|
|
[search for Nix in DIR (for testing purposes and '--disable-daemon' builds)])],
|
2012-06-13 16:01:25 +00:00
|
|
|
[case "$withval" in
|
|
|
|
yes|no) ;;
|
2012-08-14 16:50:36 +00:00
|
|
|
*)
|
|
|
|
NIX_PREFIX="$withval"
|
|
|
|
PATH="$NIX_PREFIX/bin:$PATH"; export PATH
|
|
|
|
AC_SUBST([NIX_PREFIX])
|
|
|
|
;;
|
2012-06-13 16:01:25 +00:00
|
|
|
esac],
|
|
|
|
[])
|
|
|
|
|
|
|
|
AC_ARG_WITH([nixpkgs],
|
2013-12-29 18:53:05 +00:00
|
|
|
[AS_HELP_STRING([--with-nixpkgs=DIR],
|
|
|
|
[search for Nixpkgs in DIR (for testing purposes only)])],
|
2012-06-13 16:01:25 +00:00
|
|
|
[case "$withval" in
|
|
|
|
yes|no) AC_MSG_ERROR([Please use `--with-nixpkgs=DIR'.]);;
|
|
|
|
*) NIXPKGS="$withval";;
|
|
|
|
esac],
|
|
|
|
[])
|
|
|
|
|
2012-11-03 20:11:02 +00:00
|
|
|
AC_MSG_CHECKING([for Nixpkgs source tree])
|
2012-06-13 16:01:25 +00:00
|
|
|
if test -f "$NIXPKGS/default.nix"; then
|
|
|
|
AC_MSG_RESULT([$NIXPKGS])
|
|
|
|
AC_SUBST([NIXPKGS])
|
|
|
|
else
|
2012-11-03 20:11:02 +00:00
|
|
|
AC_MSG_RESULT([not found])
|
2012-06-13 16:01:25 +00:00
|
|
|
fi
|
|
|
|
|
2015-10-06 20:09:40 +00:00
|
|
|
LIBGCRYPT_LIBDIR="no"
|
|
|
|
LIBGCRYPT_PREFIX="no"
|
|
|
|
|
2012-08-17 08:41:27 +00:00
|
|
|
AC_ARG_WITH([libgcrypt-prefix],
|
|
|
|
[AS_HELP_STRING([--with-libgcrypt-prefix=DIR], [search for GNU libgcrypt in DIR])],
|
|
|
|
[case "$withval" in
|
|
|
|
yes|no)
|
|
|
|
;;
|
|
|
|
*)
|
2012-11-03 20:43:30 +00:00
|
|
|
LIBGCRYPT_PREFIX="$withval"
|
2014-05-17 13:41:56 +00:00
|
|
|
LIBGCRYPT_LIBDIR="$withval/lib"
|
2012-08-17 08:41:27 +00:00
|
|
|
;;
|
2015-10-06 20:09:40 +00:00
|
|
|
esac])
|
2012-08-17 08:41:27 +00:00
|
|
|
|
2014-05-17 13:41:56 +00:00
|
|
|
AC_ARG_WITH([libgcrypt-libdir],
|
|
|
|
[AS_HELP_STRING([--with-libgcrypt-libdir=DIR],
|
|
|
|
[search for GNU libgcrypt's shared library in DIR])],
|
|
|
|
[case "$withval" in
|
|
|
|
yes|no)
|
|
|
|
LIBGCRYPT_LIBDIR="no"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
LIBGCRYPT_LIBDIR="$withval"
|
|
|
|
;;
|
2015-10-06 20:09:40 +00:00
|
|
|
esac])
|
|
|
|
|
|
|
|
dnl If none of the --with-libgcrypt-* options was used, try to determine the
|
Switch to Guile-Gcrypt.
This removes (guix hash) and (guix pk-crypto), which now live as part of
Guile-Gcrypt (version 0.1.0.)
* guix/gcrypt.scm, guix/hash.scm, guix/pk-crypto.scm,
tests/hash.scm, tests/pk-crypto.scm: Remove.
* configure.ac: Test for Guile-Gcrypt. Remove LIBGCRYPT and
LIBGCRYPT_LIBDIR assignments.
* m4/guix.m4 (GUIX_ASSERT_LIBGCRYPT_USABLE): Remove.
* README: Add Guile-Gcrypt to the dependencies; move libgcrypt as
"required unless --disable-daemon".
* doc/guix.texi (Requirements): Likewise.
* gnu/packages/bash.scm, guix/derivations.scm, guix/docker.scm,
guix/git.scm, guix/http-client.scm, guix/import/cpan.scm,
guix/import/cran.scm, guix/import/crate.scm, guix/import/elpa.scm,
guix/import/gnu.scm, guix/import/hackage.scm,
guix/import/texlive.scm, guix/import/utils.scm, guix/nar.scm,
guix/pki.scm, guix/scripts/archive.scm,
guix/scripts/authenticate.scm, guix/scripts/download.scm,
guix/scripts/hash.scm, guix/scripts/pack.scm,
guix/scripts/publish.scm, guix/scripts/refresh.scm,
guix/scripts/substitute.scm, guix/store.scm,
guix/store/deduplication.scm, guix/tests.scm, tests/base32.scm,
tests/builders.scm, tests/challenge.scm, tests/cpan.scm,
tests/crate.scm, tests/derivations.scm, tests/gem.scm,
tests/nar.scm, tests/opam.scm, tests/pki.scm,
tests/publish.scm, tests/pypi.scm, tests/store-deduplication.scm,
tests/store.scm, tests/substitute.scm: Adjust imports.
* gnu/system/vm.scm: Likewise.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(expression->derivation-in-linux-vm)[config]: Remove.
(iso9660-image)[config]: Remove.
(qemu-image)[config]: Remove.
(system-docker-image)[config]: Remove.
* guix/scripts/pack.scm: Adjust imports.
(guile-sqlite3&co): Rename to...
(gcrypt-sqlite3&co): ... this. Add GUILE-GCRYPT.
(self-contained-tarball)[build]: Call 'make-config.scm' without
#:libgcrypt argument.
(squashfs-image)[libgcrypt]: Remove.
[build]: Call 'make-config.scm' without #:libgcrypt.
(docker-image)[config, json]: Remove.
[build]: Add GUILE-GCRYPT to the extensions Remove (guix config) from
the imported modules.
* guix/self.scm (specification->package): Remove "libgcrypt", add
"guile-gcrypt".
(compiled-guix): Remove #:libgcrypt.
[guile-gcrypt]: New variable.
[dependencies]: Add it.
[*core-modules*]: Remove #:libgcrypt from 'make-config.scm' call.
Add #:extensions.
[*config*]: Remove #:libgcrypt from 'make-config.scm' call.
(%dependency-variables): Remove %libgcrypt.
(make-config.scm): Remove #:libgcrypt.
* build-aux/build-self.scm (guile-gcrypt): New variable.
(make-config.scm): Remove #:libgcrypt.
(build-program)[fake-gcrypt-hash]: New variable.
Add (gcrypt hash) to the imported modules. Adjust load path
assignments.
* gnu/packages/package-management.scm (guix)[propagated-inputs]: Add
GUILE-GCRYPT.
[arguments]: In 'wrap-program' phase, add GUILE-GCRYPT to the search
path.
2018-08-31 15:07:07 +00:00
|
|
|
dnl the library directory.
|
2015-10-06 20:09:40 +00:00
|
|
|
case "x$LIBGCRYPT_PREFIX$LIBGCRYPT_LIBDIR" in
|
|
|
|
xnono)
|
|
|
|
GUIX_LIBGCRYPT_LIBDIR([LIBGCRYPT_LIBDIR])
|
|
|
|
;;
|
|
|
|
esac
|
2014-05-17 13:41:56 +00:00
|
|
|
|
2012-11-03 20:43:30 +00:00
|
|
|
AC_SUBST([LIBGCRYPT_PREFIX])
|
2014-05-17 13:41:56 +00:00
|
|
|
AC_SUBST([LIBGCRYPT_LIBDIR])
|
2012-11-03 20:43:30 +00:00
|
|
|
|
2016-12-30 22:22:27 +00:00
|
|
|
dnl Check for Guile-SSH, for the (guix ssh) module.
|
|
|
|
GUIX_CHECK_GUILE_SSH
|
|
|
|
AM_CONDITIONAL([HAVE_GUILE_SSH],
|
|
|
|
[test "x$guix_cv_have_recent_guile_ssh" = "xyes"])
|
|
|
|
|
2012-12-03 22:04:47 +00:00
|
|
|
AC_CACHE_SAVE
|
|
|
|
|
|
|
|
m4_include([config-daemon.ac])
|
2012-08-17 08:41:27 +00:00
|
|
|
|
2013-08-29 19:50:13 +00:00
|
|
|
dnl `dot' (from the Graphviz package) is only needed for maintainers.
|
2015-06-10 11:39:54 +00:00
|
|
|
dnl See `Building from Git' in the manual for more info.
|
2013-08-29 19:50:13 +00:00
|
|
|
AM_MISSING_PROG([DOT], [dot])
|
|
|
|
|
2015-06-01 20:37:54 +00:00
|
|
|
dnl Manual pages.
|
|
|
|
AM_MISSING_PROG([HELP2MAN], [help2man])
|
|
|
|
|
2018-03-02 22:05:28 +00:00
|
|
|
dnl Documentation translation.
|
|
|
|
AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate])
|
|
|
|
AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo])
|
|
|
|
|
2017-02-07 13:53:24 +00:00
|
|
|
case "$storedir" in
|
|
|
|
/gnu/store)
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
AC_MSG_WARN([Using a store directory other than '/gnu/store' will prevent you])
|
|
|
|
AC_MSG_WARN([from downloading substitutes from gnu.org.])
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2012-06-30 22:56:24 +00:00
|
|
|
AC_CONFIG_FILES([Makefile
|
2014-06-13 14:15:18 +00:00
|
|
|
po/guix/Makefile.in
|
2014-06-13 15:30:40 +00:00
|
|
|
po/packages/Makefile.in
|
2018-01-25 14:21:07 +00:00
|
|
|
etc/guix-daemon.cil
|
|
|
|
guix/config.scm])
|
2013-02-06 15:30:15 +00:00
|
|
|
|
2020-06-16 09:31:54 +00:00
|
|
|
AC_CONFIG_FILES([etc/committer.scm], [chmod +x etc/committer.scm])
|
2016-04-03 16:18:46 +00:00
|
|
|
AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
|
|
|
|
AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
|
|
|
|
[chmod +x pre-inst-env])
|
2012-06-13 16:01:25 +00:00
|
|
|
|
|
|
|
AC_OUTPUT
|