Fixed missmerge in a1cd4ba18
Fix off-source build

off-source build is broken in 5ef0f343d219c9a9c3f7425251e06e97176411d2
by replacing INCLUDES with AM_CPPFLAGS

http://www.gnu.org/software/automake/manual/html_node/Program-Variables.html

> AM_CPPFLAGS is ignored in preference to a per-executable (or per-
library) _CPPFLAGS variable if it is defined.
Merge pull request #54 from eagafonov/master

Fix off-source build
Added realm on ldapvcard to append to user
Merge pull request #57 from omula/ldapvcard

Added realm on ldapvcard to append to user
added systemd unit files

and do not install upstart configuration files in @sysconfdir@

Signed-off-by: Tomasz Sterna <tomek@xiaoka.com>
Updated NEWS
Merge pull request #2 from jabberd2/master

Merge jabberd2