Add the extra include dirs to CPPFLAGS that are necessary during the configure tests temporarily. This fixes a couple of places where they weren't added correctly. Rev: src/configure.in:1.681