--- jdk14-bc54620a3848/make/autoconf/basics.m4	2020-02-07 04:40:54.000000000 +1030
+++ jdk14-bc54620a3848-new/make/autoconf/basics.m4	2020-04-24 10:59:33.056098506 +0930
@@ -583,7 +583,7 @@
   BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)])
   if test "x[$]$1" = x; then
     AC_MSG_NOTICE([Required tool $2 not found in PATH, checking built-in])
-    if help $2 > /dev/null 2>&1; then
+    if command -v $2 > /dev/null 2>&1; then
       AC_MSG_NOTICE([Found $2 as shell built-in. Using it])
       $1="$2"
     else
'>index</a> : <a href='/guix/'>guix</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='9e02c4acb3e73e9d426d9ec09ffbcb7f047b46db'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=9e02c4acb3e73e9d426d9ec09ffbcb7f047b46db'>refs</a><a class='active' href='/guix/log/tests/guix-archive.sh'>log</a><a href='/guix/tree/tests/guix-archive.sh?id=9e02c4acb3e73e9d426d9ec09ffbcb7f047b46db'>tree</a><a href='/guix/commit/tests/guix-archive.sh?id=9e02c4acb3e73e9d426d9ec09ffbcb7f047b46db'>commit</a><a href='/guix/diff/tests/guix-archive.sh?id=9e02c4acb3e73e9d426d9ec09ffbcb7f047b46db'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-archive.sh'>
<input type='hidden' name='id' value='9e02c4acb3e73e9d426d9ec09ffbcb7f047b46db'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=9e02c4acb3e73e9d426d9ec09ffbcb7f047b46db'>root</a>/<a href='/guix/log/tests?id=9e02c4acb3e73e9d426d9ec09ffbcb7f047b46db'>tests</a>/<a href='/guix/log/tests/guix-archive.sh?id=9e02c4acb3e73e9d426d9ec09ffbcb7f047b46db'>guix-archive.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-archive.sh?id=9e02c4acb3e73e9d426d9ec09ffbcb7f047b46db&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-15 17:32:09 +0100'>2020-12-15</span></td><td><a href='/guix/commit/tests/guix-archive.sh?id=ed7d02f7c198970ce3fe94bcee47592963326446'>serialization: 'restore-file' sets canonical timestamp and permissions.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/serialization.scm (restore-file): Set the permissions and mtime
of FILE.
* guix/nar.scm (finalize-store-file): Pass #:reset-timestamps? #f to
'register-items'.
* tests/nar.scm (rm-rf): Add 'chmod' calls to ensure files are writable.
("write-file + restore-file with symlinks"): Ensure every file in OUTPUT
passes 'canonical-file?'.
* tests/guix-archive.sh: Run "chmod -R +w" before "rm -rf".
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-28 21:06:36 -0500'>2020-09-28</span></td><td><a href='/guix/commit/tests/guix-archive.sh?id=d8934360d2453a403b5433e71d09188e4ed23b57'>tests: Simplify shell exit status negation;</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/guix-archive.sh, tests/guix-build-branch.sh, tests/guix-build.sh,
tests/guix-daemon.sh, tests/guix-download.sh, tests/guix-environment.sh,
tests/guix-gc.sh, tests/guix-git-authenticate.sh, tests/guix-graph.sh,
tests/guix-hash.sh, tests/guix-lint.sh, tests/guix-pack-relocatable.sh,
tests/guix-pack.sh, tests/guix-package-aliases.sh, tests/guix-package-net.sh,
tests/guix-package.sh: Use the shell '!' keyword to negate command exit status
in place of 'if ...; then false; else true; fi'
</span></span></td><td>Eric Bavier</td></tr>
<tr><td><span title='2019-12-12 17:56:58 +0100'>2019-12-12</span></td><td><a href='/guix/commit/tests/guix-archive.sh?id=044277f610b02c3821afa0afdc2b2b140bb92cb4'>guix archive: Add '--list'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/archive.scm (show-help, %options): Add '--list'.
(list-contents): New procedure.
(guix-archive): Honor the '--list' option.
* tests/guix-archive.sh: Test it.
* doc/guix.texi (Invoking guix archive): Document it.
</span></span></td><td>Ludovic Courtès</td></tr>