aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2024-06-04 09:28:53 -0700
committerMark Adler <madler@alumni.caltech.edu>2024-06-04 09:36:01 -0700
commit7e6f0784cc0c33e8d5fcb368248168c6656f73c8 (patch)
treebecbdc8fd559f2d782fb83be7c918095a2ea1ff3 /contrib
parent0f3b7b9595cc7d85c3b13282e71fcecef7f18f9c (diff)
downloadzlib-7e6f0784cc0c33e8d5fcb368248168c6656f73c8.tar.gz
zlib-7e6f0784cc0c33e8d5fcb368248168c6656f73c8.tar.bz2
zlib-7e6f0784cc0c33e8d5fcb368248168c6656f73c8.zip
Remedy conflict between libzip and minizip zip.h.
minizip.pc.in would add @include@/minizip to the include path, which would permit simply #include <zip.h> to use minizip. However that conflicts with the zip.h from libzip that is put in the root include directory. This now does not add /minizip to the include path. Now when using pkg-config, #include <minizip/zip.h> must be used, where #include <zip.h> would be used for libzip. This is an incompatible change with the previous state. Users of minizip and pkg-config will need to update their code. #include <unzip.h> will need to be updated to #include <minizip/unzip.h> as well.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/minizip/minizip.pc.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/minizip/minizip.pc.in b/contrib/minizip/minizip.pc.in
index 69b5b7f..6339d8b 100644
--- a/contrib/minizip/minizip.pc.in
+++ b/contrib/minizip/minizip.pc.in
@@ -1,7 +1,7 @@
1prefix=@prefix@ 1prefix=@prefix@
2exec_prefix=@exec_prefix@ 2exec_prefix=@exec_prefix@
3libdir=@libdir@ 3libdir=@libdir@
4includedir=@includedir@/minizip 4includedir=@includedir@
5 5
6Name: minizip 6Name: minizip
7Description: Minizip zip file manipulation library 7Description: Minizip zip file manipulation library