Browse Source

build: When `--enable-daemon', don't error out when Nix programs are missing.

* config-daemon.ac: Move AC_ARG_ENABLE([daemon]...)...
* configure.ac: ... here.
  When Nix programs are not found, error out only when
  $guix_build_daemon is no.
gn-latest-20200428
Ludovic Courtès 7 years ago
parent
commit
3a61f8017a
2 changed files with 6 additions and 6 deletions
  1. +0
    -5
      config-daemon.ac
  2. +6
    -1
      configure.ac

+ 0
- 5
config-daemon.ac View File

@@ -1,10 +1,5 @@
dnl -*- Autoconf -*- fragment for the C++ daemon.

AC_ARG_ENABLE([daemon],
[AS_HELP_STRING([--enable-daemon], [build the Nix daemon (C++)])],
[guix_build_daemon="$enableval"],
[guix_build_daemon="no"])

AC_MSG_CHECKING([whether to build daemon])
AC_MSG_RESULT([$guix_build_daemon])



+ 6
- 1
configure.ac View File

@@ -30,6 +30,11 @@ AC_ARG_WITH(store-dir,
[storedir="/nix/store"])
AC_SUBST(storedir)

AC_ARG_ENABLE([daemon],
[AS_HELP_STRING([--enable-daemon], [build the Nix daemon (C++)])],
[guix_build_daemon="$enableval"],
[guix_build_daemon="no"])

# Prepare a version of $localstatedir that does not contain references
# to shell variables.
guix_localstatedir="`eval echo $localstatedir | sed -e "s|NONE|/usr/local|g"`"
@@ -56,7 +61,7 @@ AC_ARG_WITH([nix-prefix],

AC_PATH_PROG([NIX_INSTANTIATE], [nix-instantiate])
AC_PATH_PROG([NIX_HASH], [nix-hash])
if test "x$NIX_INSTANTIATE$NIX_HASH" = "x"; then
if test "x$guix_build_daemon$NIX_INSTANTIATE$NIX_HASH" = "xno"; then
AC_MSG_ERROR([Nix programs not found; please install Nix or use `--with-nix-prefix'.])
fi



Loading…
Cancel
Save