Change how the libraries Makefile adds --configure-option= flags; fixes #1431