zlib/zlib-1.2.4-autotools.patch
Ivana Varekova 44d235dea8 - update to 1.2.4 use the upstream make/configure files for zlib, change
additional makefile/configure file to be used only for minizip add
    pkgconfig to zlib
2010-03-29 10:11:40 +00:00

69 lines
2.1 KiB
Diff

diff -up zlib-1.2.4/contrib/minizip/configure.ac.atools zlib-1.2.4/contrib/minizip/configure.ac
--- zlib-1.2.4/contrib/minizip/configure.ac.atools 2010-03-29 10:28:50.000000000 +0200
+++ zlib-1.2.4/contrib/minizip/configure.ac 2010-03-29 10:28:50.000000000 +0200
@@ -0,0 +1,13 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_INIT([minizep], [1.2.4], [bugzilla.redhat.com])
+AC_CONFIG_SRCDIR([minigzip.c])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([foreign])
+LT_INIT
+
+AC_SUBST([HAVE_UNISTD_H], [0])
+AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
+AC_CONFIG_FILES([Makefile minizip.pc])
+AC_OUTPUT
diff -up zlib-1.2.4/contrib/minizip/Makefile.am.atools zlib-1.2.4/contrib/minizip/Makefile.am
--- zlib-1.2.4/contrib/minizip/Makefile.am.atools 2010-03-29 10:28:50.000000000 +0200
+++ zlib-1.2.4/contrib/minizip/Makefile.am 2010-03-29 10:32:11.000000000 +0200
@@ -0,0 +1,32 @@
+ACLOCAL_AMFLAGS = -I m4 --install
+
+lib_LTLIBRARIES = libminizip.la
+
+libminizip_la_SOURCES = \
+ ioapi.c \
+ mztools.c \
+ unzip.c \
+ zip.c
+
+# do not build the static version of libminizip
+libminizip_la_CFLAGS = -shared
+libminizip_la_LDFLAGS = -version-info 1:0:0
+
+minizip_includedir = $(includedir)/minizip
+minizip_include_HEADERS = \
+ crypt.h \
+ ioapi.h \
+ mztools.h \
+ unzip.h \
+ zip.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = minizip.pc
+
+EXTRA_PROGRAMS = miniunzip minizip
+
+miniunzip_SOURCES = miniunz.c
+miniunzip_LDADD = libminizip.la
+
+minizip_SOURCES = minizip.c
+minizip_LDADD = libminizip.la
diff -up zlib-1.2.4/contrib/minizip/minizip.pc.in.atools zlib-1.2.4/contrib/minizip/minizip.pc.in
--- zlib-1.2.4/contrib/minizip/minizip.pc.in.atools 2010-03-29 10:28:50.000000000 +0200
+++ zlib-1.2.4/contrib/minizip/minizip.pc.in 2010-03-29 10:28:50.000000000 +0200
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@/minizip
+
+Name: minizip
+Description: Minizip zip file manipulation library
+Requires:
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lminizip -lz
+Cflags: -I${includedir}