Use CPPFLAGS consistently, don't cross-wire with CFLAGS.

Fix ancient typo in CF3_WITH_LIBRARY.