See bug #67635

Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  See bug #67635