* autoconf.in, autoreconf.in, autoheader.in, autoscan.in, ifnames.in,

* autoupdate.in: Specify the Emacs mode.
* acversion.m4.in: Rename as...
* acversion.m4: this.
* tests/Makefile.am (CLEANFILES): More garbage.

diff --git a/ChangeLog b/ChangeLog
index 7764ef27ad4469613567a89ba5f6ae7ffdbabd9b..5fcf7f60d837c0c27a9b95b6277113b0951635f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-22  Akim Demaille  <akim@epita.fr>
+
+       * autoconf.in, autoreconf.in, autoheader.in, autoscan.in, ifnames.in,
+       * autoupdate.in: Specify the Emacs mode.
+       * acversion.m4.in: Rename as...
+       * acversion.m4: this.
+       * tests/Makefile.am (CLEANFILES): More garbage.
+
 2001-05-22  Akim Demaille  <akim@epita.fr>
 
        * autoconf.sh, autoreconf.sh, autoheader.sh, autoscan.pl, ifnames.sh:

diff --git a/Makefile.am b/Makefile.am
index 1f887f254bca34b723be93fc4e12424781161c5f..beedf6d502a6989f64f7e92ebd5bb7279e22b7a3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,7 +49,7 @@ pkgdata_DATA = $(distpkgdataDATA) $(nodistpkgdataDATA)
 
 EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
              BUGS INSTALL.txt \
-             acversion.m4.in \
+             acversion.in \
              autoconf.in autoheader.in autoreconf.in autoupdate.in ifnames.in \
              autoscan.in \
              $(distpkgdataDATA)
@@ -72,8 +72,8 @@ CLEANFILES = autoconf.m4f \
 #   is changed, acversion.m4 is built only after the new version number is
 #   propagated to the Makefile.  (Libtool uses the same guarantee.)
 
-acversion.m4: $(srcdir)/acversion.m4.in $(srcdir)/configure.in
-       sed 's,@VERSION\@,$(VERSION),g' $(srcdir)/acversion.m4.in >acversion.tm4
+acversion.m4: $(srcdir)/acversion.in $(srcdir)/configure.in
+       sed 's,@VERSION\@,$(VERSION),g' $(srcdir)/acversion.in >acversion.tm4
        mv acversion.tm4 $(srcdir)/acversion.m4
 
 ## INSTALL.  ##

diff --git a/Makefile.in b/Makefile.in
index 1e873445c68abbca786d87d393f6e9fe2d25d4a1..ad345f142df396be49577b5a69041e0e37f39b7a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,7 +94,7 @@ nodistpkgdataDATA = autoconf.m4f
 
 pkgdata_DATA = $(distpkgdataDATA) $(nodistpkgdataDATA)
 
-EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2              BUGS INSTALL.txt              acversion.m4.in              autoconf.in autoheader.in autoreconf.in autoupdate.in ifnames.in              autoscan.in              $(distpkgdataDATA)
+EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2              BUGS INSTALL.txt              acversion.in              autoconf.in autoheader.in autoreconf.in autoupdate.in ifnames.in              autoscan.in              $(distpkgdataDATA)
 
 
 # Files that should be removed, but which Automake does not know:
@@ -415,8 +415,8 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 #   is changed, acversion.m4 is built only after the new version number is
 #   propagated to the Makefile.  (Libtool uses the same guarantee.)
 
-acversion.m4: $(srcdir)/acversion.m4.in $(srcdir)/configure.in
-       sed 's,@VERSION\@,$(VERSION),g' $(srcdir)/acversion.m4.in >acversion.tm4
+acversion.m4: $(srcdir)/acversion.in $(srcdir)/configure.in
+       sed 's,@VERSION\@,$(VERSION),g' $(srcdir)/acversion.in >acversion.tm4
        mv acversion.tm4 $(srcdir)/acversion.m4
 
 # INSTALL is a special case.  Automake seems to have a single name space

