Merge lp:~kalikiana/midori/alwaystransfers into lp:midori

[Cris Dywan]

Always build transfers extension even if addons are disabled

Always build transfers extension even if addons are disabled

[Paweł Forysiuk (tuxator)]

Fixes the build with addons disabled. I guess it will do for now, but we really think about some long-term solution.

review: Approve

=== modified file 'extensions/wscript_build'
--- extensions/wscript_build	2013-05-14 17:52:15 +0000
+++ extensions/wscript_build	2013-06-03 19:45:44 +0000
@@ -7,6 +7,10 @@
 
 extensions = os.listdir ('extensions')
 for extension in extensions:
+    # FIXME In the absense of a proper mechanism, transfers is a stock extension
+    if not bld.env['addons'] and extension != 'transfers.vala':
+        continue
+
     folder = 'extensions' + os.sep + extension
     if os.path.isdir (folder):
         files = os.listdir (folder)

=== modified file 'wscript'
--- wscript	2013-06-01 19:58:42 +0000
+++ wscript	2013-06-03 19:45:44 +0000
@@ -480,9 +480,7 @@
     bld.add_group ()
 
     bld.add_subdirs ('midori icons')
-
-    if bld.env['addons']:
-        bld.add_subdirs ('extensions')
+    bld.add_subdirs ('extensions')
 
     bld.add_group ()