Re-add AC_EGREP_HEADER checks that got lost in configure rewrite