[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/68: configure: Disable installer build by default.
From: |
guix-commits |
Subject: |
08/68: configure: Disable installer build by default. |
Date: |
Thu, 17 Jan 2019 08:05:09 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 7d328e341a5caca995b6c18c38ae2e9ee07f7b7e
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 += \
- 20/68: file-systems: Export read-partition-label and read-partition-uuid., (continued)
- 20/68: file-systems: Export read-partition-label and read-partition-uuid., guix-commits, 2019/01/17
- 22/68: installer: Add new utils., guix-commits, 2019/01/17
- 33/68: installer: Reorder POTFILES.in, guix-commits, 2019/01/17
- 31/68: installer: Add user module., guix-commits, 2019/01/17
- 32/68: installer: Add partitioning support., guix-commits, 2019/01/17
- 09/68: doc: Document the graphical installer., guix-commits, 2019/01/17
- 34/68: installer: Reorder local.mk., guix-commits, 2019/01/17
- 35/68: installer: Remove group selection in user page., guix-commits, 2019/01/17
- 06/68: installer: newt: Use scheme-modules* instead of scheme-modules., guix-commits, 2019/01/17
- 07/68: installer: newt: Locate the logo within local-file., guix-commits, 2019/01/17
- 08/68: configure: Disable installer build by default.,
guix-commits <=
- 05/68: gnu: Add graphical installer support., guix-commits, 2019/01/17