diff --git a/acversion.m4.in b/acversion.in
similarity index 100%
rename from acversion.m4.in
rename to acversion.in

diff --git a/autoconf.in b/autoconf.in
index e87bbd61ae1c60d1d0790c5338748075e197f37a..f1ca506b34875f02295cbca6e99d8a4d095e112b 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -1,4 +1,5 @@
 #! @SHELL@
+# -*- shell-script -*-
 # autoconf -- create `configure' using m4 macros
 # Copyright 1992, 1993, 1994, 1996, 1999, 2000, 2001
 # Free Software Foundation, Inc.

diff --git a/autoheader.in b/autoheader.in
index 703f8920b392d6b6280cd7c181ded0ce247fa406..1744a618e4ecb7299e69de90a35e38831d10698b 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -1,4 +1,5 @@
 #! @SHELL@
+# -*- shell-script -*-
 # autoheader -- create `config.h.in' from `configure.ac'
 # Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.

diff --git a/autoreconf.in b/autoreconf.in
index 78e1c232182044f4a336b86aef4c7387020a11bf..809fc00d6325bc8ebd2003a974f491ca969446d6 100644 (file)
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -1,4 +1,5 @@
 #! @SHELL@
+# -*- shell-script -*-
 # autoreconf - remake all Autoconf configure scripts in a directory tree
 # Copyright 1994, 1999, 2000 Free Software Foundation, Inc.
 

diff --git a/autoscan.in b/autoscan.in
index 38434287c1eb3f2e5a8381ab3fb9d4e14b397e81..3ae448956668fbef8f8124230ebb83ac7f78fd60 100644 (file)
--- a/autoscan.in
+++ b/autoscan.in
@@ -1,4 +1,5 @@
 #! @PERL@ -w
+# -*- perl -*-
 # autoscan - Create configure.scan (a preliminary configure.ac) for a package.
 # Copyright 1994, 1999, 2000, 2001 Free Software Foundation, Inc.
 

diff --git a/autoupdate.in b/autoupdate.in
index e61462adfe8b61417af23c25d4eb7f37e91896a4..7cc362a8f2ac5d2bece6d93a1d4135345105e0b2 100644 (file)
--- a/autoupdate.in
+++ b/autoupdate.in
@@ -1,4 +1,5 @@
 #! @PERL@ -w
+# -*- perl -*-
 # autoupdate - modernize an Autoconf file.
 # Copyright 1994, 1999, 2000, 2001 Free Software Foundation, Inc.
 

diff --git a/bin/autoconf.in b/bin/autoconf.in
index e87bbd61ae1c60d1d0790c5338748075e197f37a..f1ca506b34875f02295cbca6e99d8a4d095e112b 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -1,4 +1,5 @@
 #! @SHELL@
+# -*- shell-script -*-
 # autoconf -- create `configure' using m4 macros
 # Copyright 1992, 1993, 1994, 1996, 1999, 2000, 2001
 # Free Software Foundation, Inc.

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 703f8920b392d6b6280cd7c181ded0ce247fa406..1744a618e4ecb7299e69de90a35e38831d10698b 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -1,4 +1,5 @@
 #! @SHELL@
+# -*- shell-script -*-
 # autoheader -- create `config.h.in' from `configure.ac'
 # Copyright 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 78e1c232182044f4a336b86aef4c7387020a11bf..809fc00d6325bc8ebd2003a974f491ca969446d6 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -1,4 +1,5 @@
 #! @SHELL@
+# -*- shell-script -*-
 # autoreconf - remake all Autoconf configure scripts in a directory tree
 # Copyright 1994, 1999, 2000 Free Software Foundation, Inc.
 

diff --git a/bin/autoscan.in b/bin/autoscan.in
index 38434287c1eb3f2e5a8381ab3fb9d4e14b397e81..3ae448956668fbef8f8124230ebb83ac7f78fd60 100644 (file)
--- a/bin/autoscan.in
+++ b/bin/autoscan.in
@@ -1,4 +1,5 @@
 #! @PERL@ -w
