Preserve option function for option files.

interpreter.py

@@ -579,6 +579,7 @@ class Interpreter():
                       'configuration_data' : self.func_configuration_data,
                       'run_command' : self.func_run_command,
                       'gettext' : self.func_gettext,
+                      'option' : self.func_option,
                       }
 
     def get_build_def_files(self):
@@ -693,6 +694,9 @@ class Interpreter():
             raise InterpreterException('More than one gettext definitions currently not supported.')
         self.build.pot.append((packagename, languages, self.subdir))
 
+    def func_option(self, nodes, args, kwargs):
+        raise InterpreterException('Tried to call option() in build description file. All options must be in the option file.')
+
     def func_configuration_data(self, node, args, kwargs):
         if len(args) != 0:
             raise InterpreterException('configuration_data takes no arguments')

test cases/failing/5 misplaced option/meson.build

@@ -0,0 +1,3 @@
+project('misplaced option', 'c')
+
+option('dummy', type : 'string')