From 64000cf1f891b8c64b9ad12f7b0f06075ba403b7 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Sat, 14 Aug 2010 19:17:04 +0000 Subject: 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. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index cfa3c0f..356d78f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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-08-10 Peter Rosin Keep testsuite files on unexpected pass. diff --git a/NEWS b/NEWS index d7c74df..3c0aed3 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,9 @@ GNU Autoconf NEWS - User visible changes. ** AT_BANNER() with empty argument will cause visual separation from previous test category. +** 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 --git a/THANKS b/THANKS index e26eb88..3b23589 100644 --- a/THANKS +++ b/THANKS @@ -408,6 +408,7 @@ Werner Lemberg wl@gnu.org 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 diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 0f04b10..05705f2 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -1888,7 +1888,8 @@ Exactly @samp{@var{package} @var{version}}. @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 --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 8e9c8cf..99cc326 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -239,7 +239,7 @@ m4_define([_AC_INIT_LITERAL], 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 --git a/tests/base.at b/tests/base.at index 3fcc096..4ba0140 100644 --- a/tests/base.at +++ b/tests/base.at @@ -227,7 +227,7 @@ AT_SETUP([AC_INIT with unusual version strings]) 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 @@ fi 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_CHECK([grep 'AC_INIT: not a literal: ' stderr], [], [ignore]) 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_CHECK([grep 'AC_INIT: not a literal: ' stderr], [], [ignore]) AT_DATA([configure.ac], [[AC_INIT([GNU -String++], [2.48], [http://clisp.cons.org/], [clisp]) +String++], [2.48], [http://example.com/], [clisp]) AC_OUTPUT ]]) -- cgit v0.8.3.2