From 204bc3c887a172c30c490e15de4f1cea66f4230e Mon Sep 17 00:00:00 2001 From: Pavel O Date: Wed, 6 Dec 2017 01:02:47 +0300 Subject: [PATCH] Fix linking of wxscintilla in static monolithic build wx-config didn't report -lwxscintilla for `wx-config --libs stc` in static monolithic build. Since stc is a part of monolithic lib, -lwxscintilla will be reported for `wx-config --libs` now as well. --- configure | 3 +++ configure.in | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure b/configure index 524fd32af5..66c3685538 100755 --- a/configure +++ b/configure @@ -35905,6 +35905,9 @@ WXCONFIG_LIBS="$LIBS" if test "$wxUSE_REGEX" = "builtin" ; then wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty" fi +if test "$wxUSE_STC" = "yes" ; then + wxconfig_3rdparty="scintilla $wxconfig_3rdparty" +fi case "$wxUSE_EXPAT" in builtin) wxconfig_3rdparty="expat $wxconfig_3rdparty" diff --git a/configure.in b/configure.in index a149ce7dd5..c12406e52e 100644 --- a/configure.in +++ b/configure.in @@ -7831,6 +7831,9 @@ dnl wx-config must output 3rd party libs in --libs in static build: if test "$wxUSE_REGEX" = "builtin" ; then wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty" fi +if test "$wxUSE_STC" = "yes" ; then + wxconfig_3rdparty="scintilla $wxconfig_3rdparty" +fi case "$wxUSE_EXPAT" in builtin) wxconfig_3rdparty="expat $wxconfig_3rdparty"