Needed since 2ce903c7

Conflicts:
	configure.ac

Change-Id: I589e782baae0bd4d5906b97c371cad587aaf5c94
(cherry picked from commit 8d5fda8e)