diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-05 23:02:47 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-06 00:07:17 +0100 |
| commit | d8eea3d2bce9c9e834210237090947de4600cfe8 (patch) | |
| tree | 5572df7de406f06b31f6be7d68526f69208442b1 /configure.ac | |
| parent | 69cfce50dbb2000c5f5d98f0f364fe324004bf99 (diff) | |
| download | guix-d8eea3d2bce9c9e834210237090947de4600cfe8.tar.gz guix-d8eea3d2bce9c9e834210237090947de4600cfe8.tar.xz | |
build: Capture configure-time settings in (guix config).
* configure.ac: Compute and substitute `guix_localstatedir'.
* m4/guix.m4: Substitute `guix_system'.
* guix/config.scm.in (%store-directory, %store-directory, %system): New
variables.
* guix/store.scm (%nix-state-dir): Remove.
(%default-socket-path): Use %STATE-DIRECTORY as the default.
(%store-prefix): Use %STORE-DIRECTORY as the default.
* guix/utils.scm (%current-system): Default to %SYSTEM.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 5509735d8e..fdc1931b3c 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,11 @@ AC_ARG_WITH(store-dir, [storedir="/nix/store"]) AC_SUBST(storedir) +# 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"`" +AC_SUBST([guix_localstatedir]) + PKG_CHECK_MODULES([GUILE], [guile-2.0]) AC_PATH_PROG([GUILE], [guile]) AC_PATH_PROG([GUILD], [guild]) |