build: Don't make --with-legacy enable HTTP and LZMA
The --with-legacy option only enables --with-zlib for now.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8e8ad4..231a6c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
.test:
image: registry.gitlab.gnome.org/gnome/libxml2
variables:
- BASE_CONFIG: "--with-legacy"
+ BASE_CONFIG: "--with-http --with-lzma --with-zlib"
before_script:
- rm -rf libxml2-build
- mkdir libxml2-build
@@ -72,7 +72,7 @@
tags:
- win32-ps
variables:
- BASE_CONFIG: "--with-legacy"
+ BASE_CONFIG: "--with-http --with-lzma --with-zlib"
# Disabled for now, see #658
CONFIG: "--without-python"
CHERE_INVOKING: "yes"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9ca8d8..327c2a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,10 +27,12 @@
option(LIBXML2_WITH_CATALOG "Add the Catalog support" ON)
option(LIBXML2_WITH_DEBUG "Add the debugging module" ON)
option(LIBXML2_WITH_HTML "Add the HTML support" ON)
+option(LIBXML2_WITH_HTTP "Add the HTTP support" OFF)
option(LIBXML2_WITH_ICONV "Add ICONV support" ON)
option(LIBXML2_WITH_ICU "Add ICU support" OFF)
option(LIBXML2_WITH_ISO8859X "Add ISO8859X support if no iconv" ON)
option(LIBXML2_WITH_LEGACY "Add deprecated APIs for compatibility" OFF)
+option(LIBXML2_WITH_LZMA "Use liblzma" OFF)
option(LIBXML2_WITH_MODULES "Add the dynamic modules support" ON)
option(LIBXML2_WITH_OUTPUT "Add the serialization support" ON)
option(LIBXML2_WITH_PATTERN "Add the xmlPattern selection interface" ON)
@@ -48,12 +50,6 @@
option(LIBXML2_WITH_XPATH "Add the XPATH support" ON)
cmake_dependent_option(
- LIBXML2_WITH_HTTP "Add the HTTP support" OFF
- "NOT LIBXML2_WITH_LEGACY" ON)
-cmake_dependent_option(
- LIBXML2_WITH_LZMA "Use liblzma" OFF
- "NOT LIBXML2_WITH_LEGACY" ON)
-cmake_dependent_option(
LIBXML2_WITH_ZLIB "Use libz" OFF
"NOT LIBXML2_WITH_LEGACY" ON)
diff --git a/configure.ac b/configure.ac
index 2b0e038..d21ebfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,12 +137,6 @@
dnl Legacy defaults
dnl
if test "$with_legacy" = "yes"; then
- if test "$with_http" = ""; then
- with_http=yes
- fi
- if test "$with_lzma" = ""; then
- with_lzma=yes
- fi
if test "$with_zlib" = ""; then
with_zlib=yes
fi
diff --git a/meson.build b/meson.build
index 6527c5f..988d7ec 100644
--- a/meson.build
+++ b/meson.build
@@ -82,8 +82,10 @@
# options
# disabled by default
+want_http = get_option('http').enabled()
want_icu = get_option('icu').enabled()
want_legacy = get_option('legacy').enabled()
+want_lzma = get_option('lzma').enabled()
want_thread_alloc = get_option('thread-alloc').enabled()
want_tls = get_option('tls').enabled()
@@ -126,12 +128,6 @@
# default depends on legacy option
-feature = get_option('http')
-want_http = want_legacy ? feature.allowed() : feature.enabled()
-
-feature = get_option('lzma')
-want_lzma = want_legacy ? feature.allowed() : feature.enabled()
-
feature = get_option('zlib')
want_zlib = want_legacy ? feature.allowed() : feature.enabled()
