Merge pull request #1209 from pmienk/master

Simplify libsodium inclusion
Correct declaration of HAVE_LIBSODIUM.