diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-08-19T22·51+0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-08-19T22·51+0300 |
| commit | 458282be5946318086b74dfa5aedb91e6f0477aa (patch) | |
| tree | 7e7c36e7a6ade8866183616604cc9b89064ffe66 | |
| parent | cc7b4386b16885a22ccabb019381539fecb00230 (diff) | |
Drop all references to --disable-init-state
It's all dead code since 2014 (commit 0c6d62cf27b3b2).
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | release-common.nix | 2 | ||||
| -rw-r--r-- | release.nix | 4 |
3 files changed, 1 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 6aeeacdba13d..cc354f6f3028 100644 --- a/configure.ac +++ b/configure.ac @@ -229,12 +229,6 @@ if test "$gc" = yes; then fi -AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state], - [do not initialise DB etc. in `make install']), - init_state=$enableval, init_state=yes) -#AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes") - - # documentation generation switch AC_ARG_ENABLE(doc-gen, AC_HELP_STRING([--disable-doc-gen], [disable documentation generation]), diff --git a/release-common.nix b/release-common.nix index e23967bdbfdc..ace2a4f9b91f 100644 --- a/release-common.nix +++ b/release-common.nix @@ -30,7 +30,7 @@ rec { }); configureFlags = - [ "--disable-init-state" + [ "--enable-gc" ] ++ lib.optionals stdenv.isLinux [ "--with-sandbox-shell=${sh}/bin/busybox" diff --git a/release.nix b/release.nix index 076f1de8dea3..5c3fdf55ca33 100644 --- a/release.nix +++ b/release.nix @@ -189,10 +189,6 @@ let buildInputs = buildDeps; - configureFlags = '' - --disable-init-state - ''; - dontInstall = false; doInstallCheck = true; |