ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Reported by Andreas Enge.

* configure.ac: Define 'HAVE_EMACS' Automake conditional.
* emacs.am ($(AUTOLOADS)): Wrap in 'if HAVE_EMACS'.
This commit is contained in:
Ludovic Courtès 2014-09-27 17:26:22 +02:00
parent 6c4a2884b6
commit 596fcbf768
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -176,6 +176,8 @@ AC_CONFIG_FILES([test-env], [chmod +x test-env])
dnl Emacs interface. dnl Emacs interface.
AM_PATH_LISPDIR AM_PATH_LISPDIR
AM_CONDITIONAL([HAVE_EMACS], [test "x$EMACS" != "xno"])
emacsuidir="${guilemoduledir}/guix/emacs" emacsuidir="${guilemoduledir}/guix/emacs"
AC_SUBST([emacsuidir]) AC_SUBST([emacsuidir])
AC_CONFIG_FILES([emacs/guix-init.el AC_CONFIG_FILES([emacs/guix-init.el

4
emacs.am
View file

@ -34,6 +34,8 @@ dist_lisp_DATA = \
nodist_lisp_DATA = \ nodist_lisp_DATA = \
emacs/guix-init.el emacs/guix-init.el
if HAVE_EMACS
$(AUTOLOADS): $(ELFILES) $(AUTOLOADS): $(ELFILES)
$(EMACS) --batch --eval \ $(EMACS) --batch --eval \
"(let ((backup-inhibited t) \ "(let ((backup-inhibited t) \
@ -41,3 +43,5 @@ $(AUTOLOADS): $(ELFILES)
(expand-file-name \"$(AUTOLOADS)\" \"$(srcdir)\"))) \ (expand-file-name \"$(AUTOLOADS)\" \"$(srcdir)\"))) \
(update-directory-autoloads \ (update-directory-autoloads \
(expand-file-name \"emacs\" \"$(srcdir)\")))" (expand-file-name \"emacs\" \"$(srcdir)\")))"
endif HAVE_EMACS