diff options
| author | RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> | 2023-09-18 22:59:46 +0200 |
|---|---|---|
| committer | RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> | 2023-09-18 22:59:46 +0200 |
| commit | 0e70e81133c25274fe2dd2309556b41357dd759b (patch) | |
| tree | 9a680b36788ee1ad4e7ecc5ccfeb4494db9fdc72 /m4 | |
| parent | ce355c80cf6054bfa5e1dcf81f9e2183ef963ee1 (diff) | |
| parent | 2ddc75e69db5a3dd379c896d8420c9af20ec1cee (diff) | |
| download | monitoring-plugins-0e70e81133c25274fe2dd2309556b41357dd759b.tar.gz | |
Merge branch 'master' into mysql_detect_mysqldump
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/np_mysqlclient.m4 | 2 | ||||
| -rw-r--r-- | m4/uriparser.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/m4/np_mysqlclient.m4 b/m4/np_mysqlclient.m4 index 5099a02b..9f533ea3 100644 --- a/m4/np_mysqlclient.m4 +++ b/m4/np_mysqlclient.m4 | |||
| @@ -81,7 +81,7 @@ AC_DEFUN([np_check_lib_mariadbclient], | |||
| 81 | ], [with_mysql=no], [$np_mysql_libs]) | 81 | ], [with_mysql=no], [$np_mysql_libs]) |
| 82 | ]) | 82 | ]) |
| 83 | 83 | ||
| 84 | dnl Will take $1, find last occurrance of -LDIR and add DIR to LD_RUN_PATH | 84 | dnl Will take $1, find last occurrence of -LDIR and add DIR to LD_RUN_PATH |
| 85 | AC_DEFUN([np_add_to_runpath], | 85 | AC_DEFUN([np_add_to_runpath], |
| 86 | [ | 86 | [ |
| 87 | dnl Need [[ ]] so autoconf gives us just one set | 87 | dnl Need [[ ]] so autoconf gives us just one set |
diff --git a/m4/uriparser.m4 b/m4/uriparser.m4 index dbb8a551..5113638f 100644 --- a/m4/uriparser.m4 +++ b/m4/uriparser.m4 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # (this check is rougly based on and inspired libcurl.m4) | 1 | # (this check is roughly based on and inspired libcurl.m4) |
| 2 | # URIPARSER_CHECK ([DEFAULT-ACTION], [MINIMUM-VERSION], | 2 | # URIPARSER_CHECK ([DEFAULT-ACTION], [MINIMUM-VERSION], |
| 3 | # [ACTION-IF-YES], [ACTION-IF-NO]) | 3 | # [ACTION-IF-YES], [ACTION-IF-NO]) |
| 4 | # Checks for uriparser library. DEFAULT-ACTION is the string yes or no to | 4 | # Checks for uriparser library. DEFAULT-ACTION is the string yes or no to |