Does the configure tool have a better way of handling this macro and the patch?