Merge 'viking-0.9.8'

[andy/viking.git] / src / modules.c

diff --git a/src/modules.c b/src/modules.c
index d5ad909da7460b0a66605cf8dfb86fac73a8fd87..e0568cc490ee2fdfa1f9e34f44033fc97ca60d1e 100644 (file)
--- a/src/modules.c
+++ b/src/modules.c
@@ -27,10 +27,11 @@
 
 #include "google.h"
 #include "terraserver.h"
-#include "khmaps.h"
 #include "expedia.h"
 #include "osm.h"
 #include "osm-traces.h"
+#include "bluemarble.h"
+#include "openaerial.h"
 
 void modules_init()
 {
@@ -47,5 +48,11 @@ void modules_init()
   osm_init();
   osm_traces_init();
 #endif
+#ifdef VIK_CONFIG_BLUEMARBLE
+  bluemarble_init();
+#endif
+#ifdef VIK_CONFIG_OPENAERIAL
+  openaerial_init();
+#endif
 }