From 9edfeb150596b24528b8b7d193201301c0e62936 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 3 Mar 2006 00:34:00 +0000 Subject: [PATCH 1/2] Import from zlib-1.2.4 --- cpukit/zlib/win32/DLL_FAQ.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpukit/zlib/win32/DLL_FAQ.txt b/cpukit/zlib/win32/DLL_FAQ.txt index fb18e07118..12c009018c 100644 --- a/cpukit/zlib/win32/DLL_FAQ.txt +++ b/cpukit/zlib/win32/DLL_FAQ.txt @@ -16,7 +16,7 @@ in the zlib distribution, or at the following location: Pointers to a precompiled ZLIB1.DLL can be found in the zlib web site at: - http://www.zlib.org/ + http://www.zlib.net/ Applications that link to ZLIB1.DLL can rely on the following specification: @@ -350,9 +350,9 @@ in the zlib distribution, or at the following location: your build is unofficial. You should give it a different file name, and/or install it in a private directory that can be accessed by your application only, and is not visible to the - others (e.g. it's not in the SYSTEM or the SYSTEM32 directory, - and it's not in the PATH). Otherwise, your build may clash - with applications that link to the official build. + others (i.e. it's neither in the PATH, nor in the SYSTEM or + SYSTEM32 directories). Otherwise, your build may clash with + applications that link to the official build. For example, in Cygwin, zlib is linked to the Cygwin runtime CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL. From 267ecf03aca2bf424d43b5cc8002d5dbaafd8f58 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 23 Mar 2006 20:33:33 +0000 Subject: [PATCH 2/2] Import from zlib-1.2.4 --- cpukit/zlib/zlib.pc.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 cpukit/zlib/zlib.pc.in diff --git a/cpukit/zlib/zlib.pc.in b/cpukit/zlib/zlib.pc.in new file mode 100644 index 0000000000..b4f98e5e61 --- /dev/null +++ b/cpukit/zlib/zlib.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: zlib +Description: zlib compression library +Version: @VERSION@ + +Requires: +Libs: -L${libdir} -lz +Cflags: -I${includedir}