Fix build on Solaris 10

Conflicts:
	configure