|
1 | 1 | dnl Functions for testing |
2 | 2 | dnl |
3 | | -dnl Version: 20260612 |
| 3 | +dnl Version: 20260702 |
4 | 4 |
|
5 | 5 | dnl Function to check if pthread_rwlock_unlock can be hooked for testing |
6 | 6 | AC_DEFUN([AX_TESTS_CHECK_CAN_HOOK_PTHREAD_RWLOCK_UNLOCK], |
@@ -85,24 +85,25 @@ AC_DEFUN([AX_TESTS_CHECK_HAVE_MANPAGE_LINTER], |
85 | 85 |
|
86 | 86 | printf '.Dd June 10, 2026\n.Dt TITLE 1\n.Os\n.Sh NAME\n.Nm command\n.Nd example\n' > conftest.1 |
87 | 87 |
|
| 88 | + # Note that if man cannot set the locale it will exit with 0 but print to stderr |
88 | 89 | AS_IF( |
89 | 90 | [test "x$MAN" != x], |
90 | | - [LC_ALL="en_US.UTF-8" MANROFFSEQ="" MANWIDTH="80" "$MAN" --warnings -E UTF-8 -l -Tutf8 -Z conftest.1 >/dev/null 2>&1 |
| 91 | + [LC_ALL="en_US.UTF-8" MANROFFSEQ="" MANWIDTH="80" "$MAN" --warnings -E UTF-8 -l -Tutf8 -Z conftest.1 >/dev/null 2>conftest.err |
91 | 92 | AS_IF( |
92 | | - [test $? -eq 0], |
| 93 | + [test $? -eq 0 && ! test -s conftest.err], |
93 | 94 | [ac_cv_have_manpage_linter="man-db"]) |
94 | 95 | ]) |
95 | 96 |
|
96 | 97 | AS_IF( |
97 | 98 | [test "x$ac_cv_have_manpage_linter" = xno && test "x$MANDOC" != x], |
98 | | - [LC_ALL="en_US.UTF-8" "$MANDOC" -O width=80 -T lint -W all ./conftest.1 >/dev/null 2>&1 |
| 99 | + [LC_ALL="en_US.UTF-8" "$MANDOC" -O width=80 -T lint -W all ./conftest.1 >/dev/null 2>conftest.err |
99 | 100 |
|
100 | 101 | AS_IF( |
101 | | - [test $? -eq 0], |
| 102 | + [test $? -eq 0 && ! test -s conftest.err], |
102 | 103 | [ac_cv_have_manpage_linter="mandoc"]) |
103 | 104 | ]) |
104 | 105 |
|
105 | | - rm -f conftest.1 |
| 106 | + rm -f conftest.1 conftest.err |
106 | 107 | ]) |
107 | 108 | ]) |
108 | 109 |
|
@@ -280,6 +281,7 @@ AC_DEFUN([AX_TESTS_CHECK_LOCAL], |
280 | 281 |
|
281 | 282 | dnl Note cannot use GZIP given it has a special purpose within gzip |
282 | 283 | AC_PATH_PROG(GZIP_COMMAND, [gzip]) |
| 284 | + AC_PATH_PROGS([MD5SUM], [md5sum md5]) |
283 | 285 | AC_PATH_PROG(ZCAT, [zcat]) |
284 | 286 |
|
285 | 287 | AC_SUBST( |
|
0 commit comments