Conflicts:
	configure.ac

Change-Id: I6919a7630f1afc1524cf2f21482f40fc9aebf0c6
Reviewed-on: https://gerrit.libreoffice.org/2442Reviewed-by: Niko Rönkkö <ronkko@iki.fi>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>