autoconf-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] AC_INIT: allow bugreport to contain '?'


From: Eric Blake
Subject: [PATCH] AC_INIT: allow bugreport to contain '?'
Date: Sat, 14 Aug 2010 13:21:38 -0600

* 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.
---

> > I'll work on a patch, although it may be a few days (I've got some other
> > things that are taking my priority at the moment).
> Would you like help on this issue (in a couple of days at the earliest)?
> If yes, do you think it needs different treatment from the first two
> arguments?

I think this gets it.  And in the testsuite, I intentionally threw
a tough URL through the works.

Hmm; before I push this, I will s/clisp.cons.org/example.com/ in
the testsuite, so that we don't hammer our Clisp friends website
with bad requests.  Plus actually make the change to THANKS, as
mentioned in the ChangeLog.  But those two tweaks don't affect
the meat of the patch itself, which is the one-liner in lib.

 ChangeLog               |   11 +++++++++++
 NEWS                    |    3 +++
 doc/autoconf.texi       |    3 ++-
 lib/autoconf/general.m4 |    2 +-
 tests/base.at           |    7 +++++--
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cfa3c0f..356d78f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-14  Eric Blake  <address@hidden>
+
+       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  <address@hidden>

        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/doc/autoconf.texi b/doc/autoconf.texi
index 0f04b10..52553dd 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -1888,7 +1888,8 @@ Initializing configure
 @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..6855950 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://clisp.cons.org/?a=b&c=d#e]], [clisp])
 AC_OUTPUT
 ]])

@@ -239,11 +239,14 @@ fi

 AT_CHECK_AUTOCONF([-Werror])
 AT_CHECK_CONFIGURE([-q])
-AT_CHECK_CONFIGURE([--help])
+AT_CHECK_CONFIGURE([--help], [], [stdout])
+AT_CHECK([[$FGREP 'org/?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 'org/?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])
-- 
1.7.2.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]