lisp fix

diff --git a/ChangeLog b/ChangeLog
index b780cdb353e9e6736dbeaaa8ab6e98d6277525a5..00aa5a2bcf83686c6a10aa3a7a5d6d714b2c9374 100644 (file)
--- 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 28c03f2cf8942a65e0dbb3c79993d45504c0f050..d0587c5aa06271e669b4b4552630dece6e126bf4 100644 (file)
--- 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 b04a17ca9fd96da459cecba2942aa5c65db3c20e..74097b153c96376fa16eee16b4316c3332f11105 100644 (file)
--- 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 d74aaa228da7b4b35788df81af54eceea7defe84..77e7e3eaff6c4b69e8f0b2b7b9f1a2c6dd2771b6 100644 (file)
--- 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 a32478ff3789564d8d08f3a9d01b5e1f4a6a3490..5cc29044463db117d14f0c2f9671c928bd579c4f 100644 (file)
--- 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 75f2a002acc1572c6f2f502004655eab57adf7fc..e146524c659b2819587cc82248ca3c0a0d0856d4 100644 (file)
--- 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 (executable)
index 0000000..fa7366f
--- /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