From: Pavel Roskin Date: Wed, 20 Sep 2000 10:45:10 +0000 (+0000) Subject: * libm4.m4 (m4_ifvanl): Don't output a newline for empty X-Git-Tag: autoconf-2.50~620 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=5eda671dae2174f8f8b03c966887294699ec7af1;p=thirdparty%2Fautoconf.git * libm4.m4 (m4_ifvanl): Don't output a newline for empty arguments --- diff --git a/ChangeLog b/ChangeLog index 2aa4c43ed..f7a131741 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-09-20 Pavel Roskin + + * libm4.m4 (m4_ifvanl): Don't output a newline for empty + arguments + 2000-09-19 Akim Demaille * tests/atspecific.m4 (AT_TEST_MACRO): Rename as... diff --git a/libm4.m4 b/libm4.m4 index c125eed04..1a46c28b3 100644 --- a/libm4.m4 +++ b/libm4.m4 @@ -184,12 +184,13 @@ define([ifval], [ifelse([$1], [], [$3], [$2])]) # m4_ifvanl(COND, [IF-TRUE], [IF-FALSE]) # -------------------------------------- -# Same as `ifval', but add an extra newline to IF-TRUE or IF-FALSE. +# Same as `ifval', but add an extra newline to IF-TRUE or IF-FALSE +# unless that argument is empty. define([m4_ifvanl], [ifelse([$1], [], -[$3 -], -[$2 -])]) +[ifelse([$3], [], [], [$3 +])], +[ifelse([$2], [], [], [$2 +])])]) # ifset(MACRO, [IF-TRUE], [IF-FALSE])