automake: do not use -Q with emacs invocations.

This change is for https://bugs.gnu.org/58102.
(By the way, the previous two commits were for bugs
58026 (silent .elc compilation) and
58025 (load bytecomp), respectively, but I forgot to mention them.)

* m4/lispdir.m4 (AM_PATH_LISPDIR): omit -Q option.
Also (from karl), use -no-site-file (one hyphen) for consistency
with the other options.
* NEWS: mention this.
* doc/automake.texi (Hard-Coded Install Paths): likewise.

diff --git a/NEWS b/NEWS
index 406c5f1ecad37d63b03fe50ea333e1fc9d4511a8..89187669c293b104a309bb70ffd2b7667d8e700e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,8 @@ New in 1.17:
     levels.
 
   - When compiling Emacs Lisp files, emacs is run with --no-site-file to
-    disable user config files that might hang or access the terminal.
+    disable user config files that might hang or access the terminal;
+    and -Q is not used, since its support and behavior varies.
 
   - Emacs Lisp compilations respects silent make output.
 

diff --git a/doc/automake.texi b/doc/automake.texi
index 21c49645e6ccb18aabdcdf6537e1a11919f9b2dd..48744e24f3e56fda369cd2d9cf529907232e9130 100644 (file)
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -13350,7 +13350,7 @@ instance, here is how @code{AM_PATH_LISPDIR} (@pxref{Emacs Lisp})
 computes @samp{$(lispdir)}:
 
 @example
-$EMACS -batch -Q --no-site-file -eval '(while load-path
+$EMACS -batch -no-site-file -eval '(while load-path
   (princ (concat (car load-path) "\n"))
   (setq load-path (cdr load-path)))' >conftest.out
 lispdir=`sed -n

diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 6f9b89d2ca1a6b26946fd2e77180b24eb999eca9..a60095c3f688b0ca9cb93b659c4471b7d89715b4 100644 (file)
--- 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 --no-site-file -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 -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;}' \