Support both --with-* and --without-* options for libsodium and pgm
Add support for --with/--without libsodium and --with/--without pgm
command line options.
Merge pull request #1218 from johntconklin/master

Support --with and --without options for libsodium and pgm