Merge branch 'crashlog_improvements' into jgrpp

# Conflicts:
#	Makefile.src.in

src/crashlog.cpp

@@ -101,6 +101,12 @@ char *CrashLog::LogCompiler(char *buffer, const char *last) const
 #endif
 }
 
+/* virtual */ char *CrashLog::LogOSVersionDetail(char *buffer, const char *last) const
+{
+	/* Stub implementation; not all OSes support this. */
+	return buffer;
+}
+
 /* virtual */ char *CrashLog::LogRegisters(char *buffer, const char *last) const
 {
 	/* Stub implementation; not all OSes support this. */
@@ -135,7 +141,8 @@ char *CrashLog::LogOpenTTDVersion(char *buffer, const char *last) const
 			" Bits:       %d\n"
 			" Endian:     %s\n"
 			" Dedicated:  %s\n"
-			" Build date: %s\n\n",
+			" Build date: %s\n"
+			" Configure:  %s\n\n",
 			_openttd_revision,
 			_openttd_revision_modified,
 			_openttd_newgrf_version,
@@ -154,7 +161,8 @@ char *CrashLog::LogOpenTTDVersion(char *buffer, const char *last) const
 #else
 			"no",
 #endif
-			_openttd_build_date
+			_openttd_build_date,
+			_openttd_build_configure
 	);
 }
 
@@ -343,10 +351,11 @@ char *CrashLog::FillCrashLog(char *buffer, const char *last) const
 #endif
 
 	buffer = this->LogOpenTTDVersion(buffer, last);
-	buffer = this->LogRegisters(buffer, last);
 	buffer = this->LogStacktrace(buffer, last);
+	buffer = this->LogRegisters(buffer, last);
 	buffer = this->LogOSVersion(buffer, last);
 	buffer = this->LogCompiler(buffer, last);
+	buffer = this->LogOSVersionDetail(buffer, last);
 	buffer = this->LogConfiguration(buffer, last);
 	buffer = this->LogLibraries(buffer, last);
 	buffer = this->LogModules(buffer, last);