-cf_old_cflag="$CPPFLAGS"
-
-case "$CPPFLAGS" in
-(*$cf_add_cflags=*)
- cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag=[^ ]*%%g"`
- ;;
-(*$cf_add_cflags\ *)
- cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%${cf_tmp_cflag}.%%"`
- ;;
-(*$cf_add_cflags)
- cf_old_cflag=`echo "x$cf_old_cflag" | sed -e 's/^.//' -e "s%$cf_tmp_cflag%%"`
- ;;
-esac
-
-if test "$CPPFLAGS" != "$cf_old_cflag" ;
-then
-
- CPPFLAGS="$cf_new_cflag"
-fi
+while true
+do
+ cf_old_cflag=`echo "x$CPPFLAGS" | sed -e 's/^.//' -e 's/[ ][ ]*-/ -/g' -e "s%$cf_tmp_cflag\\(=[^ ][^ ]*\\)\?%%" -e 's/^[ ]*//' -e 's%[ ][ ]*-D% -D%g' -e 's%[ ][ ]*-I% -I%g'`
+ test "$CPPFLAGS" != "$cf_old_cflag" || break