+# -*- perl -*-
 # autoscan - Create configure.scan (a preliminary configure.ac) for a package.
 # Copyright 1994, 1999, 2000, 2001 Free Software Foundation, Inc.
 

diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index e61462adfe8b61417af23c25d4eb7f37e91896a4..7cc362a8f2ac5d2bece6d93a1d4135345105e0b2 100644 (file)
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -1,4 +1,5 @@
 #! @PERL@ -w
+# -*- perl -*-
 # autoupdate - modernize an Autoconf file.
 # Copyright 1994, 1999, 2000, 2001 Free Software Foundation, Inc.
 

diff --git a/bin/ifnames.in b/bin/ifnames.in
index 0dc2a78e3f7d53b68efbff4c9df2790429ec6e96..5bacefe7d0ac53232835866f26953a7d671d38c4 100644 (file)
--- a/bin/ifnames.in
+++ b/bin/ifnames.in
@@ -1,4 +1,5 @@
 #! @SHELL@
+# -*- shell-script -*-
 # ifnames - print the identifiers used in C preprocessor conditionals
 # Copyright 1994, 1995, 1999, 2000 Free Software Foundation, Inc.
 

diff --git a/ifnames.in b/ifnames.in
index 0dc2a78e3f7d53b68efbff4c9df2790429ec6e96..5bacefe7d0ac53232835866f26953a7d671d38c4 100644 (file)
--- a/ifnames.in
+++ b/ifnames.in
@@ -1,4 +1,5 @@
 #! @SHELL@
+# -*- shell-script -*-
 # ifnames - print the identifiers used in C preprocessor conditionals
 # Copyright 1994, 1995, 1999, 2000 Free Software Foundation, Inc.
 

diff --git a/lib/autoconf/version.in b/lib/autoconf/version.in
new file mode 100644 (file)
index 0000000..c396d2e
--- /dev/null
+++ b/lib/autoconf/version.in
@@ -0,0 +1,5 @@
+# This file is part of Autoconf.                             -*- Autoconf -*-
+# Version of Autoconf.
+# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+
+m4_define([AC_ACVERSION], [@VERSION@])

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e48a3c46fe38cf6805b67e89388eaf7a2e66ffc9..1c9874303f9b9515c0b9ce74712fc5b7c58c0bea 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -76,6 +76,7 @@ actypes.at: mktests.sh $(MACRO_FILES)
 
 CLEANFILES = debug-*.sh macro configure configure.in configure.ac \
              config.status config.cache config.log config.h.in config.h \
+             config.hin state-* at-* \
              stderr stdout empty \
             config.guess config.sub expr libtool ltconfig ltmain.sh install-sh
 DISTCLEANFILES = atconfig testsuite

diff --git a/tests/Makefile.in b/tests/Makefile.in
index e98cab8f6111a0caa65e25ddef9230b13c91ca67..23bfc8c9dd07efc0d2c9e8fc36fae7253eddf6e6 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -84,7 +84,7 @@ EXTRA_DIST = README              atgeneral.m4 atspecific.m4 aclocal.m4
 MACRO_FILES = ../acgeneral.m4               ../acspecific.m4               ../acfunctions.m4               ../aclang.m4               ../acheaders.m4               ../actypes.m4
 
 
-CLEANFILES = debug-*.sh macro configure configure.in configure.ac              config.status config.cache config.log config.h.in config.h              stderr stdout empty          config.guess config.sub expr libtool ltconfig ltmain.sh install-sh
+CLEANFILES = debug-*.sh macro configure configure.in configure.ac              config.status config.cache config.log config.h.in config.h              config.hin state-* at-*              stderr stdout empty             config.guess config.sub expr libtool ltconfig ltmain.sh install-sh
 
 DISTCLEANFILES = atconfig testsuite
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs