Also, add two missing configure options, and frob some other things.
Attach a file by drag & drop or click to upload
