Don't use stc lib if building monolithic

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/setup.py b/wxPython/setup.py
index f3bbe0f260138af22be7eacbfa85f86d13cfa520..0f1b24d2b7c8831b3f7f343240d305e8b4572ec1 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -656,6 +656,10 @@ if BUILD_STC:
                              opj(location, "_stc_gendocs.i"),
                              ] + swig_deps)
 
                              opj(location, "_stc_gendocs.i"),
                              ] + swig_deps)
 

+    stcLibs = libs[:]
+    if not MONOLITHIC and findLib('stc', libdirs):
+        stcLibs += makeLibName('stc')
+

     ext = Extension('_stc',
                     swig_sources,
 
     ext = Extension('_stc',
                     swig_sources,
 


@@ -663,7 +667,7 @@ if BUILD_STC:
                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,

-                    libraries = libs + makeLibName('stc'),
+                    libraries = stcLibs,

 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
 
                     extra_compile_args = cflags,
                     extra_link_args = lflags,