configure: Merge RPM setup back in

Signed-off-by: Euan Harris <euan.harris@citrix.com>