summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2022-02-08 00:39:40 -0500
committerMike Frysinger <vapier@gentoo.org>2022-02-08 22:44:42 -0500
commit5c9e117c5f1366a301a62ff70c33405a9aa23921 (patch)
treed70cf65232de09c4045d11f7c65764fdec79027b /m4
parent24a28a24e32b1195ca5fc9f2d1303bc0368fe18b (diff)
downloadautomake-5c9e117c5f1366a301a62ff70c33405a9aa23921.tar.gz
elisp: run emacs with --no-site-file
Fixes automake bug https://bugs.gnu.org/21547. If users have interactive site file logic, the lispdir probing can hang, as can the compilation of elisp files. Use --no-site-file to disable loading any of that possible user logic. * NEWS: Note emacs --no-site-file change. * doc/automake.texi: Run emacs with --no-site-file. * lib/am/lisp.am: Likewise. * m4/lispdir.m4: Likewise.
Diffstat (limited to 'm4')
-rw-r--r--m4/lispdir.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 525e3ee6d..6f9b89d2c 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -34,7 +34,7 @@ AC_DEFUN([AM_PATH_LISPDIR],
# which is non-obvious for non-emacs users.
# Redirecting /dev/null should help a bit; pity we can't detect "broken"
# emacsen earlier and avoid running this altogether.
- AC_RUN_LOG([$EMACS -batch -Q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' </dev/null >conftest.out])
+ AC_RUN_LOG([$EMACS -batch -Q --no-site-file -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' </dev/null >conftest.out])
am_cv_lispdir=`sed -n \
-e 's,/$,,' \
-e '/.*\/lib\/x*emacs\/site-lisp$/{s,.*/lib/\(x*emacs/site-lisp\)$,${libdir}/\1,;p;q;}' \