Patches from Frank Cusack:

Patches from Frank Cusack:
- Avoid infinite loop (eventually running out of stack space) when doing
  callback into ccp with MPPE enabled, by updating lcp_fsm state *before*
  doing callbacks.  Problem noted by Rustem Yumaev <rust@vostok-inc.com>.

- Add missing accounting attributes

- Update for newer automake; required to compile on RH 7.3