[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/67: configure: Disable installer build by default.
From: |
guix-commits |
Subject: |
07/67: configure: Disable installer build by default. |
Date: |
Wed, 16 Jan 2019 19:00:36 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit dde5bac934cdd2496061e2d552e26bd83ec9cb1d
Author: Mathieu Othacehe <address@hidden>
Date: Fri Nov 23 10:56:49 2018 +0900
configure: Disable installer build by default.
Only build installer if "--enable-installer" is passed. In that case only,
the
support for Guile-newt becomes mandatory.
* configure.ac: Add --enable-installer argument. Export ENABLE_INSTALLER
conditional according to the argument value.
* gnu/local.mk (GNU_SYSTEM_MODULES): Remove installer modules and build them
only if ENABLE_INSTALLER is set.
---
configure.ac | 9 +++++++++
gnu/local.mk | 49 ++++++++++++++++++++++++++-----------------------
2 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index 83a9b87..5d70de4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,9 +137,18 @@ fi
dnl Guile-newt is used by the graphical installer.
GUILE_MODULE_AVAILABLE([have_guile_newt], [(newt)])
+
+AC_ARG_ENABLE([installer],
+ AS_HELP_STRING([--enable-installer], [Build the graphical installer
sources.]))
+
+AS_IF([test "x$enable_installer" = "xyes"], [
if test "x$have_guile_newt" != "xyes"; then
AC_MSG_ERROR([Guile-newt could not be found; please install it.])
fi
+])
+
+AM_CONDITIONAL([ENABLE_INSTALLER],
+ [test "x$enable_installer" = "xyes"])
dnl Make sure we have a full-fledged Guile.
GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads])
diff --git a/gnu/local.mk b/gnu/local.mk
index 3e6d30d..665721b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -543,6 +543,29 @@ GNU_SYSTEM_MODULES = \
%D%/build/marionette.scm \
%D%/build/vm.scm \
\
+ %D%/tests.scm \
+ %D%/tests/audio.scm \
+ %D%/tests/base.scm \
+ %D%/tests/databases.scm \
+ %D%/tests/desktop.scm \
+ %D%/tests/dict.scm \
+ %D%/tests/docker.scm \
+ %D%/tests/monitoring.scm \
+ %D%/tests/nfs.scm \
+ %D%/tests/install.scm \
+ %D%/tests/mail.scm \
+ %D%/tests/messaging.scm \
+ %D%/tests/networking.scm \
+ %D%/tests/rsync.scm \
+ %D%/tests/security-token.scm \
+ %D%/tests/ssh.scm \
+ %D%/tests/version-control.scm \
+ %D%/tests/virtualization.scm \
+ %D%/tests/web.scm
+
+if ENABLE_INSTALLER
+
+GNU_SYSTEM_MODULES += \
%D%/installer.scm \
%D%/installer/build-installer.scm \
%D%/installer/connman.scm \
@@ -563,29 +586,9 @@ GNU_SYSTEM_MODULES = \
%D%/installer/newt/timezone.scm \
%D%/installer/newt/utils.scm \
%D%/installer/newt/welcome.scm \
- %D%/installer/newt/wifi.scm \
- \
- %D%/tests.scm \
- %D%/tests/audio.scm \
- %D%/tests/base.scm \
- %D%/tests/databases.scm \
- %D%/tests/desktop.scm \
- %D%/tests/dict.scm \
- %D%/tests/docker.scm \
- %D%/tests/monitoring.scm \
- %D%/tests/nfs.scm \
- %D%/tests/install.scm \
- %D%/tests/mail.scm \
- %D%/tests/messaging.scm \
- %D%/tests/networking.scm \
- %D%/tests/rsync.scm \
- %D%/tests/security-token.scm \
- %D%/tests/ssh.scm \
- %D%/tests/version-control.scm \
- %D%/tests/virtualization.scm \
- %D%/tests/web.scm \
- \
- %D%/ci.scm
+ %D%/installer/newt/wifi.scm
+
+endif ENABLE_INSTALLER
# Modules that do not need to be compiled.
MODULES_NOT_COMPILED += \
- 14/67: tests: Rename %test-encrypted-os to %test-encrypted-root-os., (continued)
- 14/67: tests: Rename %test-encrypted-os to %test-encrypted-root-os., guix-commits, 2019/01/16
- 18/67: gnu: Add guile-parted., guix-commits, 2019/01/16
- 33/67: installer: Reorder local.mk., guix-commits, 2019/01/16
- 05/67: installer: newt: Use scheme-modules* instead of scheme-modules., guix-commits, 2019/01/16
- 17/67: gnu: guile-newt: Update to revision 4., guix-commits, 2019/01/16
- 35/67: installer: Fix compute calls., guix-commits, 2019/01/16
- 36/67: installer: Reorder partitionment step., guix-commits, 2019/01/16
- 24/67: installer: Add services page., guix-commits, 2019/01/16
- 37/67: installer: locale: Make clear that the point is to select a glibc locale., guix-commits, 2019/01/16
- 26/67: installer: Add new pages., guix-commits, 2019/01/16
- 07/67: configure: Disable installer build by default.,
guix-commits <=
- 30/67: installer: Add user module., guix-commits, 2019/01/16
- 50/67: installer: partition: Fix typo., guix-commits, 2019/01/16
- 49/67: installer: partition: Fix swaping and use syscalls., guix-commits, 2019/01/16
- 53/67: file-systems: Add read-luks-partition-uuid., guix-commits, 2019/01/16
- 46/67: installer: Display an eventual backtrace in a page., guix-commits, 2019/01/16
- 22/67: installer: Add configuration formatter., guix-commits, 2019/01/16
- 57/67: installer: parted: Do not call BLKRRPART on loop devices., guix-commits, 2019/01/16
- 08/67: doc: Document the graphical installer., guix-commits, 2019/01/16
- 03/67: gnu: kmscon: Add runtime keymap update support., guix-commits, 2019/01/16
- 27/67: installer: Redirect to TTY3 root shell for unguided install., guix-commits, 2019/01/16