Revert recent dependency on libutils, use a simple ifdef instead

Proper dependency tracking in our Makefiles needs re-organisation of
configure.ac and all makefiles, to be done.
Merge pull request #1814 from jimis/cfupgrade

Revert recent dependency on libutils, use a simple ifdef instead