diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-09 08:31:11 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-09 08:31:11 +0000 |
| commit | 8ebb0079ddc9941c4bce2f9cb38fd1cd6957ebae (patch) | |
| tree | 19f11e56c0c2b60f0455a08165bcec6c9f005cb1 /Build/source/texk/ttf2pk2 | |
| parent | 4fd3c95ff0083729460b52ee6594e137b882186e (diff) | |
Added a preliminary texlive.info
Various minor build fixes
git-svn-id: svn://tug.org/texlive/trunk@31604 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ttf2pk2')
| -rw-r--r-- | Build/source/texk/ttf2pk2/config.h.in | 6 | ||||
| -rwxr-xr-x | Build/source/texk/ttf2pk2/configure | 41 |
2 files changed, 47 insertions, 0 deletions
diff --git a/Build/source/texk/ttf2pk2/config.h.in b/Build/source/texk/ttf2pk2/config.h.in index 08b8ce41a5a..94c996d4369 100644 --- a/Build/source/texk/ttf2pk2/config.h.in +++ b/Build/source/texk/ttf2pk2/config.h.in @@ -130,6 +130,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Define to 1 if <zlib.h> 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 @@ -168,3 +171,6 @@ /* Define to the type of an unsigned integer type of width exactly 64 bits if such a type exists and the standard includes do not define it. */ #undef uint64_t + +/* Define as empty if not declared in <zlib.h>. */ +#undef z_const diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure index 7cdd46b53a2..37c43c2664d 100755 --- a/Build/source/texk/ttf2pk2/configure +++ b/Build/source/texk/ttf2pk2/configure @@ -14476,6 +14476,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 <zlib.h> defines 'z_const'" >&5 +$as_echo_n "checking if <zlib.h> 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 <zlib.h> +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_LIB_FLAGS: Setup freetype2 (-lfreetype) flags |