From 0e8a65b60fc3389c8e2429e6fd53f7dda49dd152 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Fri, 24 Feb 2023 13:45:05 +0100
Subject: [PATCH 2/5] build: use system zipios++
---
configure.ac | 1 -
lib-src/Makefile.am | 2 +-
src/Makefile.am | 4 +---
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1b9fe3682e25..9a38afe9b618 100644
--- a/configure.ac
+++ b/configure.ac
@@ -366,7 +366,6 @@ AC_CONFIG_SUBDIRS([lib-src/enet])
dnl ----------------------------------------------------------
dnl Configure libraries
dnl ----------------------------------------------------------
-AC_CONFIG_SUBDIRS(lib-src/zipios++)
AC_CONFIG_FILES([Makefile m4/Makefile intl/Makefile
data/Makefile
diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am
index c2c18f033ca4..eb45f8c02383 100644
--- a/lib-src/Makefile.am
+++ b/lib-src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = oxydlib lua zipios++ tinygettext enigma-core
+SUBDIRS = oxydlib lua tinygettext enigma-core
if !SYSTEM_ENET
SUBDIRS += enet
endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 68969c18e067..3813704355b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,8 +11,6 @@ EXTRA_DIST = \
CXXFLAGS = @CXXFLAGS@\
-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
-DDOCDIR=\"$(docdir)\" \
- -I$(top_srcdir)/lib-src/zipios++ \
- -I$(top_builddir)/lib-src/zipios++ \
-I$(top_srcdir)/lib-src/lua \
-I$(top_srcdir)/lib-src/tinygettext \
-I$(top_srcdir)/lib-src/enigma-core
@@ -480,7 +478,7 @@ enigma_LDADD += $(top_builddir)/lib-src/enet/libenet.a
endif
enigma_LDADD += $(top_builddir)/lib-src/oxydlib/liboxyd.a \
- $(top_builddir)/lib-src/zipios++/src/libzipios.a \
+ -lzipios \
$(top_builddir)/lib-src/tinygettext/libtinygettext.a \
-lz \
$(mingw_ldadd) \
--
2.39.1