diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-11-15 20:11:35 +0100 |
| commit | f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242 (patch) | |
| tree | 80c815216a3717cf00b615c9cb8840c113eaf79f /configure.ac | |
| parent | 2c9d34166983565120f831284df57a07e2edd2f9 (diff) | |
| parent | 528b52390d216d8a8cd13dfcd1e6e40a6448e6c2 (diff) | |
| download | guix-f056553c6b8ffa36f4ce9fb1c3602a8f4b1de242.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 689b28d984..69ab9a97b8 100644 --- a/configure.ac +++ b/configure.ac @@ -280,9 +280,14 @@ dnl Documentation translation. AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate]) AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo]) -dnl Emacs (optional), for 'etc/indent-package.el'. -AC_PATH_PROG([EMACS], [emacs], [/usr/bin/emacs]) -AC_SUBST([EMACS]) +dnl Emacs (optional), for 'etc/indent-code.el'. +AC_PATH_PROG([EMACS], [emacs]) +if test "x$EMACS" = x; then + AC_MSG_WARN([Please install GNU Emacs to use etc/indent-code.el.]) +else + AC_SUBST([EMACS]) + AC_CONFIG_FILES([etc/indent-code.el], [chmod +x etc/indent-code.el]) +fi case "$storedir" in /gnu/store) @@ -302,6 +307,5 @@ AC_CONFIG_FILES([Makefile 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-code.el], [chmod +x etc/indent-code.el]) AC_OUTPUT |