From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 17 Jun 2005 12:42:34 +0000 (+0000)
Subject: * m4/ltsugar.m4 (lt_car, lt_cdr): New macros, clones of m4_car/m4_cdr
X-Git-Tag: release-2-1b~630
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bd31694aca2b2d7c3872ac8a747a0b0e5c67aea;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.
---

diff --git a/ChangeLog b/ChangeLog
index c6d201b1c..9d2550de4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* 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.
+
 2005-06-11  Ralf Menzel  <menzel@ls6.cs.uni-dortmund.de>,
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
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], [, ])),