Fix --with-* dependencies