From 8ebb0079ddc9941c4bce2f9cb38fd1cd6957ebae Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 9 Sep 2013 08:31:11 +0000 Subject: Added a preliminary texlive.info Various minor build fixes git-svn-id: svn://tug.org/texlive/trunk@31604 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/gd/config.h.in | 6 ++ Build/source/libs/gd/configure | 47 ++++++++++- Build/source/libs/harfbuzz/config.h.in | 6 ++ Build/source/libs/harfbuzz/configure | 44 ++++++++++ Build/source/libs/libpng/config.h.in | 6 ++ Build/source/libs/libpng/configure | 47 ++++++++++- Build/source/libs/pixman/ChangeLog | 4 + Build/source/libs/pixman/config.h.in | 3 + Build/source/libs/pixman/configure | 141 +++++++++++++++++++++++---------- Build/source/libs/pixman/configure.ac | 7 +- Build/source/libs/poppler/config.h.in | 6 ++ Build/source/libs/poppler/configure | 47 ++++++++++- Build/source/libs/teckit/config.h.in | 6 ++ Build/source/libs/teckit/configure | 47 ++++++++++- Build/source/libs/zziplib/config.h.in | 6 ++ Build/source/libs/zziplib/configure | 47 ++++++++++- 16 files changed, 414 insertions(+), 56 deletions(-) (limited to 'Build/source/libs') diff --git a/Build/source/libs/gd/config.h.in b/Build/source/libs/gd/config.h.in index d72f0ba93dd..bad61548a46 100644 --- a/Build/source/libs/gd/config.h.in +++ b/Build/source/libs/gd/config.h.in @@ -91,8 +91,14 @@ /* Version number of package */ #undef VERSION +/* Define to 1 if declares 'z_const'. */ +#undef ZLIB_CONST + /* Define to empty if `const' does not conform to ANSI C. */ #undef const /* Define to `unsigned int' if does not define. */ #undef size_t + +/* Define as empty if not declared in . */ +#undef z_const diff --git a/Build/source/libs/gd/configure b/Build/source/libs/gd/configure index c2ebff6caf6..fa8e757f4a6 100755 --- a/Build/source/libs/gd/configure +++ b/Build/source/libs/gd/configure @@ -12796,6 +12796,9 @@ else fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -12834,6 +12837,47 @@ $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h ${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if defines 'z_const'" >&5 +$as_echo_n "checking if defines 'z_const'... " >&6; } +if ${kpse_cv_have_decl_z_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$ZLIB_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +z_const char * foo(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_decl_z_const=yes +else + kpse_cv_have_decl_z_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_decl_z_const" >&5 +$as_echo "$kpse_cv_have_decl_z_const" >&6; } +case $kpse_cv_have_decl_z_const in #( + yes) : + +$as_echo "#define ZLIB_CONST 1" >>confdefs.h + ;; #( + *) : + +$as_echo "#define z_const /**/" >>confdefs.h + ;; +esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -14454,9 +14498,6 @@ fi if test "x$enable_build" != xno || test -f config.force; then -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" eval LIBS=\"$ZLIB_LIBS \$LIBS\" diff --git a/Build/source/libs/harfbuzz/config.h.in b/Build/source/libs/harfbuzz/config.h.in index fe707d97c31..cf1fdbee4b4 100644 --- a/Build/source/libs/harfbuzz/config.h.in +++ b/Build/source/libs/harfbuzz/config.h.in @@ -138,3 +138,9 @@ /* Version number of package */ #undef VERSION + +/* Define to 1 if declares 'z_const'. */ +#undef ZLIB_CONST + +/* Define as empty if not declared in . */ +#undef z_const diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index e3ab006f630..a8dfa387920 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -16204,6 +16204,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -16242,6 +16245,47 @@ $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h ${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if defines 'z_const'" >&5 +$as_echo_n "checking if defines 'z_const'... " >&6; } +if ${kpse_cv_have_decl_z_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$ZLIB_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +z_const char * foo(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_decl_z_const=yes +else + kpse_cv_have_decl_z_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_decl_z_const" >&5 +$as_echo "$kpse_cv_have_decl_z_const" >&6; } +case $kpse_cv_have_decl_z_const in #( + yes) : + +$as_echo "#define ZLIB_CONST 1" >>confdefs.h + ;; #( + *) : + +$as_echo "#define z_const /**/" >>confdefs.h + ;; +esac ## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests : ${CONFIG_LT=./config.lt} diff --git a/Build/source/libs/libpng/config.h.in b/Build/source/libs/libpng/config.h.in index 466673bf296..1b40eb4d275 100644 --- a/Build/source/libs/libpng/config.h.in +++ b/Build/source/libs/libpng/config.h.in @@ -63,6 +63,9 @@ /* Version number of package */ #undef VERSION +/* Define to 1 if declares 'z_const'. */ +#undef ZLIB_CONST + /* Define to empty if `const' does not conform to ANSI C. */ #undef const @@ -82,3 +85,6 @@ /* Define to `unsigned int' if does not define. */ #undef size_t + +/* Define as empty if not declared in . */ +#undef z_const diff --git a/Build/source/libs/libpng/configure b/Build/source/libs/libpng/configure index 71fd992b119..558ad9a4bf5 100755 --- a/Build/source/libs/libpng/configure +++ b/Build/source/libs/libpng/configure @@ -5610,6 +5610,9 @@ else fi +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -5648,6 +5651,47 @@ $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h ${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if defines 'z_const'" >&5 +$as_echo_n "checking if defines 'z_const'... " >&6; } +if ${kpse_cv_have_decl_z_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$ZLIB_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +z_const char * foo(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_decl_z_const=yes +else + kpse_cv_have_decl_z_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_decl_z_const" >&5 +$as_echo "$kpse_cv_have_decl_z_const" >&6; } +case $kpse_cv_have_decl_z_const in #( + yes) : + +$as_echo "#define ZLIB_CONST 1" >>confdefs.h + ;; #( + *) : + +$as_echo "#define z_const /**/" >>confdefs.h + ;; +esac if test "x$enable_build" != xno; then @@ -5661,9 +5705,6 @@ fi if test "x$enable_build" != xno || test -f config.force; then -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" eval LIBS=\"$ZLIB_LIBS \$LIBS\" diff --git a/Build/source/libs/pixman/ChangeLog b/Build/source/libs/pixman/ChangeLog index 4e1c5637605..c813086a75b 100644 --- a/Build/source/libs/pixman/ChangeLog +++ b/Build/source/libs/pixman/ChangeLog @@ -1,3 +1,7 @@ +2013-08-23 Peter Breitenlohner + + * configure.ac: Recover test for sqrtf(). + 2013-08-08 Peter Breitenlohner Import pixman-0.30.2. diff --git a/Build/source/libs/pixman/config.h.in b/Build/source/libs/pixman/config.h.in index 256fef23cd8..bd4c113d85e 100644 --- a/Build/source/libs/pixman/config.h.in +++ b/Build/source/libs/pixman/config.h.in @@ -119,3 +119,6 @@ #ifndef __cplusplus #undef inline #endif + +/* Define to sqrt if you do not have the `sqrtf' function. */ +#undef sqrtf diff --git a/Build/source/libs/pixman/configure b/Build/source/libs/pixman/configure index 5e4b686392c..df979b19c93 100755 --- a/Build/source/libs/pixman/configure +++ b/Build/source/libs/pixman/configure @@ -5595,7 +5595,106 @@ else build_FALSE= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5 + +if :; then + +$as_echo "#define PIXMAN_NO_TLS 1" >>confdefs.h + +else + +$as_echo "#define USE_LOONGSON_MMI 1" >>confdefs.h + + +$as_echo "#define USE_X86_MMX 1" >>confdefs.h + + +$as_echo "#define USE_SSE2 1" >>confdefs.h + + +$as_echo "#define USE_VMX 1" >>confdefs.h + + +$as_echo "#define USE_ARM_SIMD 1" >>confdefs.h + + +$as_echo "#define USE_ARM_NEON 1" >>confdefs.h + + +$as_echo "#define USE_ARM_IWMMXT 1" >>confdefs.h + + +$as_echo "#define USE_MIPS_DSPR2 1" >>confdefs.h + + +$as_echo "#define USE_GCC_INLINE_ASM 1" >>confdefs.h + + +$as_echo "#define PIXMAN_TIMERS 1" >>confdefs.h + + +$as_echo "#define TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrtf" >&5 +$as_echo_n "checking for library containing sqrtf... " >&6; } +if ${ac_cv_search_sqrtf+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sqrtf (); +int +main () +{ +return sqrtf (); + ; + return 0; +} +_ACEOF +for ac_lib in '' m; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_sqrtf=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_sqrtf+:} false; then : + break +fi +done +if ${ac_cv_search_sqrtf+:} false; then : + +else + ac_cv_search_sqrtf=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrtf" >&5 +$as_echo "$ac_cv_search_sqrtf" >&6; } +ac_res=$ac_cv_search_sqrtf +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +else + +$as_echo "#define sqrtf sqrt" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5 $as_echo_n "checking for library containing sqrt... " >&6; } if ${ac_cv_search_sqrt+:} false; then : $as_echo_n "(cached) " >&6 @@ -5651,49 +5750,11 @@ if test "$ac_res" != no; then : fi - -if :; then - -$as_echo "#define PIXMAN_NO_TLS 1" >>confdefs.h - -else - -$as_echo "#define USE_LOONGSON_MMI 1" >>confdefs.h - - -$as_echo "#define USE_X86_MMX 1" >>confdefs.h - - -$as_echo "#define USE_SSE2 1" >>confdefs.h - - -$as_echo "#define USE_VMX 1" >>confdefs.h - - -$as_echo "#define USE_ARM_SIMD 1" >>confdefs.h - - -$as_echo "#define USE_ARM_NEON 1" >>confdefs.h - - -$as_echo "#define USE_ARM_IWMMXT 1" >>confdefs.h - - -$as_echo "#define USE_MIPS_DSPR2 1" >>confdefs.h - - -$as_echo "#define USE_GCC_INLINE_ASM 1" >>confdefs.h - - -$as_echo "#define PIXMAN_TIMERS 1" >>confdefs.h - - -$as_echo "#define TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR 1" >>confdefs.h - fi + ac_fn_c_check_decl "$LINENO" "SIZE_MAX" "ac_cv_have_decl_SIZE_MAX" "$ac_includes_default" if test "x$ac_cv_have_decl_SIZE_MAX" = xyes; then : diff --git a/Build/source/libs/pixman/configure.ac b/Build/source/libs/pixman/configure.ac index 5fe61aed6cb..9750a2a676d 100644 --- a/Build/source/libs/pixman/configure.ac +++ b/Build/source/libs/pixman/configure.ac @@ -32,7 +32,6 @@ AC_C_INLINE AC_CONFIG_HEADERS([config.h]) AM_CONDITIONAL([build], [test "x$enable_build" != xno]) -AC_SEARCH_LIBS([sqrt], [m]) if :; then AC_DEFINE([PIXMAN_NO_TLS], 1, [We do not want threading]) @@ -52,6 +51,12 @@ dnl add all these to config.h.in but do not define them in config.h [Whether the tool chain supports __attribute__((constructor))]) fi +dnl Check for missing sqrtf() as, e.g., for Solaris 9 +AC_SEARCH_LIBS([sqrtf], [m], , + [AC_DEFINE([sqrtf], [sqrt], + [Define to sqrt if you do not have the `sqrtf' function.]) + AC_SEARCH_LIBS([sqrt], [m])]) + dnl PIXMAN_LINK_WITH_ENV(env-setup, program, true-action, false-action) dnl dnl Compiles and links the given program in the environment setup by env-setup diff --git a/Build/source/libs/poppler/config.h.in b/Build/source/libs/poppler/config.h.in index ebf5b7b6095..94f471a34b7 100644 --- a/Build/source/libs/poppler/config.h.in +++ b/Build/source/libs/poppler/config.h.in @@ -108,6 +108,9 @@ /* Use fixed point arithmetic */ #undef USE_FIXEDPOINT +/* Define to 1 if declares 'z_const'. */ +#undef ZLIB_CONST + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 @@ -124,3 +127,6 @@ /* Define for MinGW32 to 0x0500 to declare `GetFileSizeEx'. */ #undef _WIN32_WINNT + +/* Define as empty if not declared in . */ +#undef z_const diff --git a/Build/source/libs/poppler/configure b/Build/source/libs/poppler/configure index 48bceb5b282..89660fe77e5 100755 --- a/Build/source/libs/poppler/configure +++ b/Build/source/libs/poppler/configure @@ -6482,6 +6482,9 @@ cat >>confdefs.h <<_ACEOF _ACEOF +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -6520,6 +6523,47 @@ $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h ${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if defines 'z_const'" >&5 +$as_echo_n "checking if defines 'z_const'... " >&6; } +if ${kpse_cv_have_decl_z_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$ZLIB_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +z_const char * foo(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_decl_z_const=yes +else + kpse_cv_have_decl_z_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_decl_z_const" >&5 +$as_echo "$kpse_cv_have_decl_z_const" >&6; } +case $kpse_cv_have_decl_z_const in #( + yes) : + +$as_echo "#define ZLIB_CONST 1" >>confdefs.h + ;; #( + *) : + +$as_echo "#define z_const /**/" >>confdefs.h + ;; +esac if test "x$enable_build" != xno; then @@ -6533,9 +6577,6 @@ fi if test "x$enable_build" != xno || test -f config.force; then -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" eval LIBS=\"$ZLIB_LIBS \$LIBS\" diff --git a/Build/source/libs/teckit/config.h.in b/Build/source/libs/teckit/config.h.in index acd02948a8d..7ef5c7da3ed 100644 --- a/Build/source/libs/teckit/config.h.in +++ b/Build/source/libs/teckit/config.h.in @@ -77,3 +77,9 @@ # undef WORDS_BIGENDIAN # endif #endif + +/* Define to 1 if declares 'z_const'. */ +#undef ZLIB_CONST + +/* Define as empty if not declared in . */ +#undef z_const diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure index 9dbebe940fb..b958ff03459 100755 --- a/Build/source/libs/teckit/configure +++ b/Build/source/libs/teckit/configure @@ -6561,6 +6561,9 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ac_config_headers="$ac_config_headers config.h" +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -6599,6 +6602,47 @@ $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h ${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if defines 'z_const'" >&5 +$as_echo_n "checking if defines 'z_const'... " >&6; } +if ${kpse_cv_have_decl_z_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$ZLIB_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +z_const char * foo(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_decl_z_const=yes +else + kpse_cv_have_decl_z_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_decl_z_const" >&5 +$as_echo "$kpse_cv_have_decl_z_const" >&6; } +case $kpse_cv_have_decl_z_const in #( + yes) : + +$as_echo "#define ZLIB_CONST 1" >>confdefs.h + ;; #( + *) : + +$as_echo "#define z_const /**/" >>confdefs.h + ;; +esac if test "x$enable_build" != xno; then @@ -6612,9 +6656,6 @@ fi if test "x$enable_build" != xno || test -f config.force; then -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" eval LIBS=\"$ZLIB_LIBS \$LIBS\" diff --git a/Build/source/libs/zziplib/config.h.in b/Build/source/libs/zziplib/config.h.in index 41a3df87a5e..43758c1fcbe 100644 --- a/Build/source/libs/zziplib/config.h.in +++ b/Build/source/libs/zziplib/config.h.in @@ -142,6 +142,9 @@ # endif #endif +/* Define to 1 if declares 'z_const'. */ +#undef ZLIB_CONST + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 @@ -190,3 +193,6 @@ /* Define to `int' if does not define. */ #undef ssize_t + +/* Define as empty if not declared in . */ +#undef z_const diff --git a/Build/source/libs/zziplib/configure b/Build/source/libs/zziplib/configure index 9439dca2f9a..4f1d2972498 100755 --- a/Build/source/libs/zziplib/configure +++ b/Build/source/libs/zziplib/configure @@ -6625,6 +6625,9 @@ fi done +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS + ## _KPSE_INIT: Initialize TL infrastructure kpse_BLD=`(cd "./../../." && pwd)` kpse_SRC=`(cd "$srcdir/../../." && pwd)` @@ -6663,6 +6666,47 @@ $(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/include/zconf.h ${top_builddir}/../../libs/zlib/include/zconf.h: cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if defines 'z_const'" >&5 +$as_echo_n "checking if defines 'z_const'... " >&6; } +if ${kpse_cv_have_decl_z_const+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$ZLIB_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +z_const char * foo(); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_decl_z_const=yes +else + kpse_cv_have_decl_z_const=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_decl_z_const" >&5 +$as_echo "$kpse_cv_have_decl_z_const" >&6; } +case $kpse_cv_have_decl_z_const in #( + yes) : + +$as_echo "#define ZLIB_CONST 1" >>confdefs.h + ;; #( + *) : + +$as_echo "#define z_const /**/" >>confdefs.h + ;; +esac if test "x$enable_build" != xno; then @@ -6676,9 +6720,6 @@ fi if test "x$enable_build" != xno || test -f config.force; then -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\" eval LIBS=\"$ZLIB_LIBS \$LIBS\" -- cgit v1.2.3