From db8ff9d617c81b4ced2c8e639f6d3efbb31959d8 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Tue, 18 Mar 2014 14:51:09 +0100
Subject: [PATCH] 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 190083c..9af4a6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -369,7 +369,6 @@ fi
dnl ----------------------------------------------------------
dnl Configure libraries
dnl ----------------------------------------------------------
-AC_CONFIG_SUBDIRS(lib-src/zipios++)
AC_CONFIG_SUBDIRS(lib-src/enet)
AC_CONFIG_FILES([Makefile m4/Makefile intl/Makefile
diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am
index 4d2418a..d91d7ca 100644
--- a/lib-src/Makefile.am
+++ b/lib-src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = oxydlib lua zipios++ enet enigma-core
+SUBDIRS = oxydlib lua enet enigma-core
diff --git a/src/Makefile.am b/src/Makefile.am
index ecdb699..2fb61ed 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 \
-I$(top_srcdir)/lib-src/enet/include \
@@ -444,7 +442,7 @@ enigma_LDADD = \
$(top_builddir)/lib-src/lua/liblua.a \
$(top_builddir)/lib-src/enet/libenet.a \
$(top_builddir)/lib-src/oxydlib/liboxyd.a \
- $(top_builddir)/lib-src/zipios++/src/libzipios.a \
+ -lzipios \
-lz \
$(mingw_ldadd) \
@SDL_LIBS@
--
1.8.5.3