From 557d9c8d7a843bf06e75b4e1a742654ccf951fa3 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 13 Jan 2017 18:47:15 +0100
Subject: etc: Support indentation of whole files.

* etc/indent-package.el.in: Rename to...
* etc/indent-code.el.in: ... this.  Add case for a single argument.
* doc/contributing.texi (Formatting Code): Adjust accordingly.
* configure.ac: Likewise.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f628fa9d0d..9079a142dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,6 @@ AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix])
 AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
 AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
   [chmod +x pre-inst-env])
-AC_CONFIG_FILES([etc/indent-package.el], [chmod +x etc/indent-package.el])
+AC_CONFIG_FILES([etc/indent-code.el], [chmod +x etc/indent-code.el])
 
 AC_OUTPUT
-- 
cgit v1.2.3


From d480ed7edb7ad787829fd8220c86220ca34ce8ac Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 7 Feb 2017 14:53:24 +0100
Subject: build: Warn about lack of substitutes for non-standard stores.

* configure.ac: Emit a warning when $storedir is not "/gnu/store".
---
 configure.ac | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 9079a142dc..06b0618b43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,6 +236,15 @@ dnl Emacs (optional), for 'etc/indent-package.el'.
 AC_PATH_PROG([EMACS], [emacs], [/usr/bin/emacs])
 AC_SUBST([EMACS])
 
+case "$storedir" in
+  /gnu/store)
+    ;;
+  *)
+    AC_MSG_WARN([Using a store directory other than '/gnu/store' will prevent you])
+    AC_MSG_WARN([from downloading substitutes from gnu.org.])
+    ;;
+esac
+
 AC_CONFIG_FILES([Makefile
                  po/guix/Makefile.in
                  po/packages/Makefile.in
-- 
cgit v1.2.3