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 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 50 insertions(+), 3 deletions(-) (limited to 'Build/source/libs/gd') 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\" -- cgit v1.2.3