diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-30 10:21:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-30 10:21:48 +0100 |
| commit | 39dc4e1aabc40f600d358a6d023e82b75f024679 (patch) | |
| tree | c8a59987e6cfb7c2d8ebd6fb95708be0ed68b4cb /src/wx/wscript | |
| parent | 02b42ec90f40ed50230435ef9b86f02056a6da4b (diff) | |
Find wxWidgets on Fedora 22.
Diffstat (limited to 'src/wx/wscript')
| -rw-r--r-- | src/wx/wscript | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index 34a7608df..1fb35f1cd 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -86,12 +86,22 @@ sources = """ """ def configure(conf): - conf.check_cfg(msg='Checking for wxWidgets', - package='', - path='wx-config', - args='--cppflags --cxxflags --libs std,richtext', - uselib_store='WXWIDGETS', - mandatory=True) + try: + wx_config = 'wx-config-3.0-gtk2' + conf.check_cfg(msg='Checking for wxWidgets', + package='', + path=wx_config, + args='--cppflags --cxxflags --libs std,richtext', + uselib_store='WXWIDGETS', + mandatory=True) + except: + wx_config = 'wx-config' + conf.check_cfg(msg='Checking for wxWidgets', + package='', + path=wx_config, + args='--cppflags --cxxflags --libs std,richtext', + uselib_store='WXWIDGETS', + mandatory=True) if conf.options.static_wxwidgets: # wx-config returns its static libraries as full paths, without -l prefixes, which confuses @@ -113,7 +123,7 @@ def configure(conf): conf.env.STLIBPATH_WXWIDGETS = stlib_paths conf.in_msg = 1 - wx_version = conf.check_cfg(package='', path='wx-config', args='--version').strip() + wx_version = conf.check_cfg(package='', path=wx_config, args='--version').strip() conf.im_msg = 0 if not wx_version.startswith('3.0.'): conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version) |