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

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

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2012-12-13 00:26:41 +01:00
parent 8a9451c89e
commit 3a61f8017a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config-daemon.ac
View file

@ -1,10 +1,5 @@
dnl -*- Autoconf -*- fragment for the C++ daemon. 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_CHECKING([whether to build daemon])
AC_MSG_RESULT([$guix_build_daemon]) AC_MSG_RESULT([$guix_build_daemon])

7
configure.ac
View file

@ -30,6 +30,11 @@ AC_ARG_WITH(store-dir,
[storedir="/nix/store"]) [storedir="/nix/store"])
AC_SUBST(storedir) 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 # Prepare a version of $localstatedir that does not contain references
# to shell variables. # to shell variables.
guix_localstatedir="`eval echo $localstatedir | sed -e "s|NONE|/usr/local|g"`" 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_INSTANTIATE], [nix-instantiate])
AC_PATH_PROG([NIX_HASH], [nix-hash]) 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'.]) AC_MSG_ERROR([Nix programs not found; please install Nix or use `--with-nix-prefix'.])
fi fi