svn path=/trunk/; revision=41654
automake/autoconf and nmake builds, to match the name in CMake builds. svn path=/trunk/; revision=41058