From: Ralf Wildenhues Date: Fri, 17 Jun 2005 12:44:28 +0000 (+0000) Subject: * m4/ltsugar.m4 (lt_car, lt_cdr): New macros, clones of m4_car/m4_cdr X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94ded60fe3b9acc127d6ada628018f9f35c4e520;p=thirdparty%2Flibtool.git * m4/ltsugar.m4 (lt_car, lt_cdr): New macros, clones of m4_car/m4_cdr with the fixed semantics of Autoconf-59c CVS, in order to work with 2.59. (lt_combine): Use it. Reported by Christoph Egger . --- diff --git a/ChangeLog b/ChangeLog index 521d49d17..82b044429 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-17 Ralf Wildenhues + + * m4/ltsugar.m4 (lt_car, lt_cdr): New macros, clones of m4_car/m4_cdr + with the fixed semantics of Autoconf-59c CVS, in order to work with + 2.59. (lt_combine): Use it. + Reported by Christoph Egger . + 2005-06-11 Ralf Menzel , Ralf Wildenhues diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index f5ad61e36..69a131e34 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -32,6 +32,19 @@ m4_define([lt_join], ]) +# lt_car(LIST) +# lt_cdr(LIST) +# ------------ +# Manipulate m4 lists. +# These macros are necessary as long as will still need to support +# Autoconf-2.59 which quotes differently. +m4_define([lt_car], [[$1]]) +m4_define([lt_cdr], +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], + [$#], 1, [], + [m4_dquote(m4_shift($@))])]) + + # lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) # ---------------------------------------------------------- # Produce a SEP delimited list of all paired combinations of elements of @@ -40,8 +53,8 @@ m4_define([lt_join], m4_define([lt_combine], [m4_if([$2], [], [], [lt_join(m4_quote(m4_default([$1], [, ])), - _$0([$1], m4_car($2)[$3], m4_shiftn(3, $@)), - $0([$1], m4_cdr($2), m4_shiftn(2, $@)))])]) + _$0([$1], lt_car($2)[$3], m4_shiftn(3, $@)), + $0([$1], lt_cdr($2), m4_shiftn(2, $@)))])]) m4_define([_lt_combine], [m4_if([$3], [], [], [lt_join(m4_quote(m4_default([$1], [, ])),