--- 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
 href='/guix/'>guix</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='18dd5e45e4b9d7c66f386119e6578bf8b0555f63'/><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=18dd5e45e4b9d7c66f386119e6578bf8b0555f63'>refs</a><a class='active' href='/guix/log/gnu/tests.scm'>log</a><a href='/guix/tree/gnu/tests.scm?id=18dd5e45e4b9d7c66f386119e6578bf8b0555f63'>tree</a><a href='/guix/commit/gnu/tests.scm?id=18dd5e45e4b9d7c66f386119e6578bf8b0555f63'>commit</a><a href='/guix/diff/gnu/tests.scm?id=18dd5e45e4b9d7c66f386119e6578bf8b0555f63'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests.scm'>
<input type='hidden' name='id' value='18dd5e45e4b9d7c66f386119e6578bf8b0555f63'/><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=18dd5e45e4b9d7c66f386119e6578bf8b0555f63'>root</a>/<a href='/guix/log/gnu?id=18dd5e45e4b9d7c66f386119e6578bf8b0555f63'>gnu</a>/<a href='/guix/log/gnu/tests.scm?id=18dd5e45e4b9d7c66f386119e6578bf8b0555f63'>tests.scm</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/gnu/tests.scm?id=18dd5e45e4b9d7c66f386119e6578bf8b0555f63&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-08-29 01:05:26 -0400'>2021-08-29</span></td><td><a href='/guix/commit/gnu/tests.scm?id=da4e40948326387d5bcda58783914d5f9ce8b095'>Migrate to the new 'targets' field of bootloader-configuration.</a><span class='msg-avail'>...<span class='msg-tooltip'>The old 'target' field is deprecated; adjust the sources to use the new
'targets' one instead.

* doc/guix-cookbook.texi&lt;target&gt;: Replace by 'targets'.
* gnu/bootloader/grub.scm: Likewise.
* gnu/installer/parted.scm: Likewise.
* gnu/machine/digital-ocean.scm: Likewise.
* gnu/system/examples/asus-c201.tmpl: Likewise
* gnu/system/examples/bare-bones.tmpl: Likewise
* gnu/system/examples/bare-hurd.tmpl: Likewise
* gnu/system/examples/beaglebone-black.tmpl: Likewise
* gnu/system/examples/desktop.tmpl: Likewise
* gnu/system/examples/docker-image.tmpl: Likewise
* gnu/system/examples/lightweight-desktop.tmpl: Likewise
* gnu/system/examples/vm-image.tmpl: Likewise
* gnu/system/examples/yggdrasil.tmpl: Likewise
* gnu/system/hurd.scm: Likewise
* gnu/system/images/hurd.scm: Likewise
* gnu/system/images/novena.scm: Likewise
* gnu/system/images/pine64.scm: Likewise
* gnu/system/images/pinebook-pro.scm: Likewise
* gnu/system/images/rock64.scm: Likewise
* gnu/system/install.scm: Likewise
* gnu/system/vm.scm: Likewise
* gnu/tests.scm: Likewise
* gnu/tests/ganeti.scm: Likewise
* gnu/tests/install.scm: Likewise
* gnu/tests/nfs.scm: Likewise
* gnu/tests/telephony.scm: Likewise
* tests/boot-parameters.scm: Likewise
* tests/system.scm: Likewise
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-04-12 18:42:22 +0200'>2021-04-12</span></td><td><a href='/guix/commit/gnu/tests.scm?id=3332f4365bf329c361d650c70e53b8a74ad923bd'>tests: Support package extensions in the backdoor REPL.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests.scm
  (&lt;marionette-configuration&gt;): Add 'extensions' field.
  (marionette-shepherd-service): Honour the field.
  (with-import-modules-and-extensions): Define a combination
  of 'with-import-modules' and 'with-extensions'.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Maxime Devos</td></tr>
<tr><td><span title='2021-02-19 20:10:08 +0100'>2021-02-19</span></td><td><a href='/guix/commit/gnu/tests.scm?id=f57b7cea748c1e8284373811c13398d9f69aec89'>tests: Export %simple-os.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests.scm (%simple-os): Export it.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-07-25 19:11:36 +0200'>2020-07-25</span></td><td><a href='/guix/commit/gnu/tests.scm?id=a5e2fc73760a2ae023f2e56bdbf8025971f90e64'>utils: Move &lt;location&gt; and '&amp;error-location' to (guix diagnostics).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/utils.scm (&lt;location&gt;, source-properties-&gt;location)
(location-&gt;source-properties, &amp;error-location): Move to...
* guix/diagnostics.scm: ... here.
* gnu.scm: Adjust imports accordingly.
* gnu/machine.scm: Likewise.
* gnu/system.scm: Likewise.
* gnu/tests.scm: Likewise.
* guix/inferior.scm: Likewise.
* tests/channels.scm: Likewise.
* tests/packages.scm: Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-03-05 16:33:37 +0100'>2020-03-05</span></td><td><a href='/guix/commit/gnu/tests.scm?id=c0b726c2112e0e670dc134583b376541c0a3789a'>tests: Add &lt;system-test&gt; gexp compiler.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests.scm (compile-system-test): New gexp compiler.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-01-23 11:26:55 +0100'>2020-01-23</span></td><td><a href='/guix/commit/gnu/tests.scm?id=f79313b3871ebe204c7b29fdb823666af06f48ff'>tests: Fix typo in comment.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests.scm: Add missing word in commentary.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-12-18 22:36:37 +0100'>2019-12-18</span></td><td><a href='/guix/commit/gnu/tests.scm?id=ab7010af1f1077c056529769a53a380147c3933f'>gexp: Allow character literals in GEXP-&gt;SEXP.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/38628&gt;.

* tests/gexp.scm ("lower-gexp, character literal"): New test.
* guix/gexp.scm (gexp-&gt;sexp)[self-quoting?]: Add CHAR? to the tested types.
* guix/repl.scm (self-quoting?): Likewise.
* gnu/tests.scm (marionette-shepherd-service)[self-quoting?]: Likewise.
</span></span></td><td>Marius Bakke</td></tr>