From 08d2067ffdbf3af5a226c3aecadfa278b854588d Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Tue, 18 Mar 2014 14:51:09 +0100
Subject: [PATCH 2/2] 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 92cc06cd61..631b044787 100644
--- a/configure.ac
+++ b/configure.ac
@@ -435,7 +435,6 @@ AM_COND_IF([SYSTEM_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 896bfe7500..d8ee3ea704 100644
--- a/lib-src/Makefile.am
+++ b/lib-src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = oxydlib lua zipios++ enigma-core
+SUBDIRS = oxydlib lua enigma-core
 if !SYSTEM_ENET
 SUBDIRS += enet
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 3cc1023a0a..18f6330259 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,8 +13,6 @@ CXXFLAGS = @CXXFLAGS@\
 	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
 	-DDOCDIR=\"$(docdir)\" \
 	-DLOCALEDIR=\"$(localedir_enigma)\" \
-	-I$(top_srcdir)/lib-src/zipios++  \
-	-I$(top_builddir)/lib-src/zipios++ \
 	-I$(top_srcdir)/lib-src/lua \
 	-I$(top_srcdir)/lib-src/enigma-core
 
@@ -457,7 +455,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 \
 	-lz \
 	$(mingw_ldadd) \
 	@SDL_LIBS@
-- 
2.1.0