Commit Graph

118 Commits

Author SHA1 Message Date
Ralf Wildenhues
675a0c95df Update License to GPLv3+ including new Autoconf Exception.
* NEWS, README: Update licensing information.
* COPYING.EXCEPTION: New file.
* Makefile.am (EXTRA_DIST): Distribute it.
* cfg.mk (autom4te-update): Remove copyright change warning.
* lib/autoconf/autoconf.m4, lib/autoconf/autoheader.m4,
lib/autoconf/autoscan.m4, lib/autoconf/autotest.m4,
lib/autoconf/autoupdate.m4, lib/autoconf/c.m4,
lib/autoconf/erlang.m4, lib/autoconf/fortran.m4,
lib/autoconf/functions.m4, lib/autoconf/general.m4,
lib/autoconf/headers.m4, lib/autoconf/lang.m4,
lib/autoconf/libs.m4, lib/autoconf/oldnames.m4,
lib/autoconf/programs.m4, lib/autoconf/specific.m4,
lib/autoconf/status.m4, lib/autoconf/types.m4,
lib/autotest/autotest.m4, lib/autotest/general.m4,
lib/autotest/specific.m4, lib/m4sugar/foreach.m4,
lib/m4sugar/m4sh.m4, lib/m4sugar/m4sugar.m4: Update exception
statement, bump to GPLv3.
* bin/autoconf.as, bin/autoheader.in, bin/autom4te.in,
bin/autoreconf.in, bin/autoscan.in, bin/autoupdate.in,
bin/ifnames.in: Bump to GPLv3+, adjust --version output
to reflect the GPLv3+ and the Autoconf Exception.
* lib/Autom4te/C4che.pm, lib/Autom4te/ChannelDefs.pm,
lib/Autom4te/General.pm, lib/Autom4te/Request.pm,
lib/autom4te.in, lib/autoscan/autoscan.pre,
lib/emacs/autoconf-mode.el, lib/emacs/autotest-mode.el,
lib/freeze.mk, tests/atlocal.in, tests/autoscan.at,
tests/autotest.at, tests/base.at, tests/c.at,
tests/compile.at, tests/erlang.at, tests/foreign.at,
tests/fortran.at, tests/local.at, tests/m4sh.at,
tests/m4sugar.at, tests/mktests.sh, tests/semantics.at,
tests/statesave.m4, tests/suite.at, tests/tools.at,
tests/torture.at, tests/wrapper.as: Bump to GPLv3+.
2009-09-09 19:53:31 +02:00
Eric Blake
b35598a688 Use pkgdatadir consistently.
* bin/Makefile.am (edit): Substitute pkgdatadir, not datadir.
* lib/Makefile.am (edit): Likewise.
* lib/autom4te.in (Autoconf-without-aclocal-m4, Autotest, M4sh)
(M4sugar): Use @pkgdatadir@, not @datadir@.
* bin/autoheader.in ($datadir): Likewise.
* bin/autom4te.in ($datadir): Likewise.
* bin/autoreconf.in ($datadir): Likewise.
* bin/autoscan.in ($datadir): Likewise.
* bin/autoupdate.in ($datadir): Likewise.
* bin/ifnames.in ($datadir): Likewise.
* doc/autoconf.texi (Installation Directory Variables): Update
example to be consistent; focus on $(bindir) as an autoconf
variable, and mention that $(pkgdatadir) comes from automake.
Reported by Reuben Thomas.

Signed-off-by: Eric Blake <ebb9@byu.net>
2009-02-24 09:38:01 -07:00
Eric Blake
c875bf7a97 Use URLs in --help output, part 1: autoconf executables.
* bin/autoconf.as (usage): Make output consistent with recent
change in gnulib version-etc module.
* bin/autoheader.in ($help): Likewise.
* bin/autom4te.in ($help): Likewise.
* bin/autoreconf.in ($help): Likewise.
* bin/autoscan.in ($help): Likewise.
* bin/autoupdate.in ($help): Likewise.
* bin/ifnames.in ($help): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>
2009-01-27 14:13:50 -07:00
Eric Blake
f4df9b9b40 Update invocation documentation.
* doc/autoconf.texi (autoscan Invocation): Mention --debug.
(autoreconf Invocation): Mention -v.
(autom4te Invocation): Tie --freeze to -F, not -f.
(autoupdate Invocation): Mention --prepend-include.
* doc/install.texi (configure Invocation): Mention --help=short,
--help=recursive, -n/--no-create, --prefix.  Avoid TABs.
* bin/autoscan.in ($help): Omit space before `...'.
* bin/ifnames.in ($help): Likewise.
* bin/autoconf.as (Usage): Likewise.
* bin/autoreconf.in ($help): Likewise.
* bin/autoheader.in ($help): Likewise.
* bin/autom4te.in ($help): Likewise.
* bin/autoupdate.in ($help): Likewise.
* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Use
`[OPTION]...', rather than `[OPTIONS]'.  Mention --silent.  Indent
--file correctly.

Signed-off-by: Eric Blake <ebb9@byu.net>
2008-08-26 09:28:15 -06:00
Stepan Kasal
886a634111 Add quotes to the header of autoscan-generated source.
* bin/autoscan.in: Add quotes to AC_PREREQ and AC_INIT.

Signed-off-by: Stepan Kasal <skasal@redhat.com>
2008-07-02 15:38:24 +02:00
Eric Blake
a91e2a71d2 Use GPLv2+ plus exception as license for release.
Return back to GPLv2+, until the text of the exceptions is
finalized, reverting the change from 2007-07-03 and the first
part of the change from 2007-07-20.

Also:
* COPYING: Revert to GPLv2.
* COPYINGv3: New file, since some auxiliary build tools, used for
building autoconf and not installed, are GPLv3.
* Makefile.am (EXTRA_DIST): Distribute COPYINGv3.
* NEWS: Remove mention of GPLv3.
* README: Clarify situation regarding GPLv3.

Signed-off-by: Eric Blake <ebb9@byu.net>
2008-04-05 17:04:48 -06:00
Eric Blake
593340005e AC_CONFIG_HEADERS replaced AC_CONFIG_HEADER.
* bin/autoscan.in (output): Avoid obsolete spelling.
* tests/local.at (AC_STATE_SAVE): Update usage.
* THANKS: Update.
Reported by John Calcote.

Signed-off-by: Eric Blake <ebb9@byu.net>
2008-03-18 20:54:31 -06:00
Ralf Wildenhues
449317f7ee Proper file name escaping in Autoconf programs and Perl modules.
This includes escaping of characters special to the shell
as well as special to Perl, e.g., leading `<' or `>'.
For example, when $file starts with `>', `open ">$file"'
wrongly tries to append to a different file.

* bin/autoconf.as: Fix quoting for autom4te options.
* lib/Autom4te/General.pm (shell_quote): New function, taken
from coreutils, written by Jim Meyering.
(mktmpdir): Use it.
* bin/autom4te.in (files_to_options, handle_m4): Use shell_quote
and open_quote.
* bin/autoreconf.in (parse_args): Likewise.
* bin/autoscan.in (main): Likewise.
* bin/autoupdate.in (main): Likewise.
* bin/autoheader.in: Likewise, fixing old insufficient escaping.
* bin/ifnames.in: Likewise, XFile usage fixes.
* tests/tools.at (autom4te and whitespace in file names): Extend
test.  Test twice, with special characters allowed on w32, and the
rest.  Test leading and trailing whitespace, for `open_quote'.
(autotools and whitespace in file names): New, analogous test.
Reported by Paul Eggert and Benoit Sigoure, additional suggestions
by Russ Allbery and Eric Blake.
2007-12-08 11:46:43 +01:00
Ralf Wildenhues
ff8db57440 * bin/autoconf.as: Update --version output to match current GCS.
* bin/autoheader.in: Likewise.
* bin/autom4te.in: Likewise.
* bin/autoreconf.in: Likewise.
* bin/autoscan.in: Likewise.
* bin/autoupdate.in: Likewise.
* bin/ifnames.in: Likewise.
2007-08-20 21:12:33 +00:00
Paul Eggert
b411b77358 Reword the copyright notices to match what's suggested in GPLv3. 2007-07-20 23:11:49 +00:00
Paul Eggert
f448ac9647 Update to GPLv3. 2007-07-03 20:28:58 +00:00
Eric Blake
c78eaa47a9 * bin/Makefile.am (RELEASE_YEAR): New macro.
(edit): Use it to supply correct copyright year to scripts.
* bin/autoconf.as (version): Use it.
* bin/autoheader.in ($version): Likewise.
* bin/autom4te.in ($version): Likewise.
* bin/autoreconf.in ($version): Likewise.
* bin/autoscan.in ($version): Likewise.
* bin/autoupdate.in ($version): Likewise.
* bin/ifnames.in ($version): Likewise.
2007-01-04 16:43:06 +00:00
Eric Blake
c94a138300 * bin/autoconf.as (version): Reword to match GNU Coding
Standards.
* bin/autoheader.in (version): Likewise.
* bin/autom4te.in (version): Likewise.
* bin/autoreconf.in (version): Likewise.
* bin/autoscan.in (version): Likewise.
* bin/autoupdate.in (version): Likewise.
* bin/ifnames.in (version): Likewise.
2006-10-16 20:58:44 +00:00
Noah Misch
d4f849f3c0 * bin/autoscan.in (subdirs): New global.
(scan_file): Prune directories with configure{,.{ac,in,gnu}}.
(output): Emit AC_CONFIG_SUBDIRS as needed.
* tests/autoscan.at (autoscan): Remove XFAIL.
2006-04-03 15:58:20 +00:00
Ralf Wildenhues
9656b1839e * bin/autoscan.in: The value of find_configure_ac should be
checked for existence, so we don't barf over a nonexisting
configure.ac.  Reported by Laurence Darby <ldarby@tuffmail.com>.
2006-03-26 21:27:56 +00:00
Paul Eggert
1fabda990f * bin/autoconf.as, bin/autoheader.in, bin/autom4te.in
* bin/autoreconf.in, bin/autoscan.in, bin/autoupdate.in, bin/ifnames.in:
* lib/autoconf/general.m4, lib/autoconf/status.m4:
* lib/autotest/general.m4:
Update copyright year to 2006.
2006-01-06 00:10:37 +00:00
Paul Eggert
681d17dce2 Update FSF postal mail address. 2005-05-14 07:00:38 +00:00
Paul Eggert
23ddc41052 Update --version copyright output to 2005. 2005-01-03 07:38:01 +00:00
Stepan Kasal
b26f03d5be * bin/autoscan.in: Open autoscan.log only after ``parse_args'';
so that eg. ``autoscan --help'' doesn't truncate it.
2004-12-17 14:21:50 +00:00
Paul Eggert
6b1c07685a Use "file name" rather than "filename" or "path",
to be consistent with the terminology of the GNU coding standards.
2004-08-20 19:58:06 +00:00
Paul Eggert
837c0ccc76 Don't use $< in makefiles where POSIX doesn't allow it;
add @configure_input@ in a couple of other places.
2004-03-03 21:40:46 +00:00
Paul Eggert
97050d1a3c Update copyright from 2003 to 2004. 2004-01-27 19:02:51 +00:00
Akim Demaille
d254c1999a * bin/autoscan.in (Autom4te::FileUtils): Use it for find_file.
Reported by Ralf Corsepius.
2003-09-26 12:57:42 +00:00
Akim Demaille
a5b49f45d6 * lib/Autom4te/General.pm (&file_name_is_absolute): Remove.
(&verbose): Remove.
(&getopt): Adjust the note and verb channels, depending upon
--verbose.
* bin/autoheader.in, bin/autom4te.in, bin/autoscan.in,
* bin/autoupdate.in: Adjust.
Use &verb, not &verbose.
2003-08-21 17:50:11 +00:00
Akim Demaille
cf2308cf7b * bin/autoheader.in (&parse_args): Use &parse_warnings and
&parse_WARNINGS.
($help): Use Autom4te::ChannelDefs::usage.
* bin/autoscan.in: Use Autom4te::ChannelDefs.
* lib/Autom4te/General.pm: Don't export error: you don't own it.
2003-08-21 17:31:25 +00:00
Akim Demaille
59b8e13699 * lib/Autom4te/Configure_ac.pm (&find_configure_ac)
(&require_configure_ac): Accept an optional directory argument.
($configure_ac): Remove.
* lib/Autom4te/General.pm (&find_configure_ac, &canonfile)
(&catfile): Remove.
* bin/autoheader.in, bin/autoreconf.in, bin/autoupdate.in,
* bin/autoscan.in: Adjust.
2003-08-21 06:55:41 +00:00
Akim Demaille
ff9230c146 * bin/autom4te.in, bin/autoscan.in, bin/autoheader.in: White space
changes.
* lib/Autom4te/General.pm (&backname): Remove, no longer used by
Autoconf nor Automake.
(&contents): New, from Automake.
PODify.
* lib/autoconf/c.m4 (_AC_PROG_CXX_EXIT_DECLARATION):
Remove `#include <stdlib.h>' from the list; we should never
2003-06-02 06:55:03 +00:00
Akim Demaille
62930d7b99 * bin/autoheader.in, bin/autom4te.in, bin/autoreconf.in,
* bin/autoscan.in, bin/autoupdate.in, bin/ifnames.in (BEGIN): Make
them uniform, and more robust to Perl special characters.
Reported by Martin Mokrej.
2003-05-16 09:54:46 +00:00
Akim Demaille
f6f77d7b72 * bin/autoheader.in (BEGIN): For DJGPP SHELL may not be set
to a shell that can handle redirection or quoting correctly.
Override SHELL with the shell detected by configure.
Use of $^O suggested by Tim van Holder.
* bin/autom4te.in (BEGIN): Likewise.
* bin/autoreconf.in (BEGIN): Likewise.
* bin/autoscan.in (BEGIN): Likewise.
* bin/autoupdate.in (BEGIN): Likewise.
* bin/ifnames.in (BEGIN): Likewise.
* bin/ifnames.in: Add final newline to help and version messages.
* lib/autoconf/programs.m4 (AC_PROG_MAKE_SET): Translate colons,
to cope with DOS-style absolute paths, when constructing
${ac_make}.
* lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS, _AC_OUTPUT_FILES):
When constructing paths with IFS=:, quote the path. If we're
constructing a DOS-style absolute path, we don't want to split it
on the colon.
* tests/atspecific.m4 (AT_CHECK_CONFIGURE): Fix typo
in description.
2003-02-28 10:11:07 +00:00
Alexandre Duret-Lutz
020483fc8e * bin/autoscan.in (scan_file): Scan Makefile.am too. Ignore
Makefile.in if Makefile.am exists.
(output): Strip `.am' from Makefiles.  Don't
output AC_CONFIG_FILES if no Makefiles were found.
2002-11-07 14:11:31 +00:00
Akim Demaille
bd71c86380 * bin/autoscan.in (output): Output AC_PREREQ.
(%needed_macros): Add AC_PREREQ so that configure.ac without one
be reported.
2002-10-25 08:22:52 +00:00
Akim Demaille
9dfa6d9aa3 * bin/autoscan.in (@kinds): Make them singular.
Adjust all uses.
(&init_tables): When --debug, report the list of rules to ease
tracking changes in autoscan.list.
* lib/autoscan/autoscan.list (function): Strip comments, sort.
2002-09-28 14:03:14 +00:00
Akim Demaille
51de11a561 * lib/autoscan/functions, lib/autoscan/headers,
* lib/autoscan/identifiers, lib/autoscan/makevars,
* lib/autoscan/programs: Merge into...
* lib/autoscan/autoscan.list: this.
* bin/autoscan.in (&init_tables): Adjust.
2002-09-28 14:02:11 +00:00
Akim Demaille
d8a2311821 * lib/autoscan/functions, lib/autoscan/headers,
* lib/autoscan/identifiers, lib/autoscan/makevars,
* lib/autoscan/programs: Make the `kind' explicit, i.e., each
`functions' line is now prefixed with `function:'.
* bin/autoscan.in (&init_tables): Adjust.
2002-09-28 14:01:11 +00:00
Akim Demaille
0d44ad22d0 From now on, autoscan files must always map a macro name to a
word: there is no `default' macro for autoscan.
* bin/autoscan.in (&init_tables): Reject entries with no macro at
all.
* lib/autoscan/functions, lib/autoscan/headers: Make the macro
explicit.
2002-09-28 14:00:35 +00:00
Akim Demaille
a670d9bc40 * bin/autoscan.in (%c_keywords): Remove.
(&used): Keep only track of the words we might be interested in.
(&output_kind): It is no longer needed to look for non active
checks.
2002-09-28 13:59:59 +00:00
Akim Demaille
686b49d823 * bin/autoscan.in: Improve the comments.
(&parse_args): Drop obsolete undocumented options.
(&output_kind): Output warnings.
* lib/autoscan/functions: (dcgettext): Now trigger AM_GNU_GETTEXT.
(getwd): Trigger a warning.
2002-09-27 07:35:39 +00:00
Akim Demaille
5bcbc9d67a * bin/autoscan.in (&parse_args): Pass a reference to the lists, not
the lists.
2002-09-12 15:04:18 +00:00
Akim Demaille
1f064c63b6 * lib/Autom4te/General.pm (&update_file): s/die/error/.
Reported by Raja R. Harinath.
* bin/autoheader.in, bin/autoreconf.in, bin/autoscan.in,
* bin/autoupdate.in: Use error instead of die.
2002-09-02 07:41:56 +00:00
Paul Eggert
66d5f073b5 2002-07-17 Mark D. Roth <roth@feep.net>
* configure.ac: Add --enable-site-macro-dir option.
	* bin/Makefile.am: Expand @SITE_MACRO_DIR@.
	* bin/autom4te.in: Add --prepend-include, --include-envvar, and
	--site-macro-subdir options.
	* bin/autoconf.in: Add --prepend-include option.
	* bin/autoheader.in: Add --prepend-include option.
	* bin/autoreconf.in: Add --prepend-include option.
	* bin/autoscan.in: Add --prepend-include option.
	* bin/autoupdate.in: Add --prepend-include option.
	* doc/autoconf.texi: Document use of $AC_MACRO_PATH and site
	macro directory, remove note that include path directories are
	used in reverse order, and document --prepend-include option.
	* lib/autom4te.in: Use --prepend-include instead of --include.
	* tests/wrapsh.in: Use --prepend-include instead of --include.
2002-07-17 08:30:42 +00:00
Paul Eggert
9edd82d2ee * bin/autoconf.as (AUTOM4TE): Default to a fully qualified path
name, so that symlinks to 'autoconf' work properly.  Bug reported
by Bruno Haible.
* bin/autoheader.in (AUTOM4TE): Likewise.
* bin/autoreconf.in (autoconf, autoheader): Likewise.
* bin/autoscan.in (autom4te): Likewise.
* bin/autoupdate.in (autom4te): Likewise.
2002-06-12 17:26:19 +00:00
Paul Eggert
d4116a3b2f Use 'case' statement to work around "$@" shell problem. 2002-04-19 18:59:59 +00:00
Akim Demaille
000289a83d * bin/autoscan.in (scan_file): Specify the location in `&used'
invocations.
From Nicolas Joly.
2002-03-19 15:25:26 +00:00
Akim Demaille
2399c3c6a6 * bin/autoconf.in, bin/autoheader.in, bin/autom4te.in,
* bin/autoreconf.in, bin/autoscan.in, bin/autoupdate.in,
* bin/ifnames.in: Copyright update.
2002-03-08 11:46:31 +00:00
Akim Demaille
8722aef4db * bin/autoheader.in, bin/autoconf.in, bin/autoscan.in,
* doc/autoconf.texi: Finally add Akim as an author.
2002-01-24 18:41:16 +00:00
Akim Demaille
6de8a0df09 * bin/autoscan.in (scan_file): Use `&used'. 2002-01-06 20:47:57 +00:00
Akim Demaille
4f944b43d5 * bin/autoscan.in (%c_keywords): Build it at top level.
Map to 1 in order to simplify its uses.
2001-11-26 10:53:00 +00:00
Akim Demaille
32e1426355 * bin/autoscan.in (&scan_c_file, &scan_sh_file, &scan_makefile):
Remove $filepath, useless.
(&scan_makefile): Don't remove the $(FOO), ${FOO} and @FOO@
variables, they are really part of the tokens.
Split the input line on spaces and then look for tokens.
Now autoscan ceases to ask for AC_PROG_LEX for the package Bison
because of `lex$U.$(OBJEXT)'.
(&scan_files): Use "@list" instead of join.
* doc/Makefile.am (CLEANFILES): Add *.fns.
2001-11-26 10:52:46 +00:00
Akim Demaille
d1228cd752 * bin/autoscan.in (used): New.
Use it.
2001-11-26 10:51:44 +00:00
Akim Demaille
6e35b89f81 * bin/autoscan.in (&scan_c_file): Better parsing of CPP
directives.
(&scan_sh_file): Remove a duplicate pattern.
(&check_configure_ac): Use long options.
* lib/autoscan/headers (alloca.h): Check with AC_FUNC_ALLOCA.
2001-11-26 10:51:29 +00:00