Restore some required wxwidgets bits.
authorCarl Hetherington <cth@carlh.net>
Tue, 15 Jan 2019 12:57:37 +0000 (12:57 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 15 Jan 2019 14:19:13 +0000 (14:19 +0000)
src/wx/wscript

index 4ddafc648500c7ab131703ed4b20a665fe6d945d..1b29b057b898e9bbe233fe3fc2e407be1acdc7e5 100644 (file)
@@ -142,12 +142,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 core,richtext,adv',
+                       args='--cppflags --cxxflags --libs %s' % wx_libs,
                        uselib_store='WXWIDGETS',
                        mandatory=True)
     except:
@@ -156,7 +159,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 core,richtext,adv',
+                           args='--cppflags --cxxflags --libs %s' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)
         except:
@@ -164,7 +167,7 @@ def configure(conf):
             conf.check_cfg(msg='Checking for wxWidgets using wx-config',
                            package='',
                            path=wx_config,
-                           args='--cppflags --cxxflags --libs core,richtext,adv',
+                           args='--cppflags --cxxflags --libs %s' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)