Don't ignore the 'intltool' check on non-Windows system, instead raise a configure error.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@4879 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2010-05-06 19:44:41 +00:00
parent 435a479d98
commit 9521f7f2d5
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,10 @@
2010-05-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* wscript:
Don't ignore the 'intltool' check on non-Windows system, instead
raise a configure error.
2010-05-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2010-05-06 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/build.c: * src/build.c:

View File

@ -206,9 +206,9 @@ def configure(conf):
conf.check_tool('intltool') conf.check_tool('intltool')
if 'LINGUAS' in os.environ: if 'LINGUAS' in os.environ:
conf.env['LINGUAS'] = os.environ['LINGUAS'] conf.env['LINGUAS'] = os.environ['LINGUAS']
except: except Configure.ConfigurationError:
pass if not is_win32:
raise
# GTK / GIO version check # GTK / GIO version check
conf.check_cfg(package='gtk+-2.0', atleast_version='2.8.0', uselib_store='GTK', conf.check_cfg(package='gtk+-2.0', atleast_version='2.8.0', uselib_store='GTK',
@ -531,7 +531,7 @@ def write_linguas_file(self):
if 'LINGUAS' in Build.bld.env: if 'LINGUAS' in Build.bld.env:
files = Build.bld.env['LINGUAS'] files = Build.bld.env['LINGUAS']
for po_filename in files.split(' '): for po_filename in files.split(' '):
if os.path.exists ('po/%s.po' % po_filename): if os.path.exists('po/%s.po' % po_filename):
linguas += '%s ' % po_filename linguas += '%s ' % po_filename
else: else:
files = os.listdir('%s/po' % self.path.abspath()) files = os.listdir('%s/po' % self.path.abspath())