[libmicrohttpd] 02/06: helper m4 macros: minor code simplification

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

commit 66f8a4b5c58a1bd2cfc11ad2a693ec8189662a1f
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Mon Apr 11 09:34:16 2022 +0300

    helper m4 macros: minor code simplification
---
 m4/mhd_append_flag_to_var.m4  | 6 ++++--
 m4/mhd_prepend_flag_to_var.m4 | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/m4/mhd_append_flag_to_var.m4 b/m4/mhd_append_flag_to_var.m4
index ee9e71cd..261110c0 100644
--- a/m4/mhd_append_flag_to_var.m4
+++ b/m4/mhd_append_flag_to_var.m4
@@ -22,7 +22,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 1
+#serial 2
 
 AC_DEFUN([MHD_APPEND_FLAG_TO_VAR],[dnl
 m4_ifblank([$1],[m4_fatal([$0: First macro argument must not be empty])])dnl
@@ -35,7 +35,9 @@ m4_bmatch([$2],[\$],dnl
 [dnl The second parameter is a variable value
 AS_IF([test -z "_mhd_norm_expd([$2])"],dnl
 [varExtd="${varExtd}"],dnl
-[AS_IF([test -z 
"${varExtd}"],[varExtd="_mhd_norm_expd([$2])"],[varExtd="${varExtd} 
_mhd_norm_expd([$2])"])])
+[test -z "${varExtd}"],dnl
+[varExtd="_mhd_norm_expd([$2])"],dnl
+[varExtd="${varExtd} _mhd_norm_expd([$2])"])
 ],dnl
 [dnl The second parameter is not a variable value
 m4_ifnblank(_mhd_norm_expd([$2]),dnl
diff --git a/m4/mhd_prepend_flag_to_var.m4 b/m4/mhd_prepend_flag_to_var.m4
index 788ce3ca..1d0bd1c3 100644
--- a/m4/mhd_prepend_flag_to_var.m4
+++ b/m4/mhd_prepend_flag_to_var.m4
@@ -22,7 +22,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 1
+#serial 2
 
 AC_DEFUN([MHD_PREPEND_FLAG_TO_VAR],[dnl
 m4_ifblank([$1],[m4_fatal([$0: First macro argument must not be empty])])dnl
@@ -35,7 +35,9 @@ m4_bmatch([$2],[\$],dnl
 [dnl The second parameter is a variable value
 AS_IF([test -z "_mhd_norm_expd([$2])"],dnl
 [varExtd="${varExtd}"],dnl
-[AS_IF([test -z 
"${varExtd}"],[varExtd="_mhd_norm_expd([$2])"],[varExtd="_mhd_norm_expd([$2]) 
${varExtd}"])])
+[test -z "${varExtd}"],dnl
+[varExtd="_mhd_norm_expd([$2])"],dnl
+[varExtd="_mhd_norm_expd([$2]) ${varExtd}"])
 ],dnl
 [dnl The second parameter is not a variable value
 m4_ifnblank(_mhd_norm_expd([$2]),dnl

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.