Merge pull request #351 from bluegr/eventrec_keymapper_build_warning

RECORDER: Don't allow the event recorder and the keymapper to be enabled simultaneously

2 files changed, 21 insertions, 0 deletions

diff --git a/configure b/configure
index b8bab15ab9..e59a38b8a5 100755
--- a/configure
+++ b/configure
@@ -3798,6 +3798,16 @@ define_in_config_if_yes $_vkeybd 'ENABLE_VKEYBD'
 define_in_config_if_yes $_keymapper 'ENABLE_KEYMAPPER'
 define_in_config_if_yes $_eventrec 'ENABLE_EVENTRECORDER'
 
+#
+# Check if the keymapper and the event recorder are enabled simultaneously
+#
+if test "$_keymapper" = yes ; then
+	if test "$_eventrec" = yes ; then
+		echo "ERROR: The keymapper and the event recorder cannot be enabled simultaneously currently, please disable one of the two"
+		exit 1
+	fi
+fi
+
 # Check whether to build translation support
 #
 echo_n "Building translation support... "
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index 129e9f2367..480f6a926a 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -310,6 +310,17 @@ int main(int argc, char *argv[]) {
 			cout << "    " << i->description << '\n';
 	}
 
+	// Check if the keymapper and the event recorder are enabled simultaneously
+	bool keymapperEnabled = false;
+	for (FeatureList::const_iterator i = setup.features.begin(); i != setup.features.end(); ++i) {
+		if (i->enable && !strcmp(i->name, "keymapper"))
+			keymapperEnabled = true;
+		if (i->enable && !strcmp(i->name, "eventrecorder") && keymapperEnabled) {
+			std::cerr << "ERROR: The keymapper and the event recorder cannot be enabled simultaneously currently, please disable one of the two\n";
+			return -1;
+		}
+	}
+
 	// Setup defines and libraries
 	setup.defines = getEngineDefines(setup.engines);
 	setup.libraries = getFeatureLibraries(setup.features);