From: Christian Dywan <christian@twotoasts.de>
Date: Thu, 9 Jul 2009 18:02:23 +0000 (+0100)
Subject: Check for rsvg-convert early to support it when cross compiling
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f0f411657db0265ddbfa5711d285367ce68eaae;p=midori

Check for rsvg-convert early to support it when cross compiling
---

diff --git a/wscript b/wscript
index 58cef4fa..3462244a 100644
--- a/wscript
+++ b/wscript
@@ -109,6 +109,11 @@ def configure (conf):
         nls = 'no '
     conf.define ('ENABLE_NLS', [0,1][nls == 'yes'])
 
+    if conf.find_program ('rsvg-convert', var='RSVG_CONVERT'):
+        icons = 'yes'
+    else:
+        icons = 'no '
+
     if is_mingw (conf.env) or Options.platform == 'win32':
         if not conf.find_program ('convert', var='CONVERT'):
             Utils.pprint ('YELLOW', 'midori.ico won\'t be created')
@@ -236,11 +241,6 @@ def configure (conf):
         conf.check (function_name='inet_addr')
     conf.define ('HAVE_OSX', int(sys.platform == 'darwin'))
 
-    if conf.find_program ('rsvg-convert', var='RSVG_CONVERT'):
-        icons = 'yes'
-    else:
-        icons = 'no '
-
     conf.define ('PACKAGE_VERSION', VERSION)
     conf.define ('PACKAGE_NAME', APPNAME)
     conf.define ('PACKAGE_BUGREPORT', 'http://www.twotoasts.de/bugs')