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

This commit is contained in:
Christian Dywan 2009-07-09 19:02:23 +01:00
parent 087a579450
commit 1f0f411657

10
wscript
View file

@ -109,6 +109,11 @@ def configure (conf):
nls = 'no ' nls = 'no '
conf.define ('ENABLE_NLS', [0,1][nls == 'yes']) 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 is_mingw (conf.env) or Options.platform == 'win32':
if not conf.find_program ('convert', var='CONVERT'): if not conf.find_program ('convert', var='CONVERT'):
Utils.pprint ('YELLOW', 'midori.ico won\'t be created') Utils.pprint ('YELLOW', 'midori.ico won\'t be created')
@ -236,11 +241,6 @@ def configure (conf):
conf.check (function_name='inet_addr') conf.check (function_name='inet_addr')
conf.define ('HAVE_OSX', int(sys.platform == 'darwin')) 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_VERSION', VERSION)
conf.define ('PACKAGE_NAME', APPNAME) conf.define ('PACKAGE_NAME', APPNAME)
conf.define ('PACKAGE_BUGREPORT', 'http://www.twotoasts.de/bugs') conf.define ('PACKAGE_BUGREPORT', 'http://www.twotoasts.de/bugs')