From e3f056b2c857c0428d9eaca73639b34333311767 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 22 May 2020 00:26:53 +0200 Subject: [PATCH] We must only link gtk2 if wx is also using it. --- src/wx/wscript | 4 ++++ wscript | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wx/wscript b/src/wx/wscript index 83e2022b3..339ebb1ec 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -225,6 +225,10 @@ def configure(conf): if not wx_version.startswith('3.0.'): conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version) + config = conf.check_cfg(package='wxwidgets', path=wx_config, args='--selected-config').strip() + if config.find('gtk2') != -1: + conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) + try: conf.check_cfg(msg='Checking for RtAudio using pkg-config', package='rtaudio', diff --git a/wscript b/wscript index 86c65ad74..f49b49108 100644 --- a/wscript +++ b/wscript @@ -199,8 +199,6 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX') conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align']) conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl') - if not conf.env.DISABLE_GUI: - conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) # OSX if conf.env.TARGET_OSX: -- 2.30.2