Changed Autoconf macro define values to 1, and cleaned up confgure test conditional