From 154e3e544d2e89cd1fcf113d2048f96d09a6a418 Mon Sep 17 00:00:00 2001 From: Ralf Menzel Date: Sat, 11 Jun 2005 11:12:28 +0000 Subject: [PATCH] * m4/ltoptions.m4 (_LT_SET_OPTIONS): Loop options only if nonempty. * m4/ltsugar.m4 (lt_combine): Don't test against empty quotes, test against empty arg. Fixes infinite m4 loop with CVS Autoconf. --- ChangeLog | 8 ++++++++ m4/ltoptions.m4 | 14 ++++++++------ m4/ltsugar.m4 | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63cb0f7c3..521d49d17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-06-11 Ralf Menzel , + Ralf Wildenhues + + * m4/ltoptions.m4 (_LT_SET_OPTIONS): Loop options only if + nonempty. + * m4/ltsugar.m4 (lt_combine): Don't test against empty quotes, + test against empty arg. Fixes infinite m4 loop with CVS Autoconf. + 2005-06-11 Ralf Wildenhues * m4/libtool.m4 (_LT_COMPILER_OPTION, _LT_LINKER_OPTION): No diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 21050cd10..c4a70448e 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -51,12 +51,14 @@ m4_ifdef([$0_found], [m4_undefine([$0_found])], [$2 # dispatch to that macro; otherwise complain about the unknown option # and exit. m4_define([_LT_SET_OPTIONS], -[AC_FOREACH([_LT_Option], [$1], - [_LT_SET_OPTION(_LT_Option) - m4_ifdef(_LT_MANGLE_DEFUN(_LT_Option), - _LT_MANGLE_DEFUN(_LT_Option), - [m4_fatal([Unknown option `]_LT_Option[' to LT][_INIT_LIBTOOL])]) - ])dnl +[m4_if([$1], [], [], + [AC_FOREACH([_LT_Option], [$1], + [_LT_SET_OPTION(_LT_Option) + m4_ifdef(_LT_MANGLE_DEFUN(_LT_Option), + _LT_MANGLE_DEFUN(_LT_Option), + [m4_fatal([Unknown option `]_LT_Option[' to LT][_INIT_LIBTOOL])]) + ])dnl + ]) dnl dnl Simply set some default values (i.e off) if boolean options were not dnl specified: diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 692925b45..f5ad61e36 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -38,7 +38,7 @@ m4_define([lt_join], # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list # has the form PREFIXmINFIXSUFFIXn. m4_define([lt_combine], -[m4_if([$2], [[]], [], +[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, $@)))])]) -- 2.47.2