From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 8 Jan 2003 18:17:03 +0000 (+0000)
Subject: * m4/lispdir.m4: Register EMACS and EMACSLOADPATH as precious
X-Git-Tag: Release-1-7b~320
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=79fe6961b702d7e8e37988d664af4b0a8124fd48;p=automake.git

* m4/lispdir.m4: Register EMACS and EMACSLOADPATH as precious
variables.  Suggested by Ryan T. Sammartino.
---

diff --git a/ChangeLog b/ChangeLog
index e7c67459..af47a559 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-08  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* m4/lispdir.m4: Register EMACS and EMACSLOADPATH as precious
+	variables.  Suggested by Ryan T. Sammartino.
+
 2003-01-05  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* automake.in (macro_define): Add missing `{$cond}' (typo from
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index 42e537e6..5128a886 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -4,7 +4,7 @@
 ## Almost entirely rewritten by Alexandre Oliva
 ## ------------------------
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 # AM_PATH_LISPDIR
 # ---------------
 AC_DEFUN([AM_PATH_LISPDIR],
-[AC_ARG_WITH(lispdir,
+[AC_ARG_WITH([lispdir],
  [  --with-lispdir          Override the default lisp directory ],
  [ lispdir="$withval"
    AC_MSG_CHECKING([where .elc files should go])
@@ -36,7 +36,9 @@ AC_DEFUN([AM_PATH_LISPDIR],
  # If set to t, that means we are running in a shell under Emacs.
  # If you have an Emacs named "t", then use the full path.
  test x"$EMACS" = xt && EMACS=
- AC_CHECK_PROGS(EMACS, emacs xemacs, no)
+ AC_CHECK_PROGS([EMACS], [emacs xemacs], [no])
+ AC_ARG_VAR([EMACS], [the Emacs editor command])
+ AC_ARG_VAR([EMACSLOADPATH], [the Emacs library search path])
  if test $EMACS != "no"; then
    if test x${lispdir+set} != xset; then
      AC_CACHE_CHECK([where .elc files should go], [am_cv_lispdir],
@@ -60,7 +62,7 @@ AC_DEFUN([AM_PATH_LISPDIR],
    fi
  fi
 ])
-AC_SUBST(lispdir)
+AC_SUBST([lispdir])
 ])# AM_PATH_LISPDIR
 
 AU_DEFUN([ud_PATH_LISPDIR], [AM_PATH_LISPDIR])