[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: configure: Disable installer build by default.
From: |
guix-commits |
Subject: |
01/05: configure: Disable installer build by default. |
Date: |
Fri, 23 Nov 2018 09:37:37 -0500 (EST) |
mothacehe pushed a commit to branch wip-newt-installer
in repository guix.
commit d47358e6edd893f2d1c7ceeb2975af97daad902a
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 | 45 +++++++++++++++++++++++++--------------------
2 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6a8f3c0..35fa290 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,9 +139,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 b3b1943..f71e3bf 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -531,6 +531,28 @@ 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/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 \
@@ -551,26 +573,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/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%/installer/newt/wifi.scm
+
+endif ENABLE_INSTALLER
# Modules that do not need to be compiled.
MODULES_NOT_COMPILED += \