diff --git a/config/m4/iconv.m4 b/config/m4/iconv.m4
index ac879e5f..6d411bb3 100644
--- a/config/m4/iconv.m4
+++ b/config/m4/iconv.m4
@@ -12,7 +12,7 @@ AC_DEFUN([AM_ICONV],
   AC_ARG_WITH([libiconv],
 [  --with-libiconv=DIR     search for libiconv in DIR/include and DIR/lib], [
     for dir in `echo "$withval" | tr : ' '`; do
-      if test -d $dir/include; then CFLAGS="$CFLAGS -I$dir/include"; fi
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
       if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
     done
    ])
diff --git a/configure.in b/configure.in
index cb08d4c7..6e4851ad 100644
--- a/configure.in
+++ b/configure.in
@@ -1407,13 +1407,10 @@ if test "x$ac_cv_prog_gcc" = "xyes"; then
   esac
 fi
 
-# CFLAGS doesn't contain all compile flags. Some will be added only when
-# needed in the respective source directory. To get all compile flags
-# easily just add CPPFLAGS.
-ALL_CFLAGS="$CFLAGS $CPPFLAGS"
-
-EL_LOG_CONFIG(ALL_CFLAGS, [Compiler options (CFLAGS)], [])
-EL_LOG_CONFIG(LIBS, [Linker options (LIBS)], [])
+EL_LOG_CONFIG(CFLAGS, [Compiler flags (CFLAGS)], [])
+EL_LOG_CONFIG(CPPFLAGS, [Preprocessor flags (CPPFLAGS)], [])
+EL_LOG_CONFIG(LDFLAGS, [Linker flags (LDFLAGS)], [])
+EL_LOG_CONFIG(LIBS, [Library flags (LIBS)], [])
 
 dnl ===================================================================
 dnl Colored make output