diff -Naur autoconf-2.67/ChangeLog autoconf-2.67-magellan/ChangeLog --- autoconf-2.67/ChangeLog 2010-07-22 00:16:44.000000000 +0200 +++ autoconf-2.67-magellan/ChangeLog 2010-08-19 21:50:24.000000000 +0200 @@ -1,3 +1,14 @@ +2010-08-14 Eric Blake + + AC_INIT: allow bugreport to contain '?' + * lib/autoconf/general.m4 (_AC_INIT_PACKAGE): Relax check. + * tests/base.at (AC_INIT with unusual version strings): Enhance + test. + * doc/autoconf.texi (Initializing configure): Document this. + * NEWS: Likewise. + * THANKS: Update. + Reported by Yavor Doganov and others. + 2010-07-21 Eric Blake Release Version 2.67. diff -Naur autoconf-2.67/doc/autoconf.texi autoconf-2.67-magellan/doc/autoconf.texi --- autoconf-2.67/doc/autoconf.texi 2010-07-21 23:58:24.000000000 +0200 +++ autoconf-2.67-magellan/doc/autoconf.texi 2010-08-19 21:52:00.000000000 +0200 @@ -1888,7 +1888,8 @@ @acindex{PACKAGE_BUGREPORT} @ovindex PACKAGE_BUGREPORT @cvindex PACKAGE_BUGREPORT -Exactly @var{bug-report}, if one was provided. +Exactly @var{bug-report}, if one was provided. Typically an email +address, or URL to a bug management web page. @item @code{AC_PACKAGE_URL}, @code{PACKAGE_URL} @acindex{PACKAGE_URL} diff -Naur autoconf-2.67/lib/autoconf/general.m4 autoconf-2.67-magellan/lib/autoconf/general.m4 --- autoconf-2.67/lib/autoconf/general.m4 2010-07-20 15:56:53.000000000 +0200 +++ autoconf-2.67-magellan/lib/autoconf/general.m4 2010-08-19 21:52:34.000000000 +0200 @@ -239,7 +239,7 @@ m4_define([_AC_INIT_PACKAGE], [_AC_INIT_LITERAL([$1]) _AC_INIT_LITERAL([$2]) -AS_LITERAL_IF([$3], [], [m4_warn([syntax], [AC_INIT: not a literal: $3])]) +_AC_INIT_LITERAL([$3]) m4_ifndef([AC_PACKAGE_NAME], [m4_define([AC_PACKAGE_NAME], [$1])]) m4_ifndef([AC_PACKAGE_TARNAME], diff -Naur autoconf-2.67/NEWS autoconf-2.67-magellan/NEWS --- autoconf-2.67/NEWS 2010-07-22 00:16:40.000000000 +0200 +++ autoconf-2.67-magellan/NEWS 2010-08-19 21:50:52.000000000 +0200 @@ -1,5 +1,8 @@ GNU Autoconf NEWS - User visible changes. +** AC_INIT again allows URLs with '?' for its BUG-REPORT argument. + Regression introduced in 2.66. + * Major changes in Autoconf 2.67 (2010-07-21) [stable] Released by Eric Blake, based on git versions 2.66.*. diff -Naur autoconf-2.67/tests/base.at autoconf-2.67-magellan/tests/base.at --- autoconf-2.67/tests/base.at 2010-07-20 15:55:23.000000000 +0200 +++ autoconf-2.67-magellan/tests/base.at 2010-08-19 21:55:03.000000000 +0200 @@ -227,7 +227,7 @@ AT_DATA([configure.ac], [[AC_INIT([GNU String++ with spaces (foo)], - [2.48++ (2010-07-03)], [http://clisp.cons.org/], [clisp]) + [2.48++ (2010-07-03)], [[http://example.com/?a=b&c=d#e]], [clisp]) AC_OUTPUT ]]) @@ -239,18 +239,21 @@ AT_CHECK_AUTOCONF([-Werror]) AT_CHECK_CONFIGURE([-q]) -AT_CHECK_CONFIGURE([--help]) +AT_CHECK_CONFIGURE([--help], [], [stdout]) +AT_CHECK([[$FGREP 'com/?a=b&c=d#e' stdout]], [], [ignore]) AT_CHECK_CONFIGURE([--version], [], [stdout]) AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore]) AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore]) +AT_CHECK([./config.status --help], [], [stdout]) +AT_CHECK([[$FGREP 'com/?a=b&c=d#e' stdout]], [], [ignore]) AT_CHECK([./config.status --version], [], [stdout]) AT_CHECK([$FGREP 'GNU String++ with spaces (foo)' stdout], [], [ignore]) AT_CHECK([$FGREP '2.48++ (2010-07-03)' stdout], [], [ignore]) AT_DATA([configure.ac], [[AC_INIT([GNU "String++"], - [2.48], [http://clisp.cons.org/], [clisp]) + [2.48], [http://example.com/], [clisp]) AC_OUTPUT ]]) @@ -259,7 +262,7 @@ AT_DATA([configure.ac], [[AC_INIT([GNU String++], - ['codename' 2.48], [http://clisp.cons.org/], [clisp]) + ['codename' 2.48], [http://example.com/], [clisp]) AC_OUTPUT ]]) @@ -268,7 +271,7 @@ AT_DATA([configure.ac], [[AC_INIT([GNU -String++], [2.48], [http://clisp.cons.org/], [clisp]) +String++], [2.48], [http://example.com/], [clisp]) AC_OUTPUT ]]) diff -Naur autoconf-2.67/THANKS autoconf-2.67-magellan/THANKS --- autoconf-2.67/THANKS 2010-05-12 16:34:40.000000000 +0200 +++ autoconf-2.67-magellan/THANKS 2010-08-19 21:51:14.000000000 +0200 @@ -406,6 +406,7 @@ Wilfredo Sanchez wsanchez@apple.com William Pursell bill.pursell@gmail.com Wolfgang Mueller Wolfgang.Mueller@cui.unige.ch +Yavor Doganov yavor@gnu.org Yury Puhalsky pooh@cryptopro.ru Zack Weinberg zack@codesourcery.com ? Seanster@Seanster.com