Put library arguments back in ./configure
Merge review 225 by @srh
Merge branch 'next' into sam_no_program_options