Fix Centos build after changes to container.
authorCarl Hetherington <cth@carlh.net>
Mon, 21 Jan 2019 16:40:09 +0000 (16:40 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 21 Jan 2019 16:40:09 +0000 (16:40 +0000)
src/wx/wscript

index 7221316d3904cdcd09e3f9b52c6dfaa162e43581..74d4d8bcec7b9cffdebb484c810b6cb455225ca9 100644 (file)
@@ -122,12 +122,15 @@ sources = """
           """
 
 def configure(conf):
+
+    wx_libs = 'core,richtext,adv,html,xml'
+
     try:
         wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
         conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0',
                        package='',
                        path=wx_config,
-                       args='--cppflags --cxxflags --libs std,richtext',
+                       args='--cppflags --cxxflags --libs %s' % wx_libs,
                        uselib_store='WXWIDGETS',
                        mandatory=True)
     except:
@@ -136,7 +139,7 @@ def configure(conf):
             conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
                            package='',
                            path=wx_config,
-                           args='--cppflags --cxxflags --libs std,richtext',
+                           args='--cppflags --cxxflags --libs %s' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)
         except:
@@ -144,7 +147,7 @@ def configure(conf):
             conf.check_cfg(msg='Checking for wxWidgets using wx-config',
                            package='',
                            path=wx_config,
-                           args='--cppflags --cxxflags --libs std,richtext',
+                           args='--cppflags --cxxflags --libs %s' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)