(cherry picked from commit fccc6ab913cad66c50b98d1ac14d2fe1f41f7453)

Conflicts:
	configure.ac
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>