summaryrefslogtreecommitdiff
path: root/Build/source/libs/zlib/configure.ac
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-09-28 13:15:48 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-09-28 13:15:48 +0000
commit0c9f1096da7596ad4714ceb64afdb28e4d7f6c4d (patch)
tree1a6f5548ad2cfa77c157d9dc121379f25433b187 /Build/source/libs/zlib/configure.ac
parentea93ad9c5957f1badfded9711a62d0b59eb5da37 (diff)
zlib 1.2.5 build system and cleanup
git-svn-id: svn://tug.org/texlive/trunk@19930 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zlib/configure.ac')
-rw-r--r--Build/source/libs/zlib/configure.ac28
1 files changed, 22 insertions, 6 deletions
diff --git a/Build/source/libs/zlib/configure.ac b/Build/source/libs/zlib/configure.ac
index 4c9e96ce59b..b0ee5c21ba3 100644
--- a/Build/source/libs/zlib/configure.ac
+++ b/Build/source/libs/zlib/configure.ac
@@ -33,8 +33,12 @@ if test "x$ac_cv_header_stdc" != xyes; then
AC_MSG_ERROR([Sorry, can't do anything for you])
fi
+AC_CHECK_HEADER([errno.h],
+ [ZLIB_DEFINES=],
+ [ZLIB_DEFINES="-DNO_ERRNO_H"])
+
AC_CHECK_HEADERS([unistd.h])
-dnl zlib-1.2.3 has zconf.in.h, whereas zlib-1.2.4 has zconf.h.in
+dnl zlib-1.2.3 has zconf.in.h, whereas zlib-1.2.5 has zconf.h.in
m4_if(zlib_version, [1.2.3],
[
ZCONF_SRC=zlib-[]zlib_version/zconf.in.h
@@ -43,7 +47,7 @@ if test x"$ac_cv_header_unistd_h" = xyes; then
else
zconf_sh='cp $srcdir/'"$ZCONF_SRC"
fi
-AC_SUBST([OTHER_TREE], [zlib-1.2.4])],
+AC_SUBST([OTHER_TREE], [zlib-1.2.5])],
[
ZCONF_SRC=zlib-[]zlib_version/zconf.h.in
if test x"$ac_cv_header_unistd_h" = xyes; then
@@ -51,16 +55,28 @@ if test x"$ac_cv_header_unistd_h" = xyes; then
else
zconf_sh='cp $srcdir/'"$ZCONF_SRC"
fi
+
+AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
+dnl add to ZLIB_DEFINES
+if test "$enable_largefile" != no; then
+ AS_CASE([$ac_cv_sys_file_offset_bits],
+ [no], [],
+ [unknown], [AS_CASE([$ac_cv_sys_large_files],
+ [no | unknown], [],
+ [ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGE_FILES=1"])],
+ [ZLIB_DEFINES="$ZLIB_DEFINES -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE=1"])
+fi
+AS_CASE([$ac_cv_sys_largefile_source],
+ [no | unknown], [],
+ [ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGEFILE_SOURCE=1"])
+
AC_SUBST([OTHER_TREE], [zlib-1.2.3])])
AM_CONDITIONAL([ZLIB123], [test "x]zlib_version[" = x1.2.3])
AC_CONFIG_COMMANDS([zconf.h],
[eval "$zconf_sh" zconf.h],
[zconf_sh='$zconf_sh'])
-AC_CHECK_HEADER([errno.h],
- [ZLIB_DEFINES=],
- [ZLIB_DEFINES="-DNO_ERRNO_H"])
-
AC_MSG_CHECKING([for mmap support])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <sys/mman.h>