From: Akim Demaille Date: Tue, 22 May 2001 14:04:22 +0000 (+0000) Subject: * autoconf.in, autoreconf.in, autoheader.in, autoscan.in, ifnames.in, X-Git-Tag: AUTOCONF-2.50a~90 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f27d468f909ecdb417fc408bddacbbb39ac407dd;p=thirdparty%2Fautoconf.git * 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 7764ef27a..5fcf7f60d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-05-22 Akim Demaille + + * 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 * autoconf.sh, autoreconf.sh, autoheader.sh, autoscan.pl, ifnames.sh: diff --git a/Makefile.am b/Makefile.am index 1f887f254..beedf6d50 100644 --- 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 1e873445c..ad345f142 100644 --- 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 e87bbd61a..f1ca506b3 100644 --- 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 703f8920b..1744a618e 100644 --- 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 78e1c2321..809fc00d6 100644 --- 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 38434287c..3ae448956 100644 --- 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 e61462adf..7cc362a8f 100644 --- 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 e87bbd61a..f1ca506b3 100644 --- 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 703f8920b..1744a618e 100644 --- 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 78e1c2321..809fc00d6 100644 --- 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 38434287c..3ae448956 100644 --- 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 e61462adf..7cc362a8f 100644 --- 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 0dc2a78e3..5bacefe7d 100644 --- 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 0dc2a78e3..5bacefe7d 100644 --- 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 index 000000000..c396d2e20 --- /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 e48a3c46f..1c9874303 100644 --- 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 e98cab8f6..23bfc8c9d 100644 --- 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