From d63b4e3773083aa7a8e4877d591f0b938985bbc4 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 13 Feb 2012 08:34:04 +0000 Subject: Require zlib-1.2.6 (for XeTeX) git-svn-id: svn://tug.org/texlive/trunk@25386 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/zlib/ChangeLog | 4 ++++ Build/source/libs/zlib/ac/zlib.ac | 5 ++++- Build/source/libs/zlib/zlib-1.2.6-PATCHES/ChangeLog | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'Build/source/libs/zlib') diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog index 0d376bb2019..de97098b779 100644 --- a/Build/source/libs/zlib/ChangeLog +++ b/Build/source/libs/zlib/ChangeLog @@ -1,3 +1,7 @@ +2012-02-13 Peter Breitenlohner + + * ac/zlib.ac: Require zlib-1.2.6 or later (for XeTeX). + 2012-02-10 Peter Breitenlohner Import zlib-1.2.6. diff --git a/Build/source/libs/zlib/ac/zlib.ac b/Build/source/libs/zlib/ac/zlib.ac index 85f5a50439d..c2dcd5593a0 100644 --- a/Build/source/libs/zlib/ac/zlib.ac +++ b/Build/source/libs/zlib/ac/zlib.ac @@ -1,6 +1,6 @@ ## libs/zlib/ac/zlib.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/ dnl -dnl Copyright (C) 2009 Peter Breitenlohner +dnl Copyright (C) 2009-2012 Peter Breitenlohner dnl You may freely use, modify and/or distribute this file. dnl ## basic check of system zlib @@ -8,4 +8,7 @@ KPSE_TRY_LIB([zlib], [#include ], [z_stream stream; const char *version = zlibVersion(); +#if ZLIB_VERNUM < 0x1260 + choke me +#endif deflate(&stream, 0);]) diff --git a/Build/source/libs/zlib/zlib-1.2.6-PATCHES/ChangeLog b/Build/source/libs/zlib/zlib-1.2.6-PATCHES/ChangeLog index 522a6f5237f..2e529404838 100644 --- a/Build/source/libs/zlib/zlib-1.2.6-PATCHES/ChangeLog +++ b/Build/source/libs/zlib/zlib-1.2.6-PATCHES/ChangeLog @@ -1,4 +1,4 @@ -2010-09-27 Peter Breitenlohner +2012-02-11 Peter Breitenlohner Import zlib-1.2.6. * patch-01-LARGEFILE64_SOURCE: Removed. -- cgit v1.2.3