diff options
author | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2022-03-31 15:43:39 +0300 |
---|---|---|
committer | Evgeny Grin (Karlson2k) <k2k@narod.ru> | 2022-04-03 20:17:42 +0300 |
commit | 203f6b604e99aaf35c4cc5a7b77aeb00530855fe (patch) | |
tree | 5e7b7faaf06186e1a326465234dd9b5d5860ddf9 /m4/mhd_check_func.m4 | |
parent | d39a3da584d4c952941b1f4f3233541141d0778b (diff) | |
download | libmicrohttpd-203f6b604e99aaf35c4cc5a7b77aeb00530855fe.tar.gz libmicrohttpd-203f6b604e99aaf35c4cc5a7b77aeb00530855fe.zip |
mhd_check_func.m4: fixed macro
Previously macro failed with comma-delimited and quoted parameters
Diffstat (limited to 'm4/mhd_check_func.m4')
-rw-r--r-- | m4/mhd_check_func.m4 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/m4/mhd_check_func.m4 b/m4/mhd_check_func.m4 index 42aefd86..342c12f9 100644 --- a/m4/mhd_check_func.m4 +++ b/m4/mhd_check_func.m4 | |||
@@ -48,19 +48,19 @@ | |||
48 | 48 | ||
49 | AC_DEFUN([MHD_CHECK_FUNC],[dnl | 49 | AC_DEFUN([MHD_CHECK_FUNC],[dnl |
50 | AC_PREREQ([2.64])dnl for AS_VAR_IF, m4_ifblank, m4_ifnblank | 50 | AC_PREREQ([2.64])dnl for AS_VAR_IF, m4_ifblank, m4_ifnblank |
51 | m4_ifblank(m4_translit($1,[()],[ ]), [m4_fatal([First macro argument must not be empty])])dnl | 51 | m4_ifblank(m4_translit([$1],[()],[ ]), [m4_fatal([First macro argument must not be empty])])dnl |
52 | m4_ifblank($3, [m4_fatal([Third macro argument must not be empty])])dnl | 52 | m4_ifblank([$3], [m4_fatal([Third macro argument must not be empty])])dnl |
53 | m4_bmatch(m4_normalize($1), [\s],dnl | 53 | m4_bmatch(m4_normalize([$1]), [\s],dnl |
54 | [m4_fatal([First macro argument must not contain whitespaces])])dnl | 54 | [m4_fatal([First macro argument must not contain whitespaces])])dnl |
55 | m4_if(m4_index($3, m4_normalize(m4_translit($1,[()],[ ]))), [-1], dnl | 55 | m4_if(m4_index([$3], m4_normalize(m4_translit([$1],[()],[ ]))), [-1], dnl |
56 | [m4_fatal([CHECK_CODE parameter (third macro argument) does not contain ']m4_normalize($1)[' token])])dnl | 56 | [m4_fatal([CHECK_CODE parameter (third macro argument) does not contain ']m4_normalize([$1])[' token])])dnl |
57 | AS_VAR_PUSHDEF([cv_Var], [mhd_cv_func_]m4_bpatsubst(m4_normalize(m4_translit($1,[()],[ ])),[[^a-zA-Z0-9]],[_]))dnl | 57 | AS_VAR_PUSHDEF([cv_Var], [mhd_cv_func_]m4_bpatsubst(_mhd_norm_expd(m4_translit([$1],[()],[ ])),[[^a-zA-Z0-9]],[_]))dnl |
58 | dnl | 58 | dnl |
59 | AC_CACHE_CHECK([for function $1], [cv_Var], | 59 | AC_CACHE_CHECK([for function $1], cv_Var, |
60 | [dnl | 60 | [dnl |
61 | m4_ifnblank([$6],[dnl | 61 | m4_ifnblank([$6],[dnl |
62 | mhd_check_func_SAVE_LIBS="$LIBS" | 62 | mhd_check_func_SAVE_LIBS="$LIBS" |
63 | LIBS="$LIBS m4_normalize([$6])" | 63 | LIBS="$LIBS _mhd_norm_expd([$6])" |
64 | ])dnl | 64 | ])dnl |
65 | AC_LINK_IFELSE( | 65 | AC_LINK_IFELSE( |
66 | [AC_LANG_PROGRAM([m4_default_nblank([$2],[AC_INCLUDES_DEFAULT])], [$3]) ], | 66 | [AC_LANG_PROGRAM([m4_default_nblank([$2],[AC_INCLUDES_DEFAULT])], [$3]) ], |
@@ -71,8 +71,8 @@ AC_DEFUN([MHD_CHECK_FUNC],[dnl | |||
71 | ])dnl | 71 | ])dnl |
72 | ]) | 72 | ]) |
73 | AS_VAR_IF([cv_Var], ["yes"], | 73 | AS_VAR_IF([cv_Var], ["yes"], |
74 | [AC_DEFINE([[HAVE_]]m4_bpatsubst(m4_toupper(m4_normalize(m4_translit($1,[()],[ ]))),[[^A-Z0-9]],[_]), | 74 | [AC_DEFINE([[HAVE_]]m4_bpatsubst(m4_toupper(_mhd_norm_expd(m4_translit([$1],[()],[ ]))),[[^A-Z0-9]],[_]), |
75 | [1], [Define to 1 if you have the `]m4_normalize(m4_translit($1,[()],[ ]))[' function.]) | 75 | [1], [Define to 1 if you have the ']_mhd_norm_expd(m4_translit([$1],[()],[ ]))[' function.]) |
76 | m4_n([$4])dnl | 76 | m4_n([$4])dnl |
77 | ], [$5]) | 77 | ], [$5]) |
78 | AS_VAR_POPDEF([cv_Var])dnl | 78 | AS_VAR_POPDEF([cv_Var])dnl |