Revision: 4879 http://geany.svn.sourceforge.net/geany/?rev=4879&view=rev Author: eht16 Date: 2010-05-06 19:44:41 +0000 (Thu, 06 May 2010)

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

Modified Paths: -------------- trunk/ChangeLog trunk/wscript

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-06 12:45:19 UTC (rev 4878) +++ trunk/ChangeLog 2010-05-06 19:44:41 UTC (rev 4879) @@ -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>

* src/build.c:

Modified: trunk/wscript =================================================================== --- trunk/wscript 2010-05-06 12:45:19 UTC (rev 4878) +++ trunk/wscript 2010-05-06 19:44:41 UTC (rev 4879) @@ -206,10 +206,10 @@ conf.check_tool('intltool') if 'LINGUAS' in os.environ: conf.env['LINGUAS'] = os.environ['LINGUAS'] - except: - pass + except Configure.ConfigurationError: + if not is_win32: + raise

- # GTK / GIO version check conf.check_cfg(package='gtk+-2.0', atleast_version='2.8.0', uselib_store='GTK', mandatory=True, args='--cflags --libs') @@ -531,7 +531,7 @@ if 'LINGUAS' in Build.bld.env: files = Build.bld.env['LINGUAS'] 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 else: files = os.listdir('%s/po' % self.path.abspath())

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.