[PATCH configure 3/4] Move variables inside the define.