Alter --with-libsodium default.
Merge pull request #1275 from pmienk/master

Fix #1274