Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Disable use of liblzma by default in configure too

Browse Source 
Make configure behaviour consistent with CMake the default value of 0
for wxUSE_LIBLZMA in setup.h under MSW.

This also means that dependency on the system liblzma is not picked up
by default when --disable-sys-libs configure option is used, as this was
rather unexpected.
This commit is contained in:
Vadim Zeitlin
2021-07-24 20:36:52 +02:00
parent 5a514afd34
commit d50a707b0f
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@@ -4100,6 +4100,7 @@ DEFAULT_wxUSE_LIBCURL=auto
DEFAULT_wxUSE_LIBGNOMEVFS=no DEFAULT_wxUSE_LIBGNOMEVFS=no
DEFAULT_wxUSE_LIBMSPACK=no DEFAULT_wxUSE_LIBMSPACK=no
DEFAULT_wxUSE_LIBSDL=no DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_LIBLZMA=no
DEFAULT_wxUSE_CAIRO=no DEFAULT_wxUSE_CAIRO=no
DEFAULT_wxUSE_ACCESSIBILITY=no DEFAULT_wxUSE_ACCESSIBILITY=no

1
configure.in
View File

@@ -339,6 +339,7 @@ DEFAULT_wxUSE_LIBCURL=auto
DEFAULT_wxUSE_LIBGNOMEVFS=no DEFAULT_wxUSE_LIBGNOMEVFS=no
DEFAULT_wxUSE_LIBMSPACK=no DEFAULT_wxUSE_LIBMSPACK=no
DEFAULT_wxUSE_LIBSDL=no DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_LIBLZMA=no
DEFAULT_wxUSE_CAIRO=no DEFAULT_wxUSE_CAIRO=no
dnl features disabled by default dnl features disabled by default

19
docs/doxygen/mainpages/liblzma.h
View File

@@ -36,17 +36,22 @@ https://tukaani.org/xz/ or clone its repository and perform the usual
commands sequence. commands sequence.
As wxWidgets is built using either configure or CMake under Unix-like systems, @subsection page_build_liblzma_configure Use liblzma with configure
there is nothing special to do to let wxWidgets use liblzma, as it will be
detected automatically -- just check the end of configure or CMake output to Pass @c --with-liblzma option to configure to enable liblzma and check the end
confirm that it was found. If this is not the case because the library was of configure output to confirm that it was found. If this is not the case
installed in some non-default location, you need to provide @c CPPFLAGS and @c because the library was installed in some non-default location, you need to
LDFLAGS on configure command line, e.g.: provide @c CPPFLAGS and @c LDFLAGS on configure command line, e.g.:
@code @code
$ ../configure CPPFLAGS=-I/opt/liblzma/include LDFLAGS=-L/opt/liblzma/lib $ ../configure --with-liblzma CPPFLAGS=-I/opt/liblzma/include LDFLAGS=-L/opt/liblzma/lib
@endcode @endcode
@subsection page_build_liblzma_cmake Use liblzma with CMake
When using CMake, add @c -DwxUSE_LIBLZMA=ON to CMake command line to enable
using liblzma.
@section page_build_liblzma_msw MSW not using configure @section page_build_liblzma_msw MSW not using configure