diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/Makefile.in | 1 | ||||
| -rwxr-xr-x | Build/source/configure | 4 | ||||
| -rw-r--r-- | Build/source/configure.ac | 3 | ||||
| -rw-r--r-- | Build/source/libs/zlib/config.h.in | 12 | ||||
| -rwxr-xr-x | Build/source/libs/zlib/configure | 355 | ||||
| -rw-r--r-- | Build/source/libs/zlib/configure.ac | 28 |
6 files changed, 385 insertions, 18 deletions
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index c590fb993bc..c6e6324f699 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -63,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/tardate.ac \ + $(top_srcdir)/version.ac \ $(top_srcdir)/utils/chktex/ac/withenable.ac \ $(top_srcdir)/utils/dialog/ac/withenable.ac \ $(top_srcdir)/utils/ps2eps/ac/withenable.ac \ diff --git a/Build/source/configure b/Build/source/configure index 2798ef75310..c442adc51b1 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -23061,11 +23061,11 @@ msg_compiling="$msg_compiling test "x$srcdir" = x. || msg_compiling="$msg_compiling from sources in $kpse_src" { $as_echo "$as_me:${as_lineno-$LINENO}: result: -** Configuration summary for $PACKAGE_STRING: +** Configuration summary for $PACKAGE_STRING (2011/dev$with_banner_add): $msg_compiling" >&5 $as_echo " -** Configuration summary for $PACKAGE_STRING: +** Configuration summary for $PACKAGE_STRING (2011/dev$with_banner_add): $msg_compiling" >&6; } case $kpse_src$kpse_bld in diff --git a/Build/source/configure.ac b/Build/source/configure.ac index 2a160e009ce..f2cc3d6e8c4 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -7,6 +7,7 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl m4_include([tardate.ac])[] dnl define tex_live_tardate +m4_include([version.ac])[] dnl define tex_live_version AC_INIT([TeX Live], tex_live_tardate, [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4]) @@ -165,7 +166,7 @@ msg_compiling="$msg_compiling test "x$srcdir" = x. || msg_compiling="$msg_compiling from sources in $kpse_src" AC_MSG_RESULT([ -** Configuration summary for $PACKAGE_STRING: +** Configuration summary for $PACKAGE_STRING (tex_live_version$with_banner_add): $msg_compiling]) case $kpse_src$kpse_bld in diff --git a/Build/source/libs/zlib/config.h.in b/Build/source/libs/zlib/config.h.in index c22ab888cfa..798b0133908 100644 --- a/Build/source/libs/zlib/config.h.in +++ b/Build/source/libs/zlib/config.h.in @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#undef HAVE_FSEEKO + /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H @@ -53,3 +56,12 @@ /* Version number of package */ #undef VERSION + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +#undef _LARGEFILE_SOURCE + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES diff --git a/Build/source/libs/zlib/configure b/Build/source/libs/zlib/configure index 8158978c961..9fcbc75da22 100755 --- a/Build/source/libs/zlib/configure +++ b/Build/source/libs/zlib/configure @@ -703,6 +703,7 @@ ac_user_opts=' enable_option_checking enable_maintainer_mode enable_dependency_tracking +enable_largefile ' ac_precious_vars='build_alias host_alias @@ -1335,6 +1336,7 @@ Optional Features: (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --disable-largefile omit support for large files Some influential environment variables: CC C compiler command @@ -1664,6 +1666,52 @@ $as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. @@ -4051,6 +4099,15 @@ fi done +ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" +if test "x$ac_cv_header_errno_h" = xyes; then : + ZLIB_DEFINES= +else + ZLIB_DEFINES="-DNO_ERRNO_H" +fi + + + for ac_header in unistd.h do : ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" @@ -4070,6 +4127,295 @@ if test x"$ac_cv_header_unistd_h" = xyes; then else zconf_sh='cp $srcdir/'"$ZCONF_SRC" fi + +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if ${ac_cv_sys_largefile_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + break +fi +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if ${ac_cv_sys_file_offset_bits+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=64; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if ${ac_cv_sys_large_files+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include <sys/types.h> + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=1; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; +esac +rm -rf conftest* + fi +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } +if ${ac_cv_sys_largefile_source+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/types.h> /* for off_t */ + #include <stdio.h> +int +main () +{ +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_sys_largefile_source=no; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGEFILE_SOURCE 1 +#include <sys/types.h> /* for off_t */ + #include <stdio.h> +int +main () +{ +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_sys_largefile_source=1; break +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_cv_sys_largefile_source=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 +$as_echo "$ac_cv_sys_largefile_source" >&6; } +case $ac_cv_sys_largefile_source in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source +_ACEOF +;; +esac +rm -rf conftest* + +# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +# in glibc 2.1.3, but that breaks too many other things. +# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +if test $ac_cv_sys_largefile_source != unknown; then + +$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h + +fi + +if test "$enable_largefile" != no; then + case $ac_cv_sys_file_offset_bits in #( + no) : + ;; #( + unknown) : + case $ac_cv_sys_large_files in #( + no | unknown) : + ;; #( + *) : + ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGE_FILES=1" ;; +esac ;; #( + *) : + ZLIB_DEFINES="$ZLIB_DEFINES -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE=1" ;; +esac +fi +case $ac_cv_sys_largefile_source in #( + no | unknown) : + ;; #( + *) : + ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGEFILE_SOURCE=1" ;; +esac + OTHER_TREE=zlib-1.2.3 if test "x1.2.5" = x1.2.3; then @@ -4083,15 +4429,6 @@ fi ac_config_commands="$ac_config_commands zconf.h" -ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" -if test "x$ac_cv_header_errno_h" = xyes; then : - ZLIB_DEFINES= -else - ZLIB_DEFINES="-DNO_ERRNO_H" -fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap support" >&5 $as_echo_n "checking for mmap support... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext 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> |