Trying to fix makevars.
Updating config
Trying to autoset CXX
Attempting to pass CXX
Attempting to fix CXX
Removing extra
Merge branch 'dev'

Conflicts:
	configure
	configure.ac
	src/Makevars.in