Fix undefined variable errors in configure script
Merge branch atnnn/configure into next

Review 1915 by @larkost