* libm4.m4 (m4_ifvanl): Don't output a newline for empty

        arguments

diff --git a/ChangeLog b/ChangeLog
index 2aa4c43ed25abdb72f0a2d461baa6a0ed9daa039..f7a13174111585086d4300b478b0bf178cb91cc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-20  Pavel Roskin  <proski@gnu.org>
+
+       * libm4.m4 (m4_ifvanl): Don't output a newline for empty
+       arguments
+
 2000-09-19  Akim Demaille  <akim@epita.fr>
 
        * tests/atspecific.m4 (AT_TEST_MACRO): Rename as...

diff --git a/libm4.m4 b/libm4.m4
index c125eed044101a9ec1c048e4278029a3876bbec3..1a46c28b3936dccbb03d693fe1bfcb7bdad8fbd0 100644 (file)
--- 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])