* automake.texi (Emacs Lisp): Instruct people to use lisp_DATA

instead of lisp_LISP when they don't want byte-compilation.
Don't mention ELCFILES anymore.
* automake.in (handle_data): Allow lisp_DATA.
* tests/lisp5.test: New file.
* tests/Makefile.am (TESTS): Add lisp5.test.

diff --git a/ChangeLog b/ChangeLog
index 078d8b0c545bbc9c419cbc08461f5ef9a66a8fab..d528ed475a0c7d2a191fce3b4778cdbee0296138 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-02-26  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * automake.texi (Emacs Lisp): Instruct people to use lisp_DATA
+       instead of lisp_LISP when they don't want byte-compilation.
+       Don't mention ELCFILES anymore.
+       * automake.in (handle_data): Allow lisp_DATA.
+       * tests/lisp5.test: New file.
+       * tests/Makefile.am (TESTS): Add lisp5.test.
+
        * automake.in (handle_emacs_lisp): Don't build *.elc files
        if ELCFILES was set empty.
        * tests/lisp4.test: New file.

diff --git a/NEWS b/NEWS
index 0974445fe74a98118cba19b3787b710e6e7528d7..c946cb412c8ab3efbe29b7d26221e402b77493e1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -44,6 +44,10 @@ New in 1.7a:
 * elisp sources are compiled all at once, instead of one by one.
   This allows interdependencies and speeds up compilation.
 
+* lisp_DATA is now allowed.  If you are using the empty ELCFILES idiom
+  to disable byte-compilation of lisp_LISP files, it is recommanded that
+  you switch to using lisp_DATA.  ELCFILES is no longer documented.
+
 * AM_PROG_CC_STDC is now empty.  The content of this macro was
   merged in AC_PROG_CC.  If your code uses $am_cv_prog_cc_stdc,
   you should adjust it to use $ac_cv_prog_cc_stdc instead.

diff --git a/automake.in b/automake.in
index b4f94d3af8c59aa8150cc03bf24db0a984c0b61e..20c4c15f0937217d18a3540200f9e160ea7288f5 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -4033,7 +4033,7 @@ sub handle_data
 {
     &am_install_var ('-noextra', '-candist', 'data', 'DATA',
                     'data', 'sysconf', 'sharedstate', 'localstate',
-                    'pkgdata', 'noinst', 'check');
+                    'pkgdata', 'lisp', 'noinst', 'check');
 }
 
 # Handle TAGS.

diff --git a/automake.texi b/automake.texi
index 27dc0bd28f13711497a979ded3bfbb20e2978e23..5e7fe47b5ac5b44d8476f091056036570584c250 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -3794,19 +3794,18 @@ primary are @samp{lisp_} and @samp{noinst_}.  Note that if
 @code{lisp_LISP} is defined, then @file{configure.in} must run
 @code{AM_PATH_LISPDIR} (@pxref{Macros}).
 
-@vindex ELCFILES
+Automake will byte-compile all Emacs Lisp source files using the Emacs
+found by @code{AM_PATH_LISPDIR}, if any was found.  If you wish to
+avoid byte-compiling, use @code{lisp_DATA} instead of
+@code{lisp_LISP}.
 
-By default Automake will byte-compile all Emacs Lisp source files using
-the Emacs found by @code{AM_PATH_LISPDIR}.  If you wish to avoid
-byte-compiling, simply define the variable @code{ELCFILES} to be empty.
 Byte-compiled Emacs Lisp files are not portable among all versions of
 Emacs, so it makes sense to turn this off if you expect sites to have
 more than one version of Emacs installed.  Furthermore, many packages
-don't actually benefit from byte-compilation.  Still, we recommend that
-you leave it enabled by default.  It is probably better for sites with
-strange setups to cope for themselves than to make the installation less
-nice for everybody else.
-
+don't actually benefit from byte-compilation.  Still, we recommend
+that you byte-compile your Emacs Lisp sources.  It is probably better
+for sites with strange setups to cope for themselves than to make the
+installation less nice for everybody else.
 
 @node gettext, Libtool, Emacs Lisp, Other GNU Tools
 @section Gettext

diff --git a/stamp-vti b/stamp-vti
index d3020080b4f1fe8e33ea6fa393456ea9e7b29efd..aa7bf9a4a0dc6cba40625e28cb8bd7c83201efaa 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 23 February 2003
+@set UPDATED 26 February 2003
 @set UPDATED-MONTH February 2003
 @set EDITION 1.7a
 @set VERSION 1.7a

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 393bddfb1271b6c82e270fb92e0170f5192965e3..2439a3b9945892669cf65720f130b38d2b35db30 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -258,6 +258,7 @@ lisp.test \
 lisp2.test \
 lisp3.test \
 lisp4.test \
+lisp5.test \
 listval.test \
 location.test \
 ltdeps.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index fc98e205fbe1ab6b50da9117ab7ab0d3b17311e3..aeeb6473bf6935b6222483dd573e5ddda54e570e 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -352,6 +352,7 @@ lisp.test \
 lisp2.test \
 lisp3.test \
 lisp4.test \
+lisp5.test \
 listval.test \
 location.test \
 ltdeps.test \

diff --git a/tests/lisp5.test b/tests/lisp5.test
new file mode 100755 (executable)
index 0000000..c354b88
--- /dev/null
+++ b/tests/lisp5.test
@@ -0,0 +1,66 @@
+#! /bin/sh
+# Copyright (C) 2003  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Same as lisp4.test, but using the now-recommanded way to install
+# non-bytecompiled *.el files.
+
+required=emacs
+. ./defs || exit 1
+
+set -e
+
+cat > Makefile.am << 'EOF'
+lisp_DATA = am-one.el am-two.el am-three.el
+EXTRA_DIST = am-one.el am-two.el
+am-three.el:
+       echo "(provide 'am-three)" > $@
+CLEANFILES = am-three.el
+
+install-test: install
+       test -f $(lispdir)/am-one.el
+       test -f $(lispdir)/am-two.el
+       test -f $(lispdir)/am-three.el
+       test ! -f $(lispdir)/am-one.elc
+       test ! -f $(lispdir)/am-two.elc
+       test ! -f $(lispdir)/am-three.elc
+EOF
+
+cat >> configure.in << 'EOF'
+AM_PATH_LISPDIR
+AC_OUTPUT
+EOF
+
+echo "(require 'am-two)" > am-one.el
+echo "(require 'am-three) (provide 'am-two)" > am-two.el
+# am-tree.el is a built source
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE --add-missing
+./configure --prefix "`pwd`"
+
+$MAKE
+
+test ! -f am-one.elc
+test ! -f am-two.elc
+test ! -f am-three.elc
+test ! -f elc-stamp
+
+$MAKE install-test

diff --git a/version.texi b/version.texi
index d3020080b4f1fe8e33ea6fa393456ea9e7b29efd..aa7bf9a4a0dc6cba40625e28cb8bd7c83201efaa 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 23 February 2003
+@set UPDATED 26 February 2003
 @set UPDATED-MONTH February 2003
 @set EDITION 1.7a
 @set VERSION 1.7a