From 5bd8253dbb48e833946cae3a4fda58037b1f0b48 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 26 Mar 2007 15:40:00 +0000 Subject: [PATCH] 2007-03-26 H.J. Lu * acx.m4 (ACX_BUGURL): Set BUGURL first. Quote $BUGURL first when setting REPORT_BUGS_TEXI. --- bfd/ChangeLog | 4 ++++ bfd/configure | 19 +++++++++++++------ config/ChangeLog | 5 +++++ config/acx.m4 | 19 +++++++++++++------ 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index bc127a97e0..0f46403313 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2003-03-26 H.J. Lu + + * configure: Regenerated. + 2007-03-26 Alan Modra * elf32-spu.c (struct stubarr): Add stub_hash_table and err fields. diff --git a/bfd/configure b/bfd/configure index b32160b85a..97a0d3d844 100755 --- a/bfd/configure +++ b/bfd/configure @@ -4415,18 +4415,25 @@ if test "${with_bugurl+set}" = set; then yes) { { echo "$as_me:$LINENO: error: bug URL not specified" >&5 echo "$as_me: error: bug URL not specified" >&2;} { (exit 1); exit 1; }; } ;; - no) REPORT_BUGS_TO=""; - REPORT_BUGS_TEXI="" + no) BUGURL= ;; - *) REPORT_BUGS_TO="<$withval>" - REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" + *) BUGURL="$withval" ;; esac else - REPORT_BUGS_TO="" - REPORT_BUGS_TEXI="@uref{`echo http://www.sourceware.org/bugzilla/ | sed 's/@/@@/g'`}" + BUGURL="http://www.sourceware.org/bugzilla/" fi; + case ${BUGURL} in + "") + REPORT_BUGS_TO= + REPORT_BUGS_TEXI= + ;; + *) + REPORT_BUGS_TO="<$BUGURL>" + REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} + ;; + esac; diff --git a/config/ChangeLog b/config/ChangeLog index 1b9b27356a..7b1384daa4 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2007-03-26 H.J. Lu + + * acx.m4 (ACX_BUGURL): Set BUGURL first. Quote $BUGURL first + when setting REPORT_BUGS_TEXI. + 2007-03-23 H.J. Lu * acx.m4 (ACX_BUGURL): Replace "@" with "@@" for diff --git a/config/acx.m4 b/config/acx.m4 index b8676fc7af..bbe7b5e06f 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -577,16 +577,23 @@ AC_DEFUN([ACX_BUGURL],[ [Direct users to URL to report a bug]), [case "$withval" in yes) AC_MSG_ERROR([bug URL not specified]) ;; - no) REPORT_BUGS_TO=""; - REPORT_BUGS_TEXI="" + no) BUGURL= ;; - *) REPORT_BUGS_TO="<$withval>" - REPORT_BUGS_TEXI="@uref{`echo $withval | sed 's/@/@@/g'`}" + *) BUGURL="$withval" ;; esac], - REPORT_BUGS_TO="<$1>" - REPORT_BUGS_TEXI="@uref{`echo $1 | sed 's/@/@@/g'`}" + BUGURL="$1" ) + case ${BUGURL} in + "") + REPORT_BUGS_TO= + REPORT_BUGS_TEXI= + ;; + *) + REPORT_BUGS_TO="<$BUGURL>" + REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} + ;; + esac; AC_SUBST(REPORT_BUGS_TO) AC_SUBST(REPORT_BUGS_TEXI) ]) -- 2.34.1