Browse Source

build: Don't generate Emacs autoloads when Emacs is unavailable.

Reported by Andreas Enge.

* configure.ac: Define 'HAVE_EMACS' Automake conditional.
* emacs.am ($(AUTOLOADS)): Wrap in 'if HAVE_EMACS'.
gn-latest-20200428
Ludovic Courtès 6 years ago
parent
commit
596fcbf768
2 changed files with 6 additions and 0 deletions
  1. +2
    -0
      configure.ac
  2. +4
    -0
      emacs.am

+ 2
- 0
configure.ac View File

@@ -176,6 +176,8 @@ AC_CONFIG_FILES([test-env], [chmod +x test-env])

dnl Emacs interface.
AM_PATH_LISPDIR
AM_CONDITIONAL([HAVE_EMACS], [test "x$EMACS" != "xno"])

emacsuidir="${guilemoduledir}/guix/emacs"
AC_SUBST([emacsuidir])
AC_CONFIG_FILES([emacs/guix-init.el


+ 4
- 0
emacs.am View File

@@ -34,6 +34,8 @@ dist_lisp_DATA = \
nodist_lisp_DATA = \
emacs/guix-init.el

if HAVE_EMACS

$(AUTOLOADS): $(ELFILES)
$(EMACS) --batch --eval \
"(let ((backup-inhibited t) \
@@ -41,3 +43,5 @@ $(AUTOLOADS): $(ELFILES)
(expand-file-name \"$(AUTOLOADS)\" \"$(srcdir)\"))) \
(update-directory-autoloads \
(expand-file-name \"emacs\" \"$(srcdir)\")))"

endif HAVE_EMACS

Loading…
Cancel
Save