mirror/gcc
1
0
Fork 0
mirror of https://github.com/gcc-mirror/gcc.git synced 2024-11-21 13:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backport: Deal with Autoconf 2.62's semantic change in m4_append.

Browse Source 
2008-03-16  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

	Backport from upstream Libtool:
	
	2007-10-12  Eric Blake  <ebb9@byu.net>
	
	Deal with Autoconf 2.62's semantic change in m4_append.
	* ltsugar.m4 (lt_append): Replace broken versions of
	m4_append.
	(lt_if_append_uniq): Don't require separator to be overquoted,
	and avoid broken m4_append.
	(lt_dict_add): Fix typo.
	* libtool.m4 (_LT_DECL): Don't overquote separator.

From-SVN: r133267
This commit is contained in:
Ralf Wildenhues 2008-03-16 06:47:18 +00:00 committed by Ralf Wildenhues
parent 80efdb6af5
commit 32bc4cf410
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2008-03-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Backport from upstream Libtool:
2007-10-12 Eric Blake <ebb9@byu.net>
Deal with Autoconf 2.62's semantic change in m4_append.
* ltsugar.m4 (lt_append): Replace broken versions of
m4_append.
(lt_if_append_uniq): Don't require separator to be overquoted,
and avoid broken m4_append.
(lt_dict_add): Fix typo.
* libtool.m4 (_LT_DECL): Don't overquote separator.
2008-03-13 David Edelsohn <edelsohn@gnu.org> 2008-03-13 David Edelsohn <edelsohn@gnu.org>
* config.rpath: Add AIX 6 support. * config.rpath: Add AIX 6 support.

2
libtool.m4 vendored
View File

@ -319,7 +319,7 @@ m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
# VALUE may be 0, 1 or 2 for a computed quote escaped value based on # VALUE may be 0, 1 or 2 for a computed quote escaped value based on
# VARNAME. Any other value will be used directly. # VARNAME. Any other value will be used directly.
m4_define([_LT_DECL], m4_define([_LT_DECL],
[lt_if_append_uniq([lt_decl_varnames], [$2], [[, ]], [lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
[lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
[m4_ifval([$1], [$1], [$2])]) [m4_ifval([$1], [$1], [$2])])
lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])

26
ltsugar.m4 vendored
View File

@ -1,13 +1,13 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
# #
# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
# Written by Gary V. Vaughan. # Written by Gary V. Vaughan.
# #
# This file is free software; the Free Software Foundation gives # This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without # unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved. # modifications, as long as this notice is preserved.
# serial 3 ltsugar.m4 # serial 4 ltsugar.m4
# This is to help aclocal find these macros, as it can't see m4_define. # This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
@ -46,6 +46,20 @@ m4_define([lt_cdr],
m4_define([lt_unquote], $1) m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
# Note that neither SEPARATOR nor STRING are expanded. No SEPARATOR is
# output if MACRO-NAME was previously undefined (different than defined
# and empty).
# This macro is needed until we can rely on Autoconf 2.62, since earlier
# versions of m4 mistakenly expanded SEPARATOR.
m4_define([lt_append],
[m4_define([$1],
m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) # lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
# ---------------------------------------------------------- # ----------------------------------------------------------
# Produce a SEP delimited list of all paired combinations of elements of # Produce a SEP delimited list of all paired combinations of elements of
@ -67,10 +81,10 @@ m4_define([lt_combine],
# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. # by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
m4_define([lt_if_append_uniq], m4_define([lt_if_append_uniq],
[m4_ifdef([$1], [m4_ifdef([$1],
[m4_bmatch($3[]m4_defn([$1])$3, $3[]m4_re_escape([$2])$3, [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
[$5], [lt_append([$1], [$2], [$3])$4],
[m4_append([$1], [$2], [$3])$4])], [$5])],
[m4_append([$1], [$2], [$3])$4])]) [lt_append([$1], [$2], [$3])$4])])
# lt_dict_add(DICT, KEY, VALUE) # lt_dict_add(DICT, KEY, VALUE)