Fix some linking issues.

While testing clang ran into a linker issue in cmake. This patch reverts
2010-12-27T04:03:39Z!ai0867@gmail.com and fixes the issue properly for both cmake 
and scons.

The patch has been tested with 2010-12-27T04:03:39Z!ai0867@gmail.com using autotools, 
cmake and scons and all systems worked properly. So if somebody cares
it would be possible to re-add autotools.

changelog

@@ -31,6 +31,7 @@ Version 1.9.5+svn:
    * Added: New gui2 iterator framework.
    * Patch #2624: Solved enemy leaders never appearing on status table on
      foggy/shrouded maps, even when visible.
+   * Fix linker issues with cmake and scons.
 
 Version 1.9.5:
  * Graphics:

src/CMakeLists.txt

@@ -829,6 +829,7 @@ if(ENABLE_TESTS)
 	target_link_libraries(test
 		wesnoth-core
 		wesnoth-game
+		wesnoth-lua
 		${game-external-libs}
 		boost_unit_test_framework
 	)

src/SConscript

@@ -536,7 +536,7 @@ test_sources = Split("""
     """)
 test_sources.extend(test_env.Object("tests/test_config_cache.cpp"))
 
-test = test_env.WesnothProgram("test", test_sources +  [libwesnoth_extras, libwesnoth_core, libwesnoth_sdl, libwesnoth,libtest_utils], have_test_prereqs)
+test = test_env.WesnothProgram("test", test_sources +  [libwesnoth_extras, libwesnoth_core, libwesnoth_sdl, libwesnoth, libwesnoth_extras, libtest_utils], have_test_prereqs)
 
 if env["svnrev"] != "" and env["svnrev"] != "exported":
     revision_define = "#define REVISION \"%s\"\n" % env["svnrev"]

src/tests/gui/test_gui2.cpp

@@ -727,7 +727,3 @@ struct twrapper<gui2::twml_message_right>
 
 } // namespace
 
-namespace editor {
-	std::string selected_terrain, left_button_function;
-}
-