From 452af5f4522e750627d0c0ac9fbc794aeb1f1f8f Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 12 Apr 2012 16:05:31 +0100
Subject: gbuildize internal zlib

and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz
---
 package/Library_package2.mk        | 6 ------
 package/source/zipapi/Deflater.cxx | 4 ----
 package/source/zipapi/Inflater.cxx | 4 ----
 3 files changed, 14 deletions(-)

(limited to 'package')

diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index 223e280d2830..fcb7b6225932 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -88,10 +88,4 @@ $(eval $(call gb_Library_add_exception_objects,package2,\
 	package/source/zippackage/ZipPackageStream \
 ))
 
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_add_defs,package2,\
-	-DSYSTEM_ZLIB \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx
index 75d9d39e0436..3333c0d8794b 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -27,11 +27,7 @@
  ************************************************************************/
 
 #include <package/Deflater.hxx>
-#ifdef SYSTEM_ZLIB
 #include <zlib.h>
-#else
-#include <external/zlib/zlib.h>
-#endif
 #include <com/sun/star/packages/zip/ZipConstants.hpp>
 #include <string.h> // for memset
 
diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx
index 2149e59e5ddf..b83eea021e63 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -27,11 +27,7 @@
  ************************************************************************/
 
 #include <package/Inflater.hxx>
-#ifdef SYSTEM_ZLIB
 #include <zlib.h>
-#else
-#include <external/zlib/zlib.h>
-#endif
 #include <string.h> // for memset
 
 using namespace com::sun::star::uno;
-- 
cgit