Patch was upstreamed. Reordered variables for consistency between packages. Slight modification to configure argument. Signed-off-by: Rosen Penev <rosenp@gmail.com>