summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2018-11-23 10:56:49 +0900
committerLudovic Courtès <ludo@gnu.org>2019-01-17 14:04:21 +0100
commit7d328e341a5caca995b6c18c38ae2e9ee07f7b7e (patch)
tree3d26bc1fecaaec5c341d03734a3528b266de9969 /gnu
parent9b9a5e3283168463545588f83748bb36411e68fe (diff)
downloadguix-7d328e341a5caca995b6c18c38ae2e9ee07f7b7e.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk49
1 files changed, 26 insertions, 23 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 3e6d30d8e9..665721bec1 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 +=				\