From 8236cc7fe195ca52268ba7e79dd8fee066036ae9 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 28 Mar 1997 03:20:02 +0000
Subject: [PATCH] lisp fix

---
 ChangeLog         |  2 ++
 TODO              |  4 ++++
 m4/lispdir.m4     |  3 +--
 tests/ChangeLog   |  4 ++++
 tests/Makefile.am |  2 +-
 tests/Makefile.in |  2 +-
 tests/lisp.test   | 21 +++++++++++++++++++++
 7 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100755 tests/lisp.test

diff --git a/ChangeLog b/ChangeLog
index b780cdb3..00aa5a2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Thu Mar 27 17:28:47 1997  Tom Tromey  <tromey@cygnus.com>
 
+	* m4/lispdir.m4: Don't AC_SUBST ELCFILES.  From Greg Woods.
+
 	* texi-vers.am (stamp-@VTI@): Make commands silent.
 
 	* Makefile.am (maintainer-check): "true" is ok now.
diff --git a/TODO b/TODO
index 28c03f2c..d0587c5a 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
 * NORMAL_INSTALL / NORMAL_UNINSTALL -vs- recursive rules
   [ maybe nothing needs be done ]
 
+* make sure `missing' defines are generated
+
 * copyrights on m4 files, aclocal output
 
 * is there a way to add a directory and then have "make" do all the
@@ -340,6 +342,8 @@ containing application.
 
 Document:
 
+AM_MISSING_PROG
+
 how to use the generated makefiles
  - standard targets
  - required targets
diff --git a/m4/lispdir.m4 b/m4/lispdir.m4
index b04a17ca..74097b15 100644
--- a/m4/lispdir.m4
+++ b/m4/lispdir.m4
@@ -34,5 +34,4 @@ AC_DEFUN(AM_PATH_LISPDIR,
     AC_MSG_RESULT($lispdir)
     ELCFILES="\$(ELCFILES)"
   fi
-  AC_SUBST(lispdir)
-  AC_SUBST(ELCFILES)])
+  AC_SUBST(lispdir)])
diff --git a/tests/ChangeLog b/tests/ChangeLog
index d74aaa22..77e7e3ea 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 27 18:10:47 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* lisp.test: New file.
+
 Sat Mar 22 01:14:03 1997  Tom Tromey  <tromey@cygnus.com>
 
 	* cygwin32.test: New file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a32478ff..5cc29044 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,7 +24,7 @@ ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \
 colon2.test colon3.test remake.test output.test output2.test \
 remake2.test output3.test output4.test colneq2.test subst.test \
 defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test	\
-cxxlibobj.test seenc.test cygwin32.test
+cxxlibobj.test seenc.test cygwin32.test lisp.test
 
 EXTRA_DIST = defs $(TESTS)
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 75f2a002..e146524c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -76,7 +76,7 @@ ranlib.test confvar.test confvar2.test stdlib.test cxxo.test \
 colon2.test colon3.test remake.test output.test output2.test \
 remake2.test output3.test output4.test colneq2.test subst.test \
 defun2.test yaccpp.test texinfo3.test texinfo4.test tagsub.test	\
-cxxlibobj.test seenc.test cygwin32.test
+cxxlibobj.test seenc.test cygwin32.test lisp.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/tests/lisp.test b/tests/lisp.test
new file mode 100755
index 00000000..fa7366f7
--- /dev/null
+++ b/tests/lisp.test
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+# Test to make sure lisp handling works.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AM_PATH_LISPDIR
+END
+
+cat > Makefile.am << 'END'
+lisp_LISP = foo.el
+END
+
+: > foo.el
+: > elisp-comp
+
+$AUTOMAKE || exit 1
+
+grep '^ELCFILES.*ELCFILES' Makefile.in && exit 1
+exit 0
-- 
2.43.5