You should separate these into separate if-statements; if someone has a version patched by my script but not yours, we should still patch on `-fno-defer-pop`.  (One reason to wrap in if-statements is so that if Coq checks the timestamp on the configure script, it will only notice a change when we actually change it.)