solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Only include Scintilla libraries in wx-config --libs if needed

Browse source 
Don't always output -lscintilla and -llexilla in wx-config --libs, as
they are not needed unless linking with wxstc library is requested but
204bc3c887 (Fix linking of wxscintilla in static monolithic build,
2017-12-06) added them unconditionally.

Improve this by putting them in a separate WXCONFIG_STC_LIBS instead of
WXCONFIG_LIBS used for all libraries (even wxbase, which is wrong on its
own).

Also see #23643.
This commit is contained in:
Vadim Zeitlin 2023-07-23 02:35:53 +02:00
parent 97546a6f0c
commit 57c71a4547
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
configure.in
View file

@ -7299,6 +7299,10 @@ dnl ---------------------------------------------------------------------------
dnl wxStyledTextCtrl
dnl ---------------------------------------------------------------------------
for lib in scintilla lexilla; do
WXCONFIG_STC_LIBS="$WXCONFIG_STC_LIBS -lwx${lib}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
done
if test "$wxUSE_MSW" = 1 ; then
EXTRALIBS_STC="-limm32"
fi
@ -7608,9 +7612,6 @@ case "$wxUSE_REGEX" in
WXCONFIG_LIBS="$PCRE_LINK $WXCONFIG_LIBS"
;;
esac
if test "$wxUSE_STC" = "yes" ; then
wxconfig_3rdparty="scintilla lexilla $wxconfig_3rdparty"
fi
case "$wxUSE_EXPAT" in
builtin)
wxconfig_3rdparty="expat $wxconfig_3rdparty"
@ -7947,6 +7948,7 @@ AC_SUBST(WX_CXXFLAGS)
AC_SUBST(WXCONFIG_CXXFLAGS)
AC_SUBST(WXCONFIG_LIBS)
AC_SUBST(WXCONFIG_STC_LIBS)
AC_SUBST(WXCONFIG_RPATH)
AC_SUBST(WX_LDFLAGS)
AC_SUBST(WXCONFIG_LDFLAGS)