From: Akim Demaille Date: Fri, 16 May 2003 09:54:46 +0000 (+0000) Subject: * bin/autoheader.in, bin/autom4te.in, bin/autoreconf.in, X-Git-Tag: AUTOCONF-2.57a~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62930d7b99992ea07e52fe010fdcf2cbef14b9e7;p=thirdparty%2Fautoconf.git * 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. --- diff --git a/ChangeLog b/ChangeLog index f1a0be756..041ec9dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-05-16 Akim Demaille + + * 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-14 Akim Demaille * tests/foreign.at (Libtool): Skip all Libtools pre 1.4. diff --git a/THANKS b/THANKS index 751985789..f680bbf5e 100644 --- a/THANKS +++ b/THANKS @@ -122,6 +122,7 @@ Markku Savela msa@msa.tte.vtt.fi Markus Oberhumer markus.oberhumer@jk.uni-linz.ac.at Martin Buchholz martin@xemacs.org Martin Frydl martin@systinet.com +Martin Mokrej mmokrejs@natur.cuni.cz Martin Wilck martin@tropos.de Martyn Johnson Martyn.Johnson@cl.cam.ac.uk Matthew D. Langston langston@SLAC.Stanford.EDU diff --git a/bin/autoconf.as b/bin/autoconf.as index a9a4296b2..0f808427a 100644 --- a/bin/autoconf.as +++ b/bin/autoconf.as @@ -1,6 +1,6 @@ AS_INIT[]dnl -*- shell-script -*- # autoconf -- create `configure' using m4 macros -# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002 +# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -62,7 +62,7 @@ version=["\ autoconf (@PACKAGE_NAME@) @VERSION@ Written by David J. MacKenzie and Akim Demaille. -Copyright 2002 Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."] diff --git a/bin/autoconf.in b/bin/autoconf.in index 7da2c18c2..b3910465e 100644 --- a/bin/autoconf.in +++ b/bin/autoconf.in @@ -34,7 +34,7 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -69,7 +69,7 @@ echo X/"$0" | # autoconf -- create `configure' using m4 macros -# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002 +# Copyright (C) 1992, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -131,7 +131,7 @@ version="\ autoconf (@PACKAGE_NAME@) @VERSION@ Written by David J. MacKenzie and Akim Demaille. -Copyright 2002 Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." diff --git a/bin/autoheader.in b/bin/autoheader.in index adf6d822d..59ea90b29 100644 --- a/bin/autoheader.in +++ b/bin/autoheader.in @@ -6,7 +6,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' if 0; # autoheader -- create `config.h.in' from `configure.ac' -# Copyright (C) 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001, 2002 +# Copyright (C) 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -29,8 +29,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' BEGIN { - my $perllibdir = $ENV{'autom4te_perllibdir'} || '@datadir@'; - unshift @INC, "$perllibdir"; + my $datadir = $ENV{'autom4te_perllibdir'} || '@datadir@'; + unshift @INC, "$datadir"; # Override SHELL. On DJGPP SHELL may not be set to a shell # that can handle redirection and quote arguments correctly, @@ -92,7 +92,7 @@ $version = <<"END"; autoheader (@PACKAGE_NAME@) @VERSION@ Written by Roland McGrath and Akim Demaille. -Copyright 2002 Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. END diff --git a/bin/autom4te.in b/bin/autom4te.in index 238f81e7d..cb9fa748a 100644 --- a/bin/autom4te.in +++ b/bin/autom4te.in @@ -26,8 +26,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' BEGIN { - my $datadir = ($ENV{'autom4te_perllibdir'} || '@datadir@'); - unshift @INC, "$datadir"; + my $datadir = $ENV{'autom4te_perllibdir'} || '@datadir@'; + unshift @INC, $datadir; # Override SHELL. On DJGPP SHELL may not be set to a shell # that can handle redirection and quote arguments correctly, diff --git a/bin/autoreconf.in b/bin/autoreconf.in index 4e0e09f2a..5e29f495f 100644 --- a/bin/autoreconf.in +++ b/bin/autoreconf.in @@ -29,8 +29,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' BEGIN { - my $perllibdir = $ENV{'autom4te_perllibdir'} || '@datadir@'; - unshift @INC, "$perllibdir"; + my $datadir = $ENV{'autom4te_perllibdir'} || '@datadir@'; + unshift @INC, $datadir; # Override SHELL. On DJGPP SHELL may not be set to a shell # that can handle redirection and quote arguments correctly, diff --git a/bin/autoscan.in b/bin/autoscan.in index a27afc833..2851bc4fb 100644 --- a/bin/autoscan.in +++ b/bin/autoscan.in @@ -1,7 +1,8 @@ #! @PERL@ -w # -*- perl -*- # autoscan - Create configure.scan (a preliminary configure.ac) for a package. -# Copyright (C) 1994, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,8 +26,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' BEGIN { - my $perllibdir = $ENV{'autom4te_perllibdir'} || "@datadir@"; - unshift @INC, "$perllibdir"; + my $datadir = $ENV{'autom4te_perllibdir'} || '@datadir@'; + unshift @INC, $datadir; # Override SHELL. On DJGPP SHELL may not be set to a shell # that can handle redirection and quote arguments correctly, @@ -119,7 +120,7 @@ Report bugs to .\n"; $version = "autoscan (@PACKAGE_NAME@) @VERSION@ Written by David J. MacKenzie and Akim Demaille. -Copyright 2002 Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; diff --git a/bin/autoupdate.in b/bin/autoupdate.in index 4976ea9b7..02367c0ed 100644 --- a/bin/autoupdate.in +++ b/bin/autoupdate.in @@ -1,7 +1,8 @@ #! @PERL@ -w # -*- perl -*- # autoupdate - modernize an Autoconf file. -# Copyright (C) 1994, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,8 +27,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' BEGIN { - my $perllibdir = $ENV{'autom4te_perllibdir'} || "@datadir@"; - unshift @INC, "$perllibdir"; + my $datadir = $ENV{'autom4te_perllibdir'} || '@datadir@'; + unshift @INC, $datadir; # Override SHELL. On DJGPP SHELL may not be set to a shell # that can handle redirection and quote arguments correctly, @@ -79,7 +80,7 @@ Report bugs to . $version = "autoupdate (@PACKAGE_NAME@) @VERSION@ Written by David J. MacKenzie and Akim Demaille. -Copyright 2002 Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "; diff --git a/bin/ifnames.in b/bin/ifnames.in index b0f50197a..5d6c6ceee 100644 --- a/bin/ifnames.in +++ b/bin/ifnames.in @@ -7,7 +7,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' # ifnames - print the identifiers used in C preprocessor conditionals -# Copyright (C) 1994, 1995, 1999, 2000, 2001, 2002 Free Software +# Copyright (C) 1994, 1995, 1999, 2000, 2001, 2002, 2003 Free Software # Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -33,8 +33,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' BEGIN { - my $datadir = ($ENV{'autom4te_perllibdir'} || '@datadir@'); - unshift @INC, "$datadir"; + my $datadir = $ENV{'autom4te_perllibdir'} || '@datadir@'; + unshift @INC, $datadir; # Override SHELL. On DJGPP SHELL may not be set to a shell # that can handle redirection and quote arguments correctly, @@ -69,7 +69,7 @@ $version = "\ ifnames (@PACKAGE_NAME@) @VERSION@ Written by David J. MacKenzie and Paul Eggert. -Copyright 2002 Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "; diff --git a/man/autoconf.1 b/man/autoconf.1 index f15f00ef1..8d5e0b470 100644 --- a/man/autoconf.1 +++ b/man/autoconf.1 @@ -74,12 +74,13 @@ also trace Autoconf's initialization process In tracing mode, no configuration script is created. .SH AUTHOR Written by David J. MacKenzie and Akim Demaille. -.PP -Copyright 2002 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "REPORTING BUGS" Report bugs to . +.SH COPYRIGHT +Copyright \(co 2003 Free Software Foundation, Inc. +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "SEE ALSO" .BR autoconf (1), .BR automake (1), diff --git a/man/autoheader.1 b/man/autoheader.1 index 1ad1fc1c5..66f6bdc64 100644 --- a/man/autoheader.1 +++ b/man/autoheader.1 @@ -52,12 +52,13 @@ prepend directory DIR to search path append directory DIR to search path .SH AUTHOR Written by Roland McGrath and Akim Demaille. -.PP -Copyright 2002 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "REPORTING BUGS" Report bugs to . +.SH COPYRIGHT +Copyright \(co 2003 Free Software Foundation, Inc. +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "SEE ALSO" .BR autoconf (1), .BR automake (1), diff --git a/man/autoscan.1 b/man/autoscan.1 index 2b09e4596..7b5c90de8 100644 --- a/man/autoscan.1 +++ b/man/autoscan.1 @@ -32,12 +32,13 @@ prepend directory DIR to search path append directory DIR to search path .SH AUTHOR Written by David J. MacKenzie and Akim Demaille. -.PP -Copyright 2002 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "REPORTING BUGS" Report bugs to . +.SH COPYRIGHT +Copyright \(co 2003 Free Software Foundation, Inc. +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "SEE ALSO" .BR autoconf (1), .BR automake (1), diff --git a/man/autoupdate.1 b/man/autoupdate.1 index 0784a7853..0c12c0801 100644 --- a/man/autoupdate.1 +++ b/man/autoupdate.1 @@ -34,12 +34,13 @@ prepend directory DIR to search path append directory DIR to search path .SH AUTHOR Written by David J. MacKenzie and Akim Demaille. -.PP -Copyright 2002 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "REPORTING BUGS" Report bugs to . +.SH COPYRIGHT +Copyright \(co 2003 Free Software Foundation, Inc. +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "SEE ALSO" .BR autoconf (1), .BR automake (1), diff --git a/man/ifnames.1 b/man/ifnames.1 index 44080f164..40e85a885 100644 --- a/man/ifnames.1 +++ b/man/ifnames.1 @@ -19,14 +19,15 @@ print this help, then exit print version number, then exit .SH AUTHOR Written by David J. MacKenzie and Paul Eggert. -.PP -Copyright 2002 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "REPORTING BUGS" Report bugs to . .PP ifnames (GNU Autoconf) 2.57a +.SH COPYRIGHT +Copyright \(co 2003 Free Software Foundation, Inc. +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. .SH "SEE ALSO" .BR autoconf (1), .BR automake (1),