|
 |
2a1975b |
diff -urN zlib-1.2.3.orig/Makefile.am zlib-1.2.3.kasal/Makefile.am
|
|
|
2a1975b |
--- zlib-1.2.3.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
|
|
|
2a1975b |
+++ zlib-1.2.3.kasal/Makefile.am 2009-03-17 17:58:36.000000000 +0100
|
|
 |
89656eb |
@@ -0,0 +1,70 @@
|
|
|
2a1975b |
+ACLOCAL_AMFLAGS = -I m4 --install
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+lib_LTLIBRARIES = libz.la
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+libz_la_SOURCES = \
|
|
|
2a1975b |
+ adler32.c \
|
|
|
2a1975b |
+ compress.c \
|
|
|
2a1975b |
+ crc32.c \
|
|
|
2a1975b |
+ crc32.h \
|
|
|
89656eb |
+ gzclose.c \
|
|
|
89656eb |
+ gzlib.c \
|
|
|
89656eb |
+ gzread.c \
|
|
|
89656eb |
+ gzwrite.c \
|
|
|
2a1975b |
+ uncompr.c \
|
|
|
2a1975b |
+ deflate.c \
|
|
|
2a1975b |
+ deflate.h \
|
|
|
2a1975b |
+ trees.c \
|
|
|
2a1975b |
+ trees.h \
|
|
|
2a1975b |
+ zutil.c \
|
|
|
2a1975b |
+ zutil.h \
|
|
|
2a1975b |
+ inflate.c \
|
|
|
2a1975b |
+ inflate.h \
|
|
|
2a1975b |
+ infback.c \
|
|
|
2a1975b |
+ inftrees.c \
|
|
|
2a1975b |
+ inftrees.h \
|
|
|
2a1975b |
+ inffast.c \
|
|
|
2a1975b |
+ inffast.h \
|
|
|
2a1975b |
+ infflate.h
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+# Use -version-number to match the file name used before autoconfiscation.
|
|
|
89656eb |
+libz_la_LDFLAGS = -version-number 1:2:5 -no-undefined
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+include_HEADERS = zlib.h
|
|
|
2a1975b |
+nodist_include_HEADERS = zconf.h
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+dist_man_MANS = zlib.3
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+## libminizip:
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+lib_LTLIBRARIES += libminizip.la
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+libminizip_la_SOURCES = \
|
|
|
2a1975b |
+ contrib/minizip/ioapi.c \
|
|
|
2a1975b |
+ contrib/minizip/mztools.c \
|
|
|
2a1975b |
+ contrib/minizip/unzip.c \
|
|
|
2a1975b |
+ contrib/minizip/zip.c
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+# do not build the static version of libminizip
|
|
|
2a1975b |
+libminizip_la_CFLAGS = -shared
|
|
|
2a1975b |
+libminizip_la_LDFLAGS = -version-info 1:0:0 -no-undefined
|
|
|
2a1975b |
+libminizip_la_LIBADD = libz.la
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+minizip_includedir = $(includedir)/minizip
|
|
|
2a1975b |
+minizip_include_HEADERS = \
|
|
|
2a1975b |
+ contrib/minizip/crypt.h \
|
|
|
2a1975b |
+ contrib/minizip/ioapi.h \
|
|
|
2a1975b |
+ contrib/minizip/mztools.h \
|
|
|
2a1975b |
+ contrib/minizip/unzip.h \
|
|
|
2a1975b |
+ contrib/minizip/zip.h
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+pkgconfigdir = $(libdir)/pkgconfig
|
|
|
2a1975b |
+pkgconfig_DATA = minizip.pc
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+EXTRA_PROGRAMS = miniunzip minizip
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+miniunzip_SOURCES = contrib/minizip/miniunz.c
|
|
|
2a1975b |
+miniunzip_LDADD = libminizip.la
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+minizip_SOURCES = contrib/minizip/minizip.c
|
|
|
2a1975b |
+minizip_LDADD = libminizip.la
|
|
|
2a1975b |
diff -urN zlib-1.2.3.orig/configure.ac zlib-1.2.3.kasal/configure.ac
|
|
|
2a1975b |
--- zlib-1.2.3.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
|
|
|
2a1975b |
+++ zlib-1.2.3.kasal/configure.ac 2009-03-17 17:28:41.000000000 +0100
|
|
|
2a1975b |
@@ -0,0 +1,13 @@
|
|
|
2a1975b |
+# -*- Autoconf -*-
|
|
|
2a1975b |
+# Process this file with autoconf to produce a configure script.
|
|
|
2a1975b |
+
|
|
|
89656eb |
+AC_INIT([zlib], [1.2.5], [bugzilla.redhat.com])
|
|
|
2333169 |
+AC_CONFIG_SRCDIR([gzlib.c])
|
|
|
2a1975b |
+AC_CONFIG_MACRO_DIR([m4])
|
|
|
2a1975b |
+AM_INIT_AUTOMAKE([foreign])
|
|
|
2a1975b |
+LT_INIT
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+AC_SUBST([HAVE_UNISTD_H], [0])
|
|
|
2a1975b |
+AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], [])
|
|
|
945b6d9 |
+AC_CONFIG_FILES([Makefile minizip.pc zlib.pc zconf.h:zconf.h.in])
|
|
|
2a1975b |
+AC_OUTPUT
|
|
|
2a1975b |
diff -urN zlib-1.2.3.orig/minizip.pc.in zlib-1.2.3.kasal/minizip.pc.in
|
|
|
2a1975b |
--- zlib-1.2.3.orig/minizip.pc.in 1970-01-01 01:00:00.000000000 +0100
|
|
|
2a1975b |
+++ zlib-1.2.3.kasal/minizip.pc.in 2009-01-07 15:49:34.000000000 +0100
|
|
|
2a1975b |
@@ -0,0 +1,11 @@
|
|
|
2a1975b |
+prefix=@prefix@
|
|
|
2a1975b |
+exec_prefix=@exec_prefix@
|
|
|
2a1975b |
+libdir=@libdir@
|
|
|
2a1975b |
+includedir=@includedir@/minizip
|
|
|
2a1975b |
+
|
|
|
2a1975b |
+Name: minizip
|
|
|
2a1975b |
+Description: Minizip zip file manipulation library
|
|
|
2a1975b |
+Requires:
|
|
|
2a1975b |
+Version: @PACKAGE_VERSION@
|
|
|
2a1975b |
+Libs: -L${libdir} -lminizip -lz
|
|
|
2a1975b |
+Cflags: -I${includedir}
|
|
|
945b6d9 |
--- zlib-1.2.3.orig/zlib.pc.in.orig 2011-08-12 13:00:47.043690473 +0200
|
|
|
945b6d9 |
+++ zlib-1.2.3/zlib.pc.in 2011-08-12 13:01:00.874943334 +0200
|
|
|
945b6d9 |
@@ -1,7 +1,6 @@
|
|
|
945b6d9 |
prefix=@prefix@
|
|
|
945b6d9 |
exec_prefix=@exec_prefix@
|
|
|
945b6d9 |
libdir=@libdir@
|
|
|
945b6d9 |
-sharedlibdir=@sharedlibdir@
|
|
|
945b6d9 |
includedir=@includedir@
|
|
|
945b6d9 |
|
|
|
945b6d9 |
Name: zlib
|
|
|
945b6d9 |
@@ -9,5 +8,5 @@
|
|
|
945b6d9 |
Version: @VERSION@
|
|
|
945b6d9 |
|
|
|
945b6d9 |
Requires:
|
|
|
945b6d9 |
-Libs: -L${libdir} -L${sharedlibdir} -lz
|
|
|
945b6d9 |
+Libs: -L${libdir} -lz
|
|
|
945b6d9 |
Cflags: -I${includedir}
|