diff --git a/CMakeLists.txt b/CMakeLists.txt
index e89a6a9..a594786 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,10 +126,6 @@ find_package(LibBpf)
 find_package(LibBfd)
 find_package(LibOpcodes)
 
-if(${LIBBFD_FOUND} AND ${LIBOPCODES_FOUND})
-  set(HAVE_BFD_DISASM TRUE)
-endif()
-
 include(CheckIncludeFile)
 check_include_file("sys/sdt.h" HAVE_SYSTEMTAP_SYS_SDT_H)
 
span='2'><a href='/'><img src='https://git.koszko.org/cgit-static/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/'>index</a> : <a href='/guix/'>guix</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='ec0a2444176bef974809c15ad4c6acb7f5423ac1'/><input type='hidden' name='showmsg' value='1'/><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=ec0a2444176bef974809c15ad4c6acb7f5423ac1'>refs</a><a class='active' href='/guix/log/tests/discovery.scm?showmsg=1'>log</a><a href='/guix/tree/tests/discovery.scm?id=ec0a2444176bef974809c15ad4c6acb7f5423ac1'>tree</a><a href='/guix/commit/tests/discovery.scm?id=ec0a2444176bef974809c15ad4c6acb7f5423ac1'>commit</a><a href='/guix/diff/tests/discovery.scm?id=ec0a2444176bef974809c15ad4c6acb7f5423ac1'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/discovery.scm'>
<input type='hidden' name='id' value='ec0a2444176bef974809c15ad4c6acb7f5423ac1'/><input type='hidden' name='showmsg' value='1'/><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=ec0a2444176bef974809c15ad4c6acb7f5423ac1&amp;showmsg=1'>root</a>/<a href='/guix/log/tests?id=ec0a2444176bef974809c15ad4c6acb7f5423ac1&amp;showmsg=1'>tests</a>/<a href='/guix/log/tests/discovery.scm?id=ec0a2444176bef974809c15ad4c6acb7f5423ac1&amp;showmsg=1'>discovery.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/tests/discovery.scm?id=ec0a2444176bef974809c15ad4c6acb7f5423ac1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2017-07-03 23:51:23 +0200'>2017-07-03</span></td><td class='logsubject'><a href='/guix/commit/tests/discovery.scm?id=960c6ce96d746cf19829ad26e092ec5dad2a5c62'>discovery: Recurse into directories pointed to by a symlink.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Reported by Christopher Baines &lt;mail@cbaines.net&gt;
and Alex Kost &lt;alezost@gmail.com&gt;
at &lt;https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00290.html&gt;.

* guix/discovery.scm (scheme-files): When ENTRY is a symlink that
doesn't end in '.scm', call 'stat' and recurse if it points to a
directory.
* tests/discovery.scm ("scheme-modules recurses in symlinks to
directories"): New test.


</td></tr>
<tr class='logheader'><td><span title='2017-06-18 00:14:07 +0200'>2017-06-18</span></td><td class='logsubject'><a href='/guix/commit/tests/discovery.scm?id=d46c4423f46278bd2f96770ceb0667431414349e'>discovery: 'scheme-files' returns '() for a non-accessible directory.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes a regression introduced in
d27cc3bfaafe6b5b0831e88afb1c46311d382a0b.

Reported by Ricardo Wurmus &lt;rekado@elephly.net&gt;.

* guix/discovery.scm (scheme-files): Catch 'scandir*' system errors.
Return '() and optionally raise a warning upon 'system-error'.
* tests/discovery.scm ("scheme-modules, non-existent directory"): New
test.


</td></tr>
<tr class='logheader'><td><span title='2017-05-03 23:50:15 +0200'>2017-05-03</span></td><td class='logsubject'><a href='/guix/commit/tests/discovery.scm?id=cd903ef7871170d3c4eced45418459d293ef48a7'>Add (guix discovery).</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/discovery.scm, tests/discovery.scm: New files.
* gnu/packages.scm (scheme-files, file-name-&gt;module-name)
(scheme-modules, all-package-modules): Remove.
(fold-packages): Rewrite in terms of 'fold-module-public-variables'.
* gnu/tests.scm: Use (guix discovery).
* Makefile.am (MODULES): Add guix/discovery.scm.
(SCM_TESTS): Add tests/discovery.scm.


</td></tr>