Log Message:
c-icap: Improve dependency handling.

Should help the build (including that of dependent packages) on a variety
of platforms.