Brought configure script, and some Makefile.in files in sync.