From 0c53c9b5c5e27c54d13b7e73353393794155cead Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 6 Aug 2012 08:38:41 +0000 Subject: lcdf-typetools 2.94 git-svn-id: svn://tug.org/texlive/trunk@27318 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/README | 4 +- Build/source/texk/lcdf-typetools/NEWS | 12 + Build/source/texk/lcdf-typetools/README | 2 +- Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 | 2 +- Build/source/texk/lcdf-typetools/configure | 5067 ++++++++++---------- Build/source/texk/lcdf-typetools/configure.ac | 210 +- Build/source/texk/lcdf-typetools/configure.ac.orig | 289 +- Build/source/texk/lcdf-typetools/include/config.h | 2 +- .../texk/lcdf-typetools/include/efont/otfcmap.hh | 7 +- .../source/texk/lcdf-typetools/include/lcdf/clp.h | 2 + .../texk/lcdf-typetools/include/lcdf/straccum.hh | 120 +- .../texk/lcdf-typetools/include/lcdf/string.hh | 54 +- .../lcdf-typetools-2.92-PATCHES/ChangeLog | 106 - .../lcdf-typetools-2.92-PATCHES/TL-Changes | 16 - .../lcdf-typetools-2.92-PATCHES/patch-01-const | 16 - .../lcdf-typetools-2.94-PATCHES/ChangeLog | 113 + .../lcdf-typetools-2.94-PATCHES/TL-Changes | 16 + .../lcdf-typetools-2.94-PATCHES/patch-01-const | 16 + .../source/texk/lcdf-typetools/lcdf-typetools.spec | 2 +- .../texk/lcdf-typetools/libefont/afmparse.cc | 2 +- Build/source/texk/lcdf-typetools/libefont/otf.cc | 2 +- .../source/texk/lcdf-typetools/libefont/otfcmap.cc | 18 +- .../texk/lcdf-typetools/libefont/otfdescrip.cc | 122 +- .../source/texk/lcdf-typetools/libefont/otfname.cc | 14 +- Build/source/texk/lcdf-typetools/liblcdf/clp.c | 36 +- .../source/texk/lcdf-typetools/liblcdf/straccum.cc | 72 +- Build/source/texk/lcdf-typetools/liblcdf/string.cc | 39 +- Build/source/texk/lcdf-typetools/mmafm/mmafm.1 | 2 +- Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 | 2 +- Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 | 2 +- .../source/texk/lcdf-typetools/otftotfm/otftotfm.1 | 2 +- .../texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 | 2 +- Build/source/texk/lcdf-typetools/t1lint/t1lint.1 | 2 +- .../source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 | 2 +- .../texk/lcdf-typetools/t1reencode/t1reencode.1 | 2 +- .../texk/lcdf-typetools/t1testpage/t1testpage.1 | 2 +- .../texk/lcdf-typetools/ttftotype42/ttftotype42.1 | 2 +- Build/source/texk/lcdf-typetools/version.ac | 4 +- 38 files changed, 3319 insertions(+), 3066 deletions(-) delete mode 100644 Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog delete mode 100644 Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/TL-Changes delete mode 100644 Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/patch-01-const create mode 100644 Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog create mode 100644 Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/TL-Changes create mode 100644 Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-01-const (limited to 'Build/source') diff --git a/Build/source/texk/README b/Build/source/texk/README index 164d1efb386..76ae51bc1de 100644 --- a/Build/source/texk/README +++ b/Build/source/texk/README @@ -70,9 +70,9 @@ kpathsea - maintained here, by us lacheck - checked 25apr11 http://mirror.ctan.org/support/lacheck/lacheck-1.26.tar.gz -lcdf-typetools 2.92 - checked 16aug11 +lcdf-typetools 2.94 - checked 5aug12 http://www.lcdf.org/type/ - http://www.lcdf.org/type/lcdf-typetools-2.92.tar.gz + http://www.lcdf.org/type/lcdf-typetools-2.94.tar.gz makeindexk - maintained here, by us diff --git a/Build/source/texk/lcdf-typetools/NEWS b/Build/source/texk/lcdf-typetools/NEWS index 42cb272b7ed..2813b447abb 100644 --- a/Build/source/texk/lcdf-typetools/NEWS +++ b/Build/source/texk/lcdf-typetools/NEWS @@ -1,4 +1,16 @@ LCDF Typetools NEWS + +Version 2.94 3.Aug.2012 + +* More compilation updates. + + +Version 2.93 23.Jul.2012 + +* Correct compilation problem reported by Dennis Veatch. + +* Update OpenType feature, script, and language lists, and some other nits. + Version 2.92 14.Aug.2011 diff --git a/Build/source/texk/lcdf-typetools/README b/Build/source/texk/lcdf-typetools/README index 767b150e3c7..ef53cede953 100644 --- a/Build/source/texk/lcdf-typetools/README +++ b/Build/source/texk/lcdf-typetools/README @@ -1,4 +1,4 @@ -LCDF-TYPETOOLS 2.92 +LCDF-TYPETOOLS 2.94 =================== USAGE diff --git a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 index 7cefb03d69e..25e1d7ec834 100644 --- a/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 +++ b/Build/source/texk/lcdf-typetools/cfftot1/cfftot1.1 @@ -1,4 +1,4 @@ -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure index fba885fe3f2..00cccdf17d1 100755 --- a/Build/source/texk/lcdf-typetools/configure +++ b/Build/source/texk/lcdf-typetools/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for LCDF typetools for TeX Live 2.92. +# Generated by GNU Autoconf 2.69 for LCDF typetools for TeX Live 2.94. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='LCDF typetools for TeX Live' PACKAGE_TARNAME='lcdf-typetools-for-tex-live' -PACKAGE_VERSION='2.92' -PACKAGE_STRING='LCDF typetools for TeX Live 2.92' +PACKAGE_VERSION='2.94' +PACKAGE_STRING='LCDF typetools for TeX Live 2.94' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -636,8 +636,6 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -FIXLIBC_FALSE -FIXLIBC_TRUE have_kpathsea_FALSE have_kpathsea_TRUE KPATHSEA_RULE @@ -647,6 +645,8 @@ KPATHSEA_INCLUDES texlive_build_FALSE texlive_build_TRUE SELECTED_SUBDIRS +FIXLIBC_FALSE +FIXLIBC_TRUE CXXLD TEMPLATE_OBJS WARNING_CXXFLAGS @@ -1357,7 +1357,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures LCDF typetools for TeX Live 2.92 to adapt to many kinds of systems. +\`configure' configures LCDF typetools for TeX Live 2.94 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1428,7 +1428,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.92:";; + short | recursive ) echo "Configuration of LCDF typetools for TeX Live 2.94:";; esac cat <<\_ACEOF @@ -1566,7 +1566,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LCDF typetools for TeX Live configure 2.92 +LCDF typetools for TeX Live configure 2.94 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2385,52 +2385,6 @@ fi } # ac_fn_cxx_check_header_mongrel -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_decl - # ac_fn_cxx_try_run LINENO # ------------------------ # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes @@ -2519,6 +2473,73 @@ $as_echo "$ac_res" >&6; } } # ac_fn_cxx_check_decl +# ac_fn_cxx_check_func LINENO FUNC VAR +# ------------------------------------ +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_cxx_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* 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 $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_cxx_check_func + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -2705,7 +2726,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LCDF typetools for TeX Live $as_me 2.92, which was +It was created by LCDF typetools for TeX Live $as_me 2.94, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8097,7 +8118,7 @@ fi # Define the identity of the package. PACKAGE='lcdf-typetools-for-tex-live' - VERSION='2.92' + VERSION='2.94' cat >>confdefs.h <<_ACEOF @@ -13350,7 +13371,7 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags -LCDF_TYPETOOLS_VERSION=2.92 +LCDF_TYPETOOLS_VERSION=2.94 ac_config_headers="$ac_config_headers autoconf.h" @@ -17304,6 +17325,12 @@ fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` @@ -17462,2763 +17489,2784 @@ fi fi +for ac_header in fcntl.h unistd.h sys/time.h sys/wait.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF - - -## Define configure options for lcdf-typetools. Extracted from configure.ac -## for ease of building TeX Live. -# Check whether --enable-cfftot1 was given. -if test "${enable_cfftot1+set}" = set; then : - enableval=$enable_cfftot1; -fi -# Check whether --enable-mmafm was given. -if test "${enable_mmafm+set}" = set; then : - enableval=$enable_mmafm; -fi -# Check whether --enable-mmpfb was given. -if test "${enable_mmpfb+set}" = set; then : - enableval=$enable_mmpfb; -fi -# Check whether --enable-otfinfo was given. -if test "${enable_otfinfo+set}" = set; then : - enableval=$enable_otfinfo; -fi -# Check whether --enable-otftotfm was given. -if test "${enable_otftotfm+set}" = set; then : - enableval=$enable_otftotfm; -fi -# Check whether --enable-t1dotlessj was given. -if test "${enable_t1dotlessj+set}" = set; then : - enableval=$enable_t1dotlessj; -fi -# Check whether --enable-t1lint was given. -if test "${enable_t1lint+set}" = set; then : - enableval=$enable_t1lint; -fi -# Check whether --enable-t1rawafm was given. -if test "${enable_t1rawafm+set}" = set; then : - enableval=$enable_t1rawafm; -fi -# Check whether --enable-t1reencode was given. -if test "${enable_t1reencode+set}" = set; then : - enableval=$enable_t1reencode; -fi -# Check whether --enable-t1testpage was given. -if test "${enable_t1testpage+set}" = set; then : - enableval=$enable_t1testpage; -fi -# Check whether --enable-ttftotype42 was given. -if test "${enable_ttftotype42+set}" = set; then : - enableval=$enable_ttftotype42; -fi - -# Check whether --enable-cfftot1 was given. -if test "${enable_cfftot1+set}" = set; then : - enableval=$enable_cfftot1; -fi -# Check whether --enable-t1dotlessj was given. -if test "${enable_t1dotlessj+set}" = set; then : - enableval=$enable_t1dotlessj; -fi -# Check whether --enable-ttftotype42 was given. -if test "${enable_ttftotype42+set}" = set; then : - enableval=$enable_ttftotype42; -fi -# Check whether --enable-updmap was given. -if test "${enable_updmap+set}" = set; then : - enableval=$enable_updmap; fi +done -SELECTED_SUBDIRS= -test "x$enable_cfftot1" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS cfftot1" -test "x$enable_mmafm" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS mmafm" -test "x$enable_mmpfb" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS mmpfb" -test "x$enable_otfinfo" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS otfinfo" -test "x$enable_otftotfm" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS otftotfm" -test "x$enable_t1dotlessj" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1dotlessj" -test "x$enable_t1lint" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1lint" -test "x$enable_t1rawafm" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1rawafm" -test "x$enable_t1reencode" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1reencode" -test "x$enable_t1testpage" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1testpage" -test "x$enable_ttftotype42" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS ttftotype42" +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test "x$enable_auto_cfftot1" != xno; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether works" >&5 +$as_echo_n "checking whether works... " >&6; } +if ${ac_cv_good_new_hdr+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ -$as_echo "#define HAVE_AUTO_CFFTOT1 1" >>confdefs.h + int a; + int *b = new(&a) int; + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_good_new_hdr=yes +else + ac_cv_good_new_hdr=no fi -if test "x$enable_auto_t1dotlessj" != xno; then : - -$as_echo "#define HAVE_AUTO_T1DOTLESSJ 1" >>confdefs.h - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -if test "x$enable_auto_ttftotype42" != xno; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_good_new_hdr" >&5 +$as_echo "$ac_cv_good_new_hdr" >&6; } +if test "$ac_cv_good_new_hdr" = yes; then -$as_echo "#define HAVE_AUTO_TTFTOTYPE42 1" >>confdefs.h +$as_echo "#define HAVE_NEW_HDR 1" >>confdefs.h fi -if test "x$enable_auto_updmap" != xno; then : - -$as_echo "#define HAVE_AUTO_UPDMAP 1" >>confdefs.h +for ac_header in new.h +do : + ac_fn_cxx_check_header_mongrel "$LINENO" "new.h" "ac_cv_header_new_h" "$ac_includes_default" +if test "x$ac_cv_header_new_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NEW_H 1 +_ACEOF fi +done - if test "x$enable_texlive_build" = xyes; then - texlive_build_TRUE= - texlive_build_FALSE='#' + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +$as_echo_n "checking whether byte ordering is bigendian... " >&6; } +if ${ac_cv_c_bigendian+:} false; then : + $as_echo_n "(cached) " >&6 else - texlive_build_TRUE='#' - texlive_build_FALSE= -fi - + ac_cv_c_bigendian=unknown + # See if we're dealing with a universal compiler. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __APPLE_CC__ + not a universal capable compiler + #endif + typedef int dummy; +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : -# Check whether --with-kpathsea was given. -if test "${with_kpathsea+set}" = set; then : - withval=$with_kpathsea; + # Check for potential -arch flags. It is not universal unless + # there are at least two -arch flags with different values. + ac_arch= + ac_prev= + for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do + if test -n "$ac_prev"; then + case $ac_word in + i?86 | x86_64 | ppc | ppc64) + if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then + ac_arch=$ac_word + else + ac_cv_c_bigendian=universal + break + fi + ;; + esac + ac_prev= + elif test "x$ac_word" = "x-arch"; then + ac_prev=arch + fi + done fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_c_bigendian = unknown; then + # See if sys/param.h defines the BYTE_ORDER macro. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include +int +main () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ + && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ + && LITTLE_ENDIAN) + bogus endian macros + #endif -kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS - -## _KPSE_INIT: Initialize TL infrastructure -kpse_BLD=`(cd "./../../." && pwd)` -kpse_SRC=`(cd "$srcdir/../../." && pwd)` - -## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests -: ${CONFIG_LT=./config.lt} -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5 -$as_echo "$as_me: creating $CONFIG_LT" >&6;} -as_write_fail=0 -cat >"$CONFIG_LT" <<_ASEOF || as_write_fail=1 -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>"$CONFIG_LT" <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + # It does; now see whether it defined to BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include +int +main () +{ +#if BYTE_ORDER != BIG_ENDIAN + not big endian + #endif -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' + ac_cv_c_bigendian=no fi - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) + bogus endian macros + #endif -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + # It does; now see whether it defined to _BIG_ENDIAN or not. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -# Find who we are. Look in the path if we contain no directory separator. -as_myself= -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS +int +main () +{ +#ifndef _BIG_ENDIAN + not big endian + #endif - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then + # Compile a test program. + if test "$cross_compiling" = yes; then : + # Try to guess by grepping values from an object file. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +short int ascii_mm[] = + { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; + short int ascii_ii[] = + { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; + int use_ascii (int i) { + return ascii_mm[i] + ascii_ii[i]; + } + short int ebcdic_ii[] = + { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; + short int ebcdic_mm[] = + { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; + int use_ebcdic (int i) { + return ebcdic_mm[i] + ebcdic_ii[i]; + } + extern int foo; -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' +int +main () +{ +return use_ascii (foo) == use_ebcdic (foo); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes + fi + if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi + fi +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long int l; + char c[sizeof (long int)]; + } u; + u.l = 1; + return u.c[sizeof (long int) - 1] == 1; -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_run "$LINENO"; then : + ac_cv_c_bigendian=no +else + ac_cv_c_bigendian=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +$as_echo "$ac_cv_c_bigendian" >&6; } + case $ac_cv_c_bigendian in #( + yes) + $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h +;; #( + no) -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. -as_fn_error () -{ - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 - fi - $as_echo "$as_me: error: $2" >&2 - as_fn_exit $as_status -} # as_fn_error +$as_echo "#define WORDS_LITTLEENDIAN 1" >>confdefs.h + ;; #( + universal) +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status + ;; #( + *) + as_fn_error $? "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +need_fixlibc=0 +for ac_func in strerror +do : + ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" +if test "x$ac_cv_func_strerror" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRERROR 1 +_ACEOF -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr else - as_expr=false + need_fixlibc=1 fi +done -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken strtod" >&5 +$as_echo_n "checking for broken strtod... " >&6; } +if ${ac_cv_broken_strtod+:} false; then : + $as_echo_n "(cached) " >&6 else - as_basename=false + if test "$cross_compiling" = yes; then : + ac_cv_broken_strtod=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int main(int c, char **v) { + char s[] = "12 "; + char *endp; + double d = strtod(s, &endp); + return (s + 2) == endp; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_broken_strtod=yes +else + ac_cv_broken_strtod=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_strtod" >&5 +$as_echo "$ac_cv_broken_strtod" >&6; } +if test "x$ac_cv_broken_strtod" = xyes; then + need_fixlibc=1 -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` +$as_echo "#define HAVE_BROKEN_STRTOD 1" >>confdefs.h -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits +fi -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; -esac +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file +ac_fn_cxx_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "#include +" +if test "x$ac_cv_have_decl_strnlen" = xyes; then : + ac_have_decl=1 else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null + ac_have_decl=0 fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else - as_ln_s='cp -pR' - fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRNLEN $ac_have_decl +_ACEOF + +for ac_func in strnlen +do : + ac_fn_cxx_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" +if test "x$ac_cv_func_strnlen" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRNLEN 1 +_ACEOF + have_strnlen=1 else - as_ln_s='cp -pR' + need_fixlibc=1 fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null +done +if test "x$have_strnlen" = x1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken strnlen" >&5 +$as_echo_n "checking for broken strnlen... " >&6; } +if ${ac_cv_broken_strnlen+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_broken_strnlen=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int main(int c, char **v) { + char s[] = "01234567891"; + return strnlen(s, 10) == 10; +} +_ACEOF +if ac_fn_cxx_try_run "$LINENO"; then : + ac_cv_broken_strnlen=yes +else + ac_cv_broken_strnlen=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_strnlen" >&5 +$as_echo "$ac_cv_broken_strnlen" >&6; } + if test "x$ac_cv_broken_strnlen" = xyes; then + need_fixlibc=1 - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" +$as_echo "#define HAVE_BROKEN_STRNLEN 1" >>confdefs.h + + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -} # as_fn_mkdir_p -if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false +for ac_func in ctime ftruncate mkstemp sigaction strdup strtoul vsnprintf waitpid +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + fi +done +ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor" +if test "x$ac_cv_func_floor" = xyes; then : -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 +$as_echo_n "checking for floor in -lm... " >&6; } +if ${ac_cv_lib_m_floor+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $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 floor (); +int +main () { - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p +return floor (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_floor=yes +else + ac_cv_lib_m_floor=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 +$as_echo "$ac_cv_lib_m_floor" >&6; } +if test "x$ac_cv_lib_m_floor" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 +_ACEOF -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + LIBS="-lm $LIBS" -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +fi +fi -exec 6>&1 -## --------------------------------- ## -## Main body of "$CONFIG_LT" script. ## -## --------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x "$CONFIG_LT" +ac_fn_c_check_func "$LINENO" "fabs" "ac_cv_func_fabs" +if test "x$ac_cv_func_fabs" = xyes; then : -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false -exec 5>>config.log +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fabs in -lm" >&5 +$as_echo_n "checking for fabs in -lm... " >&6; } +if ${ac_cv_lib_m_fabs+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lm $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 fabs (); +int +main () { - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 +return fabs (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_m_fabs=yes +else + ac_cv_lib_m_fabs=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fabs" >&5 +$as_echo "$ac_cv_lib_m_fabs" >&6; } +if test "x$ac_cv_lib_m_fabs" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBM 1 +_ACEOF -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. + LIBS="-lm $LIBS" -Usage: $0 [OPTIONS] +fi - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files +fi -Report bugs to ." + if test x$need_fixlibc = x1; then + FIXLIBC_TRUE= + FIXLIBC_FALSE='#' +else + FIXLIBC_TRUE='#' + FIXLIBC_FALSE= +fi -lt_cl_version="\ -LCDF typetools for TeX Live config.lt 2.92 -configured by $0, generated by GNU Autoconf 2.69. -Copyright (C) 2011 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." -while test $# != 0 -do - case $1 in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - -*) as_fn_error $? "unrecognized option: $1 -Try \`$0 --help' for more information." "$LINENO" 5 ;; +for ac_header in inttypes.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" +if test "x$ac_cv_header_inttypes_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_INTTYPES_H 1 +_ACEOF + have_inttypes_h=yes +else + have_inttypes_h=no +fi - *) as_fn_error $? "unrecognized argument: $1 -Try \`$0 --help' for more information." "$LINENO" 5 ;; - esac - shift done -if $lt_cl_silent; then - exec 6>/dev/null +for ac_header in sys/types.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_types_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_TYPES_H 1 +_ACEOF + have_sys_types_h=yes +else + have_sys_types_h=no fi -_LTEOF -cat >>"$CONFIG_LT" <<_LTEOF +done -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +if test $have_inttypes_h = no -a $have_sys_types_h = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uintXX_t typedefs" >&5 +$as_echo_n "checking for uintXX_t typedefs... " >&6; } +if ${ac_cv_uint_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' -host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' -reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' -AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' -STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' -predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' -postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' -predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' -postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' -LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' -reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' -reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' -GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' -with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' -inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' -link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' -always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' -exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' -prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' -file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' -hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' -predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' -postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' -predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' -postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' -compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "(^|[^a-zA-Z_0-9])uint32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then : + ac_cv_uint_t=yes +else + ac_cv_uint_t=no +fi +rm -f conftest* -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_uint_t" >&5 +$as_echo "$ac_cv_uint_t" >&6; } +fi +if test $have_inttypes_h = no -a $have_sys_types_h = yes -a "$ac_cv_uint_t" = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_intXX_t typedefs" >&5 +$as_echo_n "checking for u_intXX_t typedefs... " >&6; } +if ${ac_cv_u_int_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "(^|[^a-zA-Z_0-9])u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then : + ac_cv_u_int_t=yes +else + ac_cv_u_int_t=no +fi +rm -f conftest* -# Quote evaled strings. -for var in AS \ -DLLTOOL \ -OBJDUMP \ -SHELL \ -ECHO \ -PATH_SEPARATOR \ -SED \ -GREP \ -EGREP \ -FGREP \ -LD \ -NM \ -LN_S \ -lt_SP2NL \ -lt_NL2SP \ -reload_flag \ -deplibs_check_method \ -file_magic_cmd \ -file_magic_glob \ -want_nocaseglob \ -sharedlib_from_linklib_cmd \ -AR \ -AR_FLAGS \ -archiver_list_spec \ -STRIP \ -RANLIB \ -CC \ -CFLAGS \ -compiler \ -lt_cv_sys_global_symbol_pipe \ -lt_cv_sys_global_symbol_to_cdecl \ -lt_cv_sys_global_symbol_to_c_name_address \ -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -nm_file_list_spec \ -lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_pic \ -lt_prog_compiler_wl \ -lt_prog_compiler_static \ -lt_cv_prog_compiler_c_o \ -need_locks \ -MANIFEST_TOOL \ -DSYMUTIL \ -NMEDIT \ -LIPO \ -OTOOL \ -OTOOL64 \ -shrext_cmds \ -export_dynamic_flag_spec \ -whole_archive_flag_spec \ -compiler_needs_object \ -with_gnu_ld \ -allow_undefined_flag \ -no_undefined_flag \ -hardcode_libdir_flag_spec \ -hardcode_libdir_separator \ -exclude_expsyms \ -include_expsyms \ -file_list_spec \ -variables_saved_for_relink \ -libname_spec \ -library_names_spec \ -soname_spec \ -install_override_mode \ -finish_eval \ -old_striplib \ -striplib \ -compiler_lib_search_dirs \ -predep_objects \ -postdep_objects \ -predeps \ -postdeps \ -compiler_lib_search_path \ -LD_CXX \ -reload_flag_CXX \ -compiler_CXX \ -lt_prog_compiler_no_builtin_flag_CXX \ -lt_prog_compiler_pic_CXX \ -lt_prog_compiler_wl_CXX \ -lt_prog_compiler_static_CXX \ -lt_cv_prog_compiler_c_o_CXX \ -export_dynamic_flag_spec_CXX \ -whole_archive_flag_spec_CXX \ -compiler_needs_object_CXX \ -with_gnu_ld_CXX \ -allow_undefined_flag_CXX \ -no_undefined_flag_CXX \ -hardcode_libdir_flag_spec_CXX \ -hardcode_libdir_separator_CXX \ -exclude_expsyms_CXX \ -include_expsyms_CXX \ -file_list_spec_CXX \ -compiler_lib_search_dirs_CXX \ -predep_objects_CXX \ -postdep_objects_CXX \ -predeps_CXX \ -postdeps_CXX \ -compiler_lib_search_path_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_u_int_t" >&5 +$as_echo "$ac_cv_u_int_t" >&6; } +fi +if test $have_inttypes_h = yes -o "$ac_cv_uint_t" = yes; then + : +elif test "$ac_cv_u_int_t" = yes; then -# Double-quote double-evaled strings. -for var in reload_cmds \ -old_postinstall_cmds \ -old_postuninstall_cmds \ -old_archive_cmds \ -extract_expsyms_cmds \ -old_archive_from_new_cmds \ -old_archive_from_expsyms_cmds \ -archive_cmds \ -archive_expsym_cmds \ -module_cmds \ -module_expsym_cmds \ -export_symbols_cmds \ -prelink_cmds \ -postlink_cmds \ -postinstall_cmds \ -postuninstall_cmds \ -finish_cmds \ -sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec \ -reload_cmds_CXX \ -old_archive_cmds_CXX \ -old_archive_from_new_cmds_CXX \ -old_archive_from_expsyms_cmds_CXX \ -archive_cmds_CXX \ -archive_expsym_cmds_CXX \ -module_cmds_CXX \ -module_expsym_cmds_CXX \ -export_symbols_cmds_CXX \ -prelink_cmds_CXX \ -postlink_cmds_CXX; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in - *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done +$as_echo "#define HAVE_U_INT_TYPES 1" >>confdefs.h -ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +========================================= -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi +Neither uint32_t nor u_int32_t defined by or ! +Assuming \"short\" has 16 bits and \"int\" has 32 bits. +=========================================" >&5 +$as_echo "$as_me: WARNING: +========================================= - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile' +Neither uint32_t nor u_int32_t defined by or ! +Assuming \"short\" has 16 bits and \"int\" has 32 bits. +=========================================" >&2;} +$as_echo "#define HAVE_FAKE_INT_TYPES 1" >>confdefs.h +fi +ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#if HAVE_INTTYPES_H +# include +#endif +#if HAVE_SYS_TYPES_H +# include +#endif -_LTEOF +" +if test "x$ac_cv_type_uintptr_t" = xyes; then : -cat >>"$CONFIG_LT" <<\_LTEOF -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ofile" >&5 -$as_echo "$as_me: creating $ofile" >&6;} +cat >>confdefs.h <<_ACEOF +#define HAVE_UINTPTR_T 1 +_ACEOF - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi +fi - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 +$as_echo_n "checking size of void *... " >&6; } +if ${ac_cv_sizeof_void_p+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : +else + if test "$ac_cv_type_void_p" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (void *) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_void_p=0 + fi +fi -# The names of the tagged configurations supported by this script. -available_tags="CXX " +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 +$as_echo "$ac_cv_sizeof_void_p" >&6; } -# ### BEGIN LIBTOOL CONFIG -# Which release of libtool.m4 was used? -macro_version=$macro_version -macro_revision=$macro_revision -# Assembler program. -AS=$lt_AS +cat >>confdefs.h <<_ACEOF +#define SIZEOF_VOID_P $ac_cv_sizeof_void_p +_ACEOF -# DLL creation program. -DLLTOOL=$lt_DLLTOOL -# Object dumper program. -OBJDUMP=$lt_OBJDUMP +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 +$as_echo_n "checking size of unsigned long... " >&6; } +if ${ac_cv_sizeof_unsigned_long+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then : -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared +else + if test "$ac_cv_type_unsigned_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (unsigned long) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_long=0 + fi +fi -# Whether or not to build static libraries. -build_old_libs=$enable_static +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5 +$as_echo "$ac_cv_sizeof_unsigned_long" >&6; } -# What type of objects to build. -pic_mode=$pic_mode -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long +_ACEOF -# An echo program that protects backslashes. -ECHO=$lt_ECHO -# The PATH separator for the build system. -PATH_SEPARATOR=$lt_PATH_SEPARATOR +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5 +$as_echo_n "checking size of unsigned int... " >&6; } +if ${ac_cv_sizeof_unsigned_int+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int" "$ac_includes_default"; then : -# The host system. -host_alias=$host_alias -host=$host -host_os=$host_os +else + if test "$ac_cv_type_unsigned_int" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (unsigned int) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_unsigned_int=0 + fi +fi -# The build system. -build_alias=$build_alias -build=$build -build_os=$build_os +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_int" >&5 +$as_echo "$ac_cv_sizeof_unsigned_int" >&6; } -# A sed program that does not truncate output. -SED=$lt_SED -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="\$SED -e 1s/^X//" -# A grep program that handles long lines. -GREP=$lt_GREP +cat >>confdefs.h <<_ACEOF +#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int +_ACEOF -# An ERE matcher. -EGREP=$lt_EGREP -# A literal string matcher. -FGREP=$lt_FGREP -# A BSD- or MS-compatible name lister. -NM=$lt_NM -# Whether we need soft or hard links. -LN_S=$lt_LN_S -# What is the maximum length of a command? -max_cmd_len=$max_cmd_len +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -# Object file suffix (normally "o"). -objext=$ac_objext +for ac_header in byteorder.h netinet/in.h sys/param.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -# Executable file suffix (normally ""). -exeext=$exeext +fi -# whether the shell understands "unset". -lt_unset=$lt_unset +done -# turn spaces into newlines. -SP2NL=$lt_lt_SP2NL +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ntohs and ntohl are defined" >&5 +$as_echo_n "checking whether ntohs and ntohl are defined... " >&6; } +ac_ntoh_defined=no +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_BYTEORDER_H +# include +#elif HAVE_NETINET_IN_H +# include +#elif HAVE_SYS_PARAM_H +# include +#endif +#ifdef WIN32 +# ifdef __MSC_VER +# pragma warning (disable: 4290) +# endif +# include +#endif -# turn newlines into spaces. -NL2SP=$lt_lt_NL2SP +int +main () +{ +(void) ntohs(0x0020), (void) ntohl(0x03040020); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +ac_ntoh_defined=yes +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test $ac_ntoh_defined = no; then + for ac_header in arpa/inet.h +do : + ac_fn_cxx_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" +if test "x$ac_cv_header_arpa_inet_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ARPA_INET_H 1 +_ACEOF + have_arpa_inet_h=yes +else + have_arpa_inet_h=no +fi -# convert \$build file names to \$host format. -to_host_file_cmd=$lt_cv_to_host_file_cmd +done -# convert \$build files to toolchain format. -to_tool_file_cmd=$lt_cv_to_tool_file_cmd + if test $have_arpa_inet_h = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ntohs and ntohl are defined in " >&5 +$as_echo_n "checking whether ntohs and ntohl are defined in ... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if HAVE_SYS_TYPES_H +# include +#endif +#include -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method +int +main () +{ +(void) ntohs(0x0020), (void) ntohl(0x03040020); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } -# Command to use when deplibs_check_method = "file_magic". -file_magic_cmd=$lt_file_magic_cmd +$as_echo "#define NEED_ARPA_INET_H 1" >>confdefs.h -# How to find potential files when deplibs_check_method = "file_magic". -file_magic_glob=$lt_file_magic_glob - -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -want_nocaseglob=$lt_want_nocaseglob +ac_ntoh_defined=yes +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +fi +if test $ac_ntoh_defined = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +========================================= -# Command to associate shared and link libraries. -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd +Cannot find a definition for ntohs and/or ntohl! -# The archiver. -AR=$lt_AR +=========================================" >&5 +$as_echo "$as_me: WARNING: +========================================= -# Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS +Cannot find a definition for ntohs and/or ntohl! -# How to feed a file listing to the archiver. -archiver_list_spec=$lt_archiver_list_spec +=========================================" >&2;} + if test "x$enable_build" != xno; then + as_fn_error $? "exiting" "$LINENO" 5 + fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# A symbol stripping program. -STRIP=$lt_STRIP -# Commands used to install an old-style archive. -RANLIB=$lt_RANLIB -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 +$as_echo_n "checking for native WIN32 or MINGW32... " >&6; } +if ${kpse_cv_have_win32+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef WIN32 + choke me +#endif +int +main () +{ -# Whether to use a lock for old archive extraction. -lock_old_archive_extraction=$lock_old_archive_extraction + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __MINGW32__ + choke me +#endif +int +main () +{ -# A C compiler. -LTCC=$lt_CC + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_have_win32=mingw32 +else + kpse_cv_have_win32=native +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + kpse_cv_have_win32=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5 +$as_echo "$kpse_cv_have_win32" >&6; } -# LTCC compiler flags. -LTCFLAGS=$lt_CFLAGS +if test "x$kpse_cv_have_win32" != xno; then + LIBS="$LIBS -lwsock32" +fi -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Transform the output of nm in a proper C declaration. -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -# Transform the output of nm in a C name address pair. -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for addressable va_list type" >&5 +$as_echo_n "checking for addressable va_list type... " >&6; } +if ${ac_cv_va_list_addr+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +void f(va_list *) { +} +void g(va_list val) { + f(&val); +} +void h(int a, ...) { + va_list val; + va_start(val, a); + g(val); + va_end(val); +} +int +main () +{ +h(2, 3, 4); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_cv_va_list_addr=yes +else + ac_cv_va_list_addr=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_va_list_addr" >&5 +$as_echo "$ac_cv_va_list_addr" >&6; } +if test "x$ac_cv_va_list_addr" = xyes; then -# Transform the output of nm in a C name address pair when lib prefix is needed. -global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +$as_echo "#define HAVE_ADDRESSABLE_VA_LIST 1" >>confdefs.h -# Specify filename containing input files for \$NM. -nm_file_list_spec=$lt_nm_file_list_spec +fi -# The root where to search for dependent libraries,and in which our libraries should be installed. -lt_sysroot=$lt_sysroot -# The name of the directory that contains temporary libtool files. -objdir=$objdir -# Used to examine libraries when file_magic_cmd begins with "file". -MAGIC_CMD=$MAGIC_CMD +## Define configure options for lcdf-typetools. Extracted from configure.ac +## for ease of building TeX Live. +# Check whether --enable-cfftot1 was given. +if test "${enable_cfftot1+set}" = set; then : + enableval=$enable_cfftot1; +fi +# Check whether --enable-mmafm was given. +if test "${enable_mmafm+set}" = set; then : + enableval=$enable_mmafm; +fi +# Check whether --enable-mmpfb was given. +if test "${enable_mmpfb+set}" = set; then : + enableval=$enable_mmpfb; +fi +# Check whether --enable-otfinfo was given. +if test "${enable_otfinfo+set}" = set; then : + enableval=$enable_otfinfo; +fi +# Check whether --enable-otftotfm was given. +if test "${enable_otftotfm+set}" = set; then : + enableval=$enable_otftotfm; +fi +# Check whether --enable-t1dotlessj was given. +if test "${enable_t1dotlessj+set}" = set; then : + enableval=$enable_t1dotlessj; +fi +# Check whether --enable-t1lint was given. +if test "${enable_t1lint+set}" = set; then : + enableval=$enable_t1lint; +fi +# Check whether --enable-t1rawafm was given. +if test "${enable_t1rawafm+set}" = set; then : + enableval=$enable_t1rawafm; +fi +# Check whether --enable-t1reencode was given. +if test "${enable_t1reencode+set}" = set; then : + enableval=$enable_t1reencode; +fi +# Check whether --enable-t1testpage was given. +if test "${enable_t1testpage+set}" = set; then : + enableval=$enable_t1testpage; +fi +# Check whether --enable-ttftotype42 was given. +if test "${enable_ttftotype42+set}" = set; then : + enableval=$enable_ttftotype42; +fi -# Must we lock files when doing compilation? -need_locks=$lt_need_locks +# Check whether --enable-cfftot1 was given. +if test "${enable_cfftot1+set}" = set; then : + enableval=$enable_cfftot1; +fi +# Check whether --enable-t1dotlessj was given. +if test "${enable_t1dotlessj+set}" = set; then : + enableval=$enable_t1dotlessj; +fi +# Check whether --enable-ttftotype42 was given. +if test "${enable_ttftotype42+set}" = set; then : + enableval=$enable_ttftotype42; +fi +# Check whether --enable-updmap was given. +if test "${enable_updmap+set}" = set; then : + enableval=$enable_updmap; +fi -# Manifest tool. -MANIFEST_TOOL=$lt_MANIFEST_TOOL -# Tool to manipulate archived DWARF debug symbol files on Mac OS X. -DSYMUTIL=$lt_DSYMUTIL -# Tool to change global to local symbols on Mac OS X. -NMEDIT=$lt_NMEDIT +SELECTED_SUBDIRS= +test "x$enable_cfftot1" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS cfftot1" +test "x$enable_mmafm" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS mmafm" +test "x$enable_mmpfb" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS mmpfb" +test "x$enable_otfinfo" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS otfinfo" +test "x$enable_otftotfm" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS otftotfm" +test "x$enable_t1dotlessj" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1dotlessj" +test "x$enable_t1lint" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1lint" +test "x$enable_t1rawafm" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1rawafm" +test "x$enable_t1reencode" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1reencode" +test "x$enable_t1testpage" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS t1testpage" +test "x$enable_ttftotype42" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS ttftotype42" -# Tool to manipulate fat objects and archives on Mac OS X. -LIPO=$lt_LIPO -# ldd/readelf like tool for Mach-O binaries on Mac OS X. -OTOOL=$lt_OTOOL -# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. -OTOOL64=$lt_OTOOL64 +if test "x$enable_auto_cfftot1" != xno; then : -# Old archive suffix (normally "a"). -libext=$libext +$as_echo "#define HAVE_AUTO_CFFTOT1 1" >>confdefs.h -# Shared library suffix (normally ".so"). -shrext_cmds=$lt_shrext_cmds +fi +if test "x$enable_auto_t1dotlessj" != xno; then : -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds +$as_echo "#define HAVE_AUTO_T1DOTLESSJ 1" >>confdefs.h -# Variables whose values should be saved in libtool wrapper scripts and -# restored at link time. -variables_saved_for_relink=$lt_variables_saved_for_relink - -# Do we need the "lib" prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version +fi +if test "x$enable_auto_ttftotype42" != xno; then : -# Library versioning type. -version_type=$version_type +$as_echo "#define HAVE_AUTO_TTFTOTYPE42 1" >>confdefs.h -# Shared library runtime path variable. -runpath_var=$runpath_var +fi +if test "x$enable_auto_updmap" != xno; then : -# Shared library path variable. -shlibpath_var=$shlibpath_var +$as_echo "#define HAVE_AUTO_UPDMAP 1" >>confdefs.h -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath +fi -# Format of library name prefix. -libname_spec=$lt_libname_spec -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME -library_names_spec=$lt_library_names_spec -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec -# Permission mode override for installation of shared libraries. -install_override_mode=$lt_install_override_mode -# Command to use after installation of a shared archive. -postinstall_cmds=$lt_postinstall_cmds + if test "x$enable_texlive_build" = xyes; then + texlive_build_TRUE= + texlive_build_FALSE='#' +else + texlive_build_TRUE='#' + texlive_build_FALSE= +fi -# Command to use after uninstallation of a shared archive. -postuninstall_cmds=$lt_postuninstall_cmds -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds -# As "finish_cmds", except a single script fragment to be evaled but -# not shown. -finish_eval=$lt_finish_eval +# Check whether --with-kpathsea was given. +if test "${with_kpathsea+set}" = set; then : + withval=$with_kpathsea; +fi -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs -# Compile-time system search path for libraries. -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +kpse_save_CPPFLAGS=$CPPFLAGS +kpse_save_LIBS=$LIBS -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +## _KPSE_INIT: Initialize TL infrastructure +kpse_BLD=`(cd "./../../." && pwd)` +kpse_SRC=`(cd "$srcdir/../../." && pwd)` -# Whether dlopen is supported. -dlopen_support=$enable_dlopen +## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests +: ${CONFIG_LT=./config.lt} +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5 +$as_echo "$as_me: creating $CONFIG_LT" >&6;} +as_write_fail=0 +cat >"$CONFIG_LT" <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate a libtool stub with the current configuration. +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>"$CONFIG_LT" <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# The linker used to build libraries. -LD=$lt_LD -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS -# A language specific compiler. -CC=$lt_compiler + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi -# Is the compiler the GNU compiler? -with_gcc=$GCC +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms +exec 6>&1 +## --------------------------------- ## +## Main body of "$CONFIG_LT" script. ## +## --------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x "$CONFIG_LT" -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms +cat >>"$CONFIG_LT" <<\_LTEOF +lt_cl_silent=false +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds - -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds +lt_cl_help="\ +\`$as_me' creates a local libtool stub from the current configuration, +for use in further configure time tests before the real libtool is +generated. -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec +Usage: $0 [OPTIONS] -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs +Report bugs to ." -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects -postdep_objects=$lt_postdep_objects -predeps=$lt_predeps -postdeps=$lt_postdeps +lt_cl_version="\ +LCDF typetools for TeX Live config.lt 2.94 +configured by $0, generated by GNU Autoconf 2.69. -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path +Copyright (C) 2011 Free Software Foundation, Inc. +This config.lt script is free software; the Free Software Foundation +gives unlimited permision to copy, distribute and modify it." -# ### END LIBTOOL CONFIG +while test $# != 0 +do + case $1 in + --version | --v* | -V ) + echo "$lt_cl_version"; exit 0 ;; + --help | --h* | -h ) + echo "$lt_cl_help"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --quiet | --q* | --silent | --s* | -q ) + lt_cl_silent=: ;; -_LT_EOF + -*) as_fn_error $? "unrecognized option: $1 +Try \`$0 --help' for more information." "$LINENO" 5 ;; - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; + *) as_fn_error $? "unrecognized argument: $1 +Try \`$0 --help' for more information." "$LINENO" 5 ;; esac + shift +done +if $lt_cl_silent; then + exec 6>/dev/null +fi +_LTEOF -ltmain="$ac_aux_dir/ltmain.sh" - - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: +cat >>"$CONFIG_LT" <<_LTEOF - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`' +predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`' +postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`' +predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`' +postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`' +LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`' +reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`' +reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`' +GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`' +with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`' +inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`' +link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`' +always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`' +exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`' +prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`' +file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`' +hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`' +predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`' +postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`' +predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`' +postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`' +compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`' - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: +# Quote evaled strings. +for var in AS \ +DLLTOOL \ +OBJDUMP \ +SHELL \ +ECHO \ +PATH_SEPARATOR \ +SED \ +GREP \ +EGREP \ +FGREP \ +LD \ +NM \ +LN_S \ +lt_SP2NL \ +lt_NL2SP \ +reload_flag \ +deplibs_check_method \ +file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +sharedlib_from_linklib_cmd \ +AR \ +AR_FLAGS \ +archiver_list_spec \ +STRIP \ +RANLIB \ +CC \ +CFLAGS \ +compiler \ +lt_cv_sys_global_symbol_pipe \ +lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +nm_file_list_spec \ +lt_prog_compiler_no_builtin_flag \ +lt_prog_compiler_pic \ +lt_prog_compiler_wl \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ +MANIFEST_TOOL \ +DSYMUTIL \ +NMEDIT \ +LIPO \ +OTOOL \ +OTOOL64 \ +shrext_cmds \ +export_dynamic_flag_spec \ +whole_archive_flag_spec \ +compiler_needs_object \ +with_gnu_ld \ +allow_undefined_flag \ +no_undefined_flag \ +hardcode_libdir_flag_spec \ +hardcode_libdir_separator \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ +variables_saved_for_relink \ +libname_spec \ +library_names_spec \ +soname_spec \ +install_override_mode \ +finish_eval \ +old_striplib \ +striplib \ +compiler_lib_search_dirs \ +predep_objects \ +postdep_objects \ +predeps \ +postdeps \ +compiler_lib_search_path \ +LD_CXX \ +reload_flag_CXX \ +compiler_CXX \ +lt_prog_compiler_no_builtin_flag_CXX \ +lt_prog_compiler_pic_CXX \ +lt_prog_compiler_wl_CXX \ +lt_prog_compiler_static_CXX \ +lt_cv_prog_compiler_c_o_CXX \ +export_dynamic_flag_spec_CXX \ +whole_archive_flag_spec_CXX \ +compiler_needs_object_CXX \ +with_gnu_ld_CXX \ +allow_undefined_flag_CXX \ +no_undefined_flag_CXX \ +hardcode_libdir_flag_spec_CXX \ +hardcode_libdir_separator_CXX \ +exclude_expsyms_CXX \ +include_expsyms_CXX \ +file_list_spec_CXX \ +compiler_lib_search_dirs_CXX \ +predep_objects_CXX \ +postdep_objects_CXX \ +predeps_CXX \ +postdeps_CXX \ +compiler_lib_search_path_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done +# Double-quote double-evaled strings. +for var in reload_cmds \ +old_postinstall_cmds \ +old_postuninstall_cmds \ +old_archive_cmds \ +extract_expsyms_cmds \ +old_archive_from_new_cmds \ +old_archive_from_expsyms_cmds \ +archive_cmds \ +archive_expsym_cmds \ +module_cmds \ +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ +postlink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ +sys_lib_search_path_spec \ +sys_lib_dlsearch_path_spec \ +reload_cmds_CXX \ +old_archive_cmds_CXX \ +old_archive_from_new_cmds_CXX \ +old_archive_from_expsyms_cmds_CXX \ +archive_cmds_CXX \ +archive_expsym_cmds_CXX \ +module_cmds_CXX \ +module_expsym_cmds_CXX \ +export_symbols_cmds_CXX \ +prelink_cmds_CXX \ +postlink_cmds_CXX; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: +ac_aux_dir='$ac_aux_dir' +xsi_shell='$xsi_shell' +lt_shell_append='$lt_shell_append' +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST fi -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi + PACKAGE='$PACKAGE' + VERSION='$VERSION' + TIMESTAMP='$TIMESTAMP' + RM='$RM' + ofile='$ofile' -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - cat <<_LT_EOF >> "$ofile" +_LTEOF -# ### BEGIN LIBTOOL TAG CONFIG: CXX +cat >>"$CONFIG_LT" <<\_LTEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $ofile" >&5 +$as_echo "$as_me: creating $ofile" >&6;} -# The linker used to build libraries. -LD=$lt_LD_CXX -# How to create reloadable object files. -reload_flag=$lt_reload_flag_CXX -reload_cmds=$lt_reload_cmds_CXX + # See if we are running on zsh, and set the options which allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST + fi -# Commands used to build an old-style archive. -old_archive_cmds=$lt_old_archive_cmds_CXX + cfgfile="${ofile}T" + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" -# A language specific compiler. -CC=$lt_compiler_CXX + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL -# Is the compiler the GNU compiler? -with_gcc=$GCC_CXX +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# NOTE: Changes made to this file will be lost: look at ltmain.sh. +# +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# Written by Gordon Matzigkeit, 1996 +# +# This file is part of GNU Libtool. +# +# GNU Libtool is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX +# The names of the tagged configurations supported by this script. +available_tags="CXX " -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX +# ### BEGIN LIBTOOL CONFIG -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX +# Assembler program. +AS=$lt_AS -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX +# DLL creation program. +DLLTOOL=$lt_DLLTOOL -# Whether or not to disallow shared libs when runtime libs are static. -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX +# Object dumper program. +OBJDUMP=$lt_OBJDUMP -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX +# Whether or not to build static libraries. +build_old_libs=$enable_static -# Whether the compiler copes with passing no objects directly. -compiler_needs_object=$lt_compiler_needs_object_CXX +# What type of objects to build. +pic_mode=$pic_mode -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL -# Commands used to build a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +# An echo program that protects backslashes. +ECHO=$lt_ECHO -# Commands used to build a loadable module if different from building -# a shared archive. -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR -# Whether we are building with GNU ld or not. -with_gnu_ld=$lt_with_gnu_ld_CXX +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_CXX +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os -# Flag that enforces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_CXX +# A sed program that does not truncate output. +SED=$lt_SED -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="\$SED -e 1s/^X//" -# Whether we need a single "-rpath" flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX +# A grep program that handles long lines. +GREP=$lt_GREP -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary. -hardcode_direct=$hardcode_direct_CXX +# An ERE matcher. +EGREP=$lt_EGREP -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes -# DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the -# library is relocated. -hardcode_direct_absolute=$hardcode_direct_absolute_CXX +# A literal string matcher. +FGREP=$lt_FGREP -# Set to "yes" if using the -LDIR flag during linking hardcodes DIR -# into the resulting binary. -hardcode_minus_L=$hardcode_minus_L_CXX +# A BSD- or MS-compatible name lister. +NM=$lt_NM -# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -# into the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX +# Whether we need soft or hard links. +LN_S=$lt_LN_S -# Set to "yes" if building a shared library automatically hardcodes DIR -# into the library and all subsequent libraries and executables linked -# against it. -hardcode_automatic=$hardcode_automatic_CXX +# What is the maximum length of a command? +max_cmd_len=$max_cmd_len -# Set to yes if linker adds runtime paths of dependent libraries -# to runtime path list. -inherit_rpath=$inherit_rpath_CXX +# Object file suffix (normally "o"). +objext=$ac_objext -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_CXX +# Executable file suffix (normally ""). +exeext=$exeext -# Set to "yes" if exported symbols are required. -always_export_symbols=$always_export_symbols_CXX +# whether the shell understands "unset". +lt_unset=$lt_unset -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_CXX +# turn spaces into newlines. +SP2NL=$lt_lt_SP2NL -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_CXX +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_CXX +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd -# Commands necessary for linking programs (against libraries) with templates. -prelink_cmds=$lt_prelink_cmds_CXX +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds_CXX +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method -# Specify filename containing input files. -file_list_spec=$lt_file_list_spec_CXX +# Command to use when deplibs_check_method = "file_magic". +file_magic_cmd=$lt_file_magic_cmd -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_CXX +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob -# The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob -# Dependencies to place before and after the objects being linked to -# create a shared library. -predep_objects=$lt_predep_objects_CXX -postdep_objects=$lt_postdep_objects_CXX -predeps=$lt_predeps_CXX -postdeps=$lt_postdeps_CXX +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +# The archiver. +AR=$lt_AR -# ### END LIBTOOL TAG CONFIG: CXX -_LT_EOF +# Flags to create an archive. +AR_FLAGS=$lt_AR_FLAGS +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec -as_fn_exit 0 -_LTEOF -chmod +x "$CONFIG_LT" +# A symbol stripping program. +STRIP=$lt_STRIP -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec 5>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec 5>>config.log -$lt_cl_success || as_fn_exit 1 +# Commands used to install an old-style archive. +RANLIB=$lt_RANLIB +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_link="./libtool --mode=link --tag=CC $ac_link" +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction -## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags +# A C compiler. +LTCC=$lt_CC -# Check whether --with-system-kpathsea was given. -if test "${with_system_kpathsea+set}" = set; then : - withval=$with_system_kpathsea; -fi +# LTCC compiler flags. +LTCFLAGS=$lt_CFLAGS -# Check whether --with-kpathsea-includes was given. -if test "${with_kpathsea_includes+set}" = set; then : - withval=$with_kpathsea_includes; -fi +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe -# Check whether --with-kpathsea-libdir was given. -if test "${with_kpathsea_libdir+set}" = set; then : - withval=$with_kpathsea_libdir; -fi -if test "x$with_system_kpathsea" = xyes; then - if test "x$with_kpathsea_includes" != x && test "x$with_kpathsea_includes" != xyes; then - KPATHSEA_INCLUDES="-I$with_kpathsea_includes" -fi -KPATHSEA_LIBS="-lkpathsea" -if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; then - KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" -fi -else - KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" - KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" - KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' - KPATHSEA_RULE='# Rebuild libkpathsea -$(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h - cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../kpathsea/paths.h: - cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi +# Transform the output of nm in a proper C declaration. +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 -$as_echo_n "checking if libkpathsea supports debugging... " >&6; } -if ${kpse_cv_kpse_debug+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" -eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" +# Transform the output of nm in a C name address pair. +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen("f", "r") - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - kpse_cv_kpse_debug=yes -else - kpse_cv_kpse_debug=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CPPFLAGS=$kpse_save_CPPFLAGS -LIBS=$kpse_save_LIBS +# Transform the output of nm in a C name address pair when lib prefix is needed. +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 -$as_echo "$kpse_cv_kpse_debug" >&6; } -if test "x$kpse_cv_kpse_debug" != xyes; then : - KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" -fi +# The root where to search for dependent libraries,and in which our libraries should be installed. +lt_sysroot=$lt_sysroot +# The name of the directory that contains temporary libtool files. +objdir=$objdir -if test "x$enable_build" != xno || test -f config.force; then +# Used to examine libraries when file_magic_cmd begins with "file". +MAGIC_CMD=$MAGIC_CMD -eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" -eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" +# Must we lock files when doing compilation? +need_locks=$lt_need_locks +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL -if test "x$with_kpathsea" != xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kpathsea headers and library" >&5 -$as_echo_n "checking for kpathsea headers and library... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -kpse_tfm_format; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ac_fn_c_check_decl "$LINENO" "kpse_opentype_format" "ac_cv_have_decl_kpse_opentype_format" "#include -" -if test "x$ac_cv_have_decl_kpse_opentype_format" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi +# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +DSYMUTIL=$lt_DSYMUTIL -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_KPSE_OPENTYPE_FORMAT $ac_have_decl -_ACEOF +# Tool to change global to local symbols on Mac OS X. +NMEDIT=$lt_NMEDIT -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - with_kpathsea=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +# Tool to manipulate fat objects and archives on Mac OS X. +LIPO=$lt_LIPO - if test "x$with_kpathsea" = xno; then - as_fn_error $? " -========================================= +# ldd/readelf like tool for Mach-O binaries on Mac OS X. +OTOOL=$lt_OTOOL -I can't find the kpathsea library and/or header files. Tell me where to look -using the --with-kpathsea-libdir=DIR option (library under DIR) and ---with-kpathsea-includes=DIR option (header files under DIR/kpathsea), or -disable kpathsea support using --without-kpathsea. +# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +OTOOL64=$lt_OTOOL64 -=========================================" "$LINENO" 5 - fi +# Old archive suffix (normally "a"). +libext=$libext -$as_echo "#define HAVE_KPATHSEA 1" >>confdefs.h +# Shared library suffix (normally ".so"). +shrext_cmds=$lt_shrext_cmds -fi +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds -CPPFLAGS=$kpse_save_CPPFLAGS -LIBS=$kpse_save_LIBS +# Variables whose values should be saved in libtool wrapper scripts and +# restored at link time. +variables_saved_for_relink=$lt_variables_saved_for_relink +# Do we need the "lib" prefix for modules? +need_lib_prefix=$need_lib_prefix -echo timestamp >config.force -fi +# Do we need a version for libraries? +need_version=$need_version - if test "x$with_kpathsea" != xno; then - have_kpathsea_TRUE= - have_kpathsea_FALSE='#' -else - have_kpathsea_TRUE='#' - have_kpathsea_FALSE= -fi +# Library versioning type. +version_type=$version_type +# Shared library runtime path variable. +runpath_var=$runpath_var -# Check whether --enable-selfauto-set was given. -if test "${enable_selfauto_set+set}" = set; then : - enableval=$enable_selfauto_set; : -else - enable_selfauto_set=yes -fi +# Shared library path variable. +shlibpath_var=$shlibpath_var +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath -if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno -a "x$enable_texlive_build" != xyes; then - kpsewhich='kpsewhich' - test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich" - SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null` - SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null` - SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null` - if test -z "$SELFAUTODIR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -========================================= +# Format of library name prefix. +libname_spec=$lt_libname_spec -Could not extract SELFAUTO variables from $kpsewhich. -Either supply the correct PREFIX to --with-kpathsea, or supply ---disable-selfauto-loc. +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME +library_names_spec=$lt_library_names_spec -=========================================" >&5 -$as_echo "$as_me: WARNING: -========================================= +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec -Could not extract SELFAUTO variables from $kpsewhich. -Either supply the correct PREFIX to --with-kpathsea, or supply ---disable-selfauto-loc. +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode -=========================================" >&2;} - fi +# Command to use after installation of a shared archive. +postinstall_cmds=$lt_postinstall_cmds -cat >>confdefs.h <<_ACEOF -#define SELFAUTOLOC "$SELFAUTOLOC" -_ACEOF +# Command to use after uninstallation of a shared archive. +postuninstall_cmds=$lt_postuninstall_cmds +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds -cat >>confdefs.h <<_ACEOF -#define SELFAUTODIR "$SELFAUTODIR" -_ACEOF +# As "finish_cmds", except a single script fragment to be evaled but +# not shown. +finish_eval=$lt_finish_eval +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs -cat >>confdefs.h <<_ACEOF -#define SELFAUTOPARENT "$SELFAUTOPARENT" -_ACEOF +# Compile-time system search path for libraries. +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -fi +# Run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Whether dlopen is supported. +dlopen_support=$enable_dlopen +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_link="./libtool --mode=link --tag=CXX $ac_link" +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether works" >&5 -$as_echo_n "checking whether works... " >&6; } -if ${ac_cv_good_new_hdr+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib - int a; - int *b = new(&a) int; - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_good_new_hdr=yes -else - ac_cv_good_new_hdr=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_good_new_hdr" >&5 -$as_echo "$ac_cv_good_new_hdr" >&6; } -if test "$ac_cv_good_new_hdr" = yes; then +# The linker used to build libraries. +LD=$lt_LD -$as_echo "#define HAVE_NEW_HDR 1" >>confdefs.h +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds -fi -for ac_header in new.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds -fi +# A language specific compiler. +CC=$lt_compiler -done +# Is the compiler the GNU compiler? +with_gcc=$GCC + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if ${ac_cv_c_bigendian+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_bigendian=unknown - # See if we're dealing with a universal compiler. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __APPLE_CC__ - not a universal capable compiler - #endif - typedef int dummy; +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - # Check for potential -arch flags. It is not universal unless - # there are at least two -arch flags with different values. - ac_arch= - ac_prev= - for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do - if test -n "$ac_prev"; then - case $ac_word in - i?86 | x86_64 | ppc | ppc64) - if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then - ac_arch=$ac_word - else - ac_cv_c_bigendian=universal - break - fi - ;; - esac - ac_prev= - elif test "x$ac_word" = "x-arch"; then - ac_prev=arch - fi - done -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds -int -main () -{ -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ - && LITTLE_ENDIAN) - bogus endian macros - #endif +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - # It does; now see whether it defined to BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld -int -main () -{ -#if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes -else - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag -int -main () -{ -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) - bogus endian macros - #endif +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - # It does; now see whether it defined to _BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator -int -main () -{ -#ifndef _BIG_ENDIAN - not big endian - #endif +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes -else - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # Compile a test program. - if test "$cross_compiling" = yes; then : - # Try to guess by grepping values from an object file. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -short int ascii_mm[] = - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; - int use_ascii (int i) { - return ascii_mm[i] + ascii_ii[i]; - } - short int ebcdic_ii[] = - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; - int use_ebcdic (int i) { - return ebcdic_mm[i] + ebcdic_ii[i]; - } - extern int foo; +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute -int -main () -{ -return use_ascii (foo) == use_ebcdic (foo); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then - ac_cv_c_bigendian=yes - fi - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi - fi -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - ac_cv_c_bigendian=no -else - ac_cv_c_bigendian=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } - case $ac_cv_c_bigendian in #( - yes) - $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h -;; #( - no) +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath -$as_echo "#define WORDS_LITTLEENDIAN 1" >>confdefs.h - ;; #( - universal) +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols - ;; #( - *) - as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; - esac +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_link="./libtool --mode=link --tag=CC $ac_link" +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds -need_fixlibc=0 -for ac_func in strerror -do : - ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" -if test "x$ac_cv_func_strerror" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRERROR 1 -_ACEOF - : -else - need_fixlibc=1 -fi -done +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken strtod" >&5 -$as_echo_n "checking for broken strtod... " >&6; } -if ${ac_cv_broken_strtod+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_broken_strtod=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int main(int c, char **v) { - char s[] = "12 "; - char *endp; - double d = strtod(s, &endp); - return (s + 2) == endp; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_broken_strtod=yes -else - ac_cv_broken_strtod=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_strtod" >&5 -$as_echo "$ac_cv_broken_strtod" >&6; } -if test "x$ac_cv_broken_strtod" = xyes; then - need_fixlibc=1 +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects +postdep_objects=$lt_postdep_objects +predeps=$lt_predeps +postdeps=$lt_postdeps -$as_echo "#define HAVE_BROKEN_STRTOD 1" >>confdefs.h +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path -fi +# ### END LIBTOOL CONFIG -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_link="./libtool --mode=link --tag=CXX $ac_link" +_LT_EOF -ac_fn_cxx_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default" -if test "x$ac_cv_have_decl_strnlen" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES fi +_LT_EOF + ;; + esac -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_STRNLEN $ac_have_decl -_ACEOF -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_link="./libtool --mode=link --tag=CC $ac_link" +ltmain="$ac_aux_dir/ltmain.sh" -for ac_func in strnlen -do : - ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen" -if test "x$ac_cv_func_strnlen" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRNLEN 1 -_ACEOF - have_strnlen=1 -else - need_fixlibc=1 -fi -done -if test "x$have_strnlen" = x1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken strnlen" >&5 -$as_echo_n "checking for broken strnlen... " >&6; } -if ${ac_cv_broken_strnlen+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_broken_strnlen=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int main(int c, char **v) { - char s[] = "01234567891"; - return strnlen(s, 10) == 10; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_broken_strnlen=yes -else - ac_cv_broken_strnlen=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_broken_strnlen" >&5 -$as_echo "$ac_cv_broken_strnlen" >&6; } - if test "x$ac_cv_broken_strnlen" = xyes; then - need_fixlibc=1 + if test x"$xsi_shell" = xyes; then + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +func_dirname ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: -$as_echo "#define HAVE_BROKEN_STRNLEN 1" >>confdefs.h - fi -fi + sed -e '/^func_basename ()$/,/^} # func_basename /c\ +func_basename ()\ +{\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: -for ac_func in ctime ftruncate mkstemp sigaction strdup strtoul vsnprintf waitpid -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -fi -done + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +func_dirname_and_basename ()\ +{\ +\ case ${1} in\ +\ */*) func_dirname_result="${1%/*}${2}" ;;\ +\ * ) func_dirname_result="${3}" ;;\ +\ esac\ +\ func_basename_result="${1##*/}"\ +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: -ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor" -if test "x$ac_cv_func_floor" = xyes; then : - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 -$as_echo_n "checking for floor in -lm... " >&6; } -if ${ac_cv_lib_m_floor+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $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 floor (); -int -main () -{ -return floor (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_floor=yes -else - ac_cv_lib_m_floor=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 -$as_echo "$ac_cv_lib_m_floor" >&6; } -if test "x$ac_cv_lib_m_floor" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +func_stripname ()\ +{\ +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +\ # positional parameters, so assign one to ordinary parameter first.\ +\ func_stripname_result=${3}\ +\ func_stripname_result=${func_stripname_result#"${1}"}\ +\ func_stripname_result=${func_stripname_result%"${2}"}\ +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: - LIBS="-lm $LIBS" -fi + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +func_split_long_opt ()\ +{\ +\ func_split_long_opt_name=${1%%=*}\ +\ func_split_long_opt_arg=${1#*=}\ +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: -fi -ac_fn_c_check_func "$LINENO" "fabs" "ac_cv_func_fabs" -if test "x$ac_cv_func_fabs" = xyes; then : - : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fabs in -lm" >&5 -$as_echo_n "checking for fabs in -lm... " >&6; } -if ${ac_cv_lib_m_fabs+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +func_split_short_opt ()\ +{\ +\ func_split_short_opt_arg=${1#??}\ +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: -/* 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 fabs (); -int -main () -{ -return fabs (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_fabs=yes -else - ac_cv_lib_m_fabs=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fabs" >&5 -$as_echo "$ac_cv_lib_m_fabs" >&6; } -if test "x$ac_cv_lib_m_fabs" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF - LIBS="-lm $LIBS" + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +func_lo2o ()\ +{\ +\ case ${1} in\ +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +\ *) func_lo2o_result=${1} ;;\ +\ esac\ +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: -fi -fi + sed -e '/^func_xform ()$/,/^} # func_xform /c\ +func_xform ()\ +{\ + func_xform_result=${1%.*}.lo\ +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: -for ac_header in unistd.h fcntl.h sys/time.h sys/wait.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi + sed -e '/^func_arith ()$/,/^} # func_arith /c\ +func_arith ()\ +{\ + func_arith_result=$(( $* ))\ +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: -done - if test x$need_fixlibc = x1; then - FIXLIBC_TRUE= - FIXLIBC_FALSE='#' -else - FIXLIBC_TRUE='#' - FIXLIBC_FALSE= + sed -e '/^func_len ()$/,/^} # func_len /c\ +func_len ()\ +{\ + func_len_result=${#1}\ +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + fi +if test x"$lt_shell_append" = xyes; then + sed -e '/^func_append ()$/,/^} # func_append /c\ +func_append ()\ +{\ + eval "${1}+=\\${2}"\ +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: + + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +func_append_quoted ()\ +{\ +\ func_quote_for_eval "${2}"\ +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +test 0 -eq $? || _lt_function_replace_fail=: -for ac_header in inttypes.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" -if test "x$ac_cv_header_inttypes_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_INTTYPES_H 1 -_ACEOF - have_inttypes_h=yes + # Save a `func_append' function call where possible by direct use of '+=' + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: else - have_inttypes_h=no + # Save a `func_append' function call even when '+=' is not available + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ + && mv -f "$cfgfile.tmp" "$cfgfile" \ + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") + test 0 -eq $? || _lt_function_replace_fail=: fi -done - -for ac_header in sys/types.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_types_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_TYPES_H 1 -_ACEOF - have_sys_types_h=yes -else - have_sys_types_h=no +if test x"$_lt_function_replace_fail" = x":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} fi -done + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" -if test $have_inttypes_h = no -a $have_sys_types_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uintXX_t typedefs" >&5 -$as_echo_n "checking for uintXX_t typedefs... " >&6; } -if ${ac_cv_uint_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "(^|[^a-zA-Z_0-9])uint32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then : - ac_cv_uint_t=yes -else - ac_cv_uint_t=no -fi -rm -f conftest* + cat <<_LT_EOF >> "$ofile" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_uint_t" >&5 -$as_echo "$ac_cv_uint_t" >&6; } -fi -if test $have_inttypes_h = no -a $have_sys_types_h = yes -a "$ac_cv_uint_t" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_intXX_t typedefs" >&5 -$as_echo_n "checking for u_intXX_t typedefs... " >&6; } -if ${ac_cv_u_int_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +# ### BEGIN LIBTOOL TAG CONFIG: CXX -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "(^|[^a-zA-Z_0-9])u_int32_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then : - ac_cv_u_int_t=yes -else - ac_cv_u_int_t=no -fi -rm -f conftest* +# The linker used to build libraries. +LD=$lt_LD_CXX -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_u_int_t" >&5 -$as_echo "$ac_cv_u_int_t" >&6; } -fi -if test $have_inttypes_h = yes -o "$ac_cv_uint_t" = yes; then - : -elif test "$ac_cv_u_int_t" = yes; then +# How to create reloadable object files. +reload_flag=$lt_reload_flag_CXX +reload_cmds=$lt_reload_cmds_CXX -$as_echo "#define HAVE_U_INT_TYPES 1" >>confdefs.h +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds_CXX -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -========================================= +# A language specific compiler. +CC=$lt_compiler_CXX -Neither uint32_t nor u_int32_t defined by or ! -Assuming \"short\" has 16 bits and \"int\" has 32 bits. +# Is the compiler the GNU compiler? +with_gcc=$GCC_CXX + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic_CXX + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl_CXX + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static_CXX + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc_CXX -=========================================" >&5 -$as_echo "$as_me: WARNING: -========================================= +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX -Neither uint32_t nor u_int32_t defined by or ! -Assuming \"short\" has 16 bits and \"int\" has 32 bits. +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX -=========================================" >&2;} +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX -$as_echo "#define HAVE_FAKE_INT_TYPES 1" >>confdefs.h +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object_CXX -fi +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX -ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "#if HAVE_INTTYPES_H -# include -#endif -#if HAVE_SYS_TYPES_H -# include -#endif +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX -" -if test "x$ac_cv_type_uintptr_t" = xyes; then : +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds_CXX +archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -cat >>confdefs.h <<_ACEOF -#define HAVE_UINTPTR_T 1 -_ACEOF +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds_CXX +module_expsym_cmds=$lt_module_expsym_cmds_CXX +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld_CXX -fi +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag_CXX +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag_CXX -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 -$as_echo_n "checking size of void *... " >&6; } -if ${ac_cv_sizeof_void_p+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX -else - if test "$ac_cv_type_void_p" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (void *) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_void_p=0 - fi -fi +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5 -$as_echo "$ac_cv_sizeof_void_p" >&6; } +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct_CXX +# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute_CXX +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L_CXX -cat >>confdefs.h <<_ACEOF -#define SIZEOF_VOID_P $ac_cv_sizeof_void_p -_ACEOF +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic_CXX -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5 -$as_echo_n "checking size of unsigned long... " >&6; } -if ${ac_cv_sizeof_unsigned_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long" "$ac_includes_default"; then : +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath_CXX -else - if test "$ac_cv_type_unsigned_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (unsigned long) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_long=0 - fi -fi +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs_CXX -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5 -$as_echo "$ac_cv_sizeof_unsigned_long" >&6; } +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols_CXX +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds_CXX +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms_CXX -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long -_ACEOF +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms_CXX +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds_CXX -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5 -$as_echo_n "checking size of unsigned int... " >&6; } -if ${ac_cv_sizeof_unsigned_int+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int" "$ac_includes_default"; then : +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds_CXX -else - if test "$ac_cv_type_unsigned_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot compute sizeof (unsigned int) -See \`config.log' for more details" "$LINENO" 5; } - else - ac_cv_sizeof_unsigned_int=0 - fi -fi +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec_CXX -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_int" >&5 -$as_echo "$ac_cv_sizeof_unsigned_int" >&6; } +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action_CXX +# The directories searched by this compiler when creating a shared library. +compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX +# Dependencies to place before and after the objects being linked to +# create a shared library. +predep_objects=$lt_predep_objects_CXX +postdep_objects=$lt_postdep_objects_CXX +predeps=$lt_predeps_CXX +postdeps=$lt_postdeps_CXX -cat >>confdefs.h <<_ACEOF -#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int -_ACEOF +# The library search path used internally by the compiler when linking +# a shared library. +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +# ### END LIBTOOL TAG CONFIG: CXX +_LT_EOF +as_fn_exit 0 +_LTEOF +chmod +x "$CONFIG_LT" +# configure is writing to config.log, but config.lt does its own redirection, +# appending to config.log, which fails on DOS, as config.log is still kept +# open by configure. Here we exec the FD to /dev/null, effectively closing +# config.log, so it can be properly (re)opened and appended to by config.lt. +lt_cl_success=: +test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" +exec 5>/dev/null +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false +exec 5>>config.log +$lt_cl_success || as_fn_exit 1 ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -20227,227 +20275,199 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu ac_link="./libtool --mode=link --tag=CXX $ac_link" -for ac_header in byteorder.h netinet/in.h sys/param.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags +# Check whether --with-system-kpathsea was given. +if test "${with_system_kpathsea+set}" = set; then : + withval=$with_system_kpathsea; fi -done +# Check whether --with-kpathsea-includes was given. +if test "${with_kpathsea_includes+set}" = set; then : + withval=$with_kpathsea_includes; +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ntohs and ntohl are defined" >&5 -$as_echo_n "checking whether ntohs and ntohl are defined... " >&6; } -ac_ntoh_defined=no -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if HAVE_SYS_TYPES_H -# include -#endif -#if HAVE_BYTEORDER_H -# include -#elif HAVE_NETINET_IN_H -# include -#elif HAVE_SYS_PARAM_H -# include -#endif -#ifdef WIN32 -# ifdef __MSC_VER -# pragma warning (disable: 4290) -# endif -# include -#endif +# Check whether --with-kpathsea-libdir was given. +if test "${with_kpathsea_libdir+set}" = set; then : + withval=$with_kpathsea_libdir; +fi +if test "x$with_system_kpathsea" = xyes; then + if test "x$with_kpathsea_includes" != x && test "x$with_kpathsea_includes" != xyes; then + KPATHSEA_INCLUDES="-I$with_kpathsea_includes" +fi +KPATHSEA_LIBS="-lkpathsea" +if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; then + KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" +fi +else + KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" + KPATHSEA_LIBS="$kpse_BLD/texk/kpathsea/libkpathsea.la" + KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la' + KPATHSEA_RULE='# Rebuild libkpathsea +$(KPATHSEA_DEPEND): ${top_srcdir}/../kpathsea/*.[ch] ${top_builddir}/../kpathsea/paths.h + cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild +${top_builddir}/../kpathsea/paths.h: + cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5 +$as_echo_n "checking if libkpathsea supports debugging... " >&6; } +if ${kpse_cv_kpse_debug+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include int main () { -(void) ntohs(0x0020), (void) ntohl(0x03040020); +FILE *f = fopen("f", "r") ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -ac_ntoh_defined=yes +if ac_fn_cxx_try_link "$LINENO"; then : + kpse_cv_kpse_debug=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + kpse_cv_kpse_debug=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test $ac_ntoh_defined = no; then - for ac_header in arpa/inet.h -do : - ac_fn_cxx_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" -if test "x$ac_cv_header_arpa_inet_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_ARPA_INET_H 1 -_ACEOF - have_arpa_inet_h=yes -else - have_arpa_inet_h=no +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_kpse_debug" >&5 +$as_echo "$kpse_cv_kpse_debug" >&6; } +if test "x$kpse_cv_kpse_debug" != xyes; then : + KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG" fi -done - if test $have_arpa_inet_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ntohs and ntohl are defined in " >&5 -$as_echo_n "checking whether ntohs and ntohl are defined in ... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#if HAVE_SYS_TYPES_H -# include -#endif -#include +if test "x$enable_build" != xno || test -f config.force; then + +eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" +eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" + +if test "x$with_kpathsea" != xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kpathsea headers and library" >&5 +$as_echo_n "checking for kpathsea headers and library... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include int main () { -(void) ntohs(0x0020), (void) ntohl(0x03040020); +kpse_tfm_format; ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + ac_fn_cxx_check_decl "$LINENO" "kpse_opentype_format" "ac_cv_have_decl_kpse_opentype_format" "#include +" +if test "x$ac_cv_have_decl_kpse_opentype_format" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi -$as_echo "#define NEED_ARPA_INET_H 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_KPSE_OPENTYPE_FORMAT $ac_have_decl +_ACEOF -ac_ntoh_defined=yes else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + with_kpathsea=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi -fi -if test $ac_ntoh_defined = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -========================================= - -Cannot find a definition for ntohs and/or ntohl! +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -=========================================" >&5 -$as_echo "$as_me: WARNING: + if test "x$with_kpathsea" = xno; then + as_fn_error $? " ========================================= -Cannot find a definition for ntohs and/or ntohl! +I can't find the kpathsea library and/or header files. Tell me where to look +using the --with-kpathsea-libdir=DIR option (library under DIR) and +--with-kpathsea-includes=DIR option (header files under DIR/kpathsea), or +disable kpathsea support using --without-kpathsea. -=========================================" >&2;} - if test "x$enable_build" != xno; then - as_fn_error $? "exiting" "$LINENO" 5 +=========================================" "$LINENO" 5 fi + +$as_echo "#define HAVE_KPATHSEA 1" >>confdefs.h + fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_link="./libtool --mode=link --tag=CC $ac_link" +CPPFLAGS=$kpse_save_CPPFLAGS +LIBS=$kpse_save_LIBS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5 -$as_echo_n "checking for native WIN32 or MINGW32... " >&6; } -if ${kpse_cv_have_win32+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef WIN32 - choke me -#endif -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __MINGW32__ - choke me -#endif -int -main () -{ +echo timestamp >config.force +fi - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - kpse_cv_have_win32=mingw32 + if test "x$with_kpathsea" != xno; then + have_kpathsea_TRUE= + have_kpathsea_FALSE='#' else - kpse_cv_have_win32=native + have_kpathsea_TRUE='#' + have_kpathsea_FALSE= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +# Check whether --enable-selfauto-set was given. +if test "${enable_selfauto_set+set}" = set; then : + enableval=$enable_selfauto_set; else - kpse_cv_have_win32=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + enable_selfauto_set=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5 -$as_echo "$kpse_cv_have_win32" >&6; } -if test "x$kpse_cv_have_win32" != xno; then - LIBS="$LIBS -lwsock32" -fi +if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno -a "x$enable_texlive_build" != xyes; then + kpsewhich='kpsewhich' + test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich" + SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null` + SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null` + SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null` + if test -z "$SELFAUTODIR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +========================================= -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -ac_link="./libtool --mode=link --tag=CXX $ac_link" +Could not extract SELFAUTO variables from $kpsewhich. +Either supply the correct PREFIX to --with-kpathsea, or supply +--disable-selfauto-loc. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for addressable va_list type" >&5 -$as_echo_n "checking for addressable va_list type... " >&6; } -if ${ac_cv_va_list_addr+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -void f(va_list *) { -} -void g(va_list val) { - f(&val); -} -void h(int a, ...) { - va_list val; - va_start(val, a); - g(val); - va_end(val); -} -int -main () -{ -h(2, 3, 4); - ; - return 0; -} +=========================================" >&5 +$as_echo "$as_me: WARNING: +========================================= + +Could not extract SELFAUTO variables from $kpsewhich. +Either supply the correct PREFIX to --with-kpathsea, or supply +--disable-selfauto-loc. + +=========================================" >&2;} + fi + +cat >>confdefs.h <<_ACEOF +#define SELFAUTOLOC "$SELFAUTOLOC" _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_va_list_addr=yes -else - ac_cv_va_list_addr=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_va_list_addr" >&5 -$as_echo "$ac_cv_va_list_addr" >&6; } -if test "x$ac_cv_va_list_addr" = xyes; then -$as_echo "#define HAVE_ADDRESSABLE_VA_LIST 1" >>confdefs.h + +cat >>confdefs.h <<_ACEOF +#define SELFAUTODIR "$SELFAUTODIR" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define SELFAUTOPARENT "$SELFAUTOPARENT" +_ACEOF fi @@ -20461,6 +20481,7 @@ $as_echo "#define MMAFM_RUN_MMPFB 1" >>confdefs.h + shell_expand () { val=`eval echo '$'"$1"` while echo "x$val" | fgrep '$' >/dev/null 2>&1; do val=`eval echo "$val"`; done @@ -20641,6 +20662,11 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi + +if test -z "${FIXLIBC_TRUE}" && test -z "${FIXLIBC_FALSE}"; then + as_fn_error $? "conditional \"FIXLIBC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${texlive_build_TRUE}" && test -z "${texlive_build_FALSE}"; then as_fn_error $? "conditional \"texlive_build\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -20650,11 +20676,6 @@ if test -z "${have_kpathsea_TRUE}" && test -z "${have_kpathsea_FALSE}"; then Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${FIXLIBC_TRUE}" && test -z "${FIXLIBC_FALSE}"; then - as_fn_error $? "conditional \"FIXLIBC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi - : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files @@ -21051,7 +21072,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LCDF typetools for TeX Live $as_me 2.92, which was +This file was extended by LCDF typetools for TeX Live $as_me 2.94, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21117,7 +21138,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LCDF typetools for TeX Live config.status 2.92 +LCDF typetools for TeX Live config.status 2.94 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac index 490afd71bb7..fead57d2d39 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac +++ b/Build/source/texk/lcdf-typetools/configure.ac @@ -30,100 +30,9 @@ dnl dnl directory searching dnl +AC_LANG_C AC_HEADER_DIRENT - - -dnl -dnl select programs to be compiled and automatically run -dnl - -m4_include([ac/lcdf-typetools.ac]) - -SELECTED_SUBDIRS= -AC_FOREACH([Kpse_Prog], kpse_lcdf_typetools_progs, - [test "x$enable_[]Kpse_Prog" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS Kpse_Prog" -]) -AC_SUBST(SELECTED_SUBDIRS) - -AC_FOREACH([Kpse_Opt], kpse_otftotfm_auto_opts, - [AS_IF([test "x$enable_auto_]Kpse_Opt[" != xno], - [AC_DEFINE([HAVE_AUTO_]AS_TR_CPP(Kpse_Opt), 1, - [Define to run ]Kpse_Opt[ from otftotfm.])]) -]) - - -dnl -dnl kpathsea -dnl - -dnl The configure option '--enable-texlive-build' is inherited -dnl and automatically enabled, when built as part of TeX Live. - -AM_CONDITIONAL([texlive_build], [test "x$enable_texlive_build" = xyes]) - -AC_ARG_WITH([kpathsea], - AS_HELP_STRING([--without-kpathsea], - [build otftotfm without kpathsea])) - -KPSE_KPATHSEA_FLAGS - -if test "x$enable_build" != xno || test -f config.force; then - -KPSE_ADD_FLAGS([kpathsea]) - -if test "x$with_kpathsea" != xno; then - AC_MSG_CHECKING([for kpathsea headers and library]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[kpse_tfm_format;]])], - [AC_MSG_RESULT([yes]) - AC_CHECK_DECLS([kpse_opentype_format], , , - [#include ])], - [AC_MSG_RESULT([no]) - with_kpathsea=no]) - - if test "x$with_kpathsea" = xno; then - AC_MSG_ERROR([ -========================================= - -I can't find the kpathsea library and/or header files. Tell me where to look -using the --with-kpathsea-libdir=DIR option (library under DIR) and ---with-kpathsea-includes=DIR option (header files under DIR/kpathsea), or -disable kpathsea support using --without-kpathsea. - -=========================================]) - fi - AC_DEFINE(HAVE_KPATHSEA, 1, [Define if you want to use kpathsea.]) -fi - -KPSE_RESTORE_FLAGS - -echo timestamp >config.force -fi - -AM_CONDITIONAL([have_kpathsea], [test "x$with_kpathsea" != xno]) - -AC_ARG_ENABLE(selfauto-set, [ --disable-selfauto-set disable setting SELFAUTO variables from kpsewhich], :, enable_selfauto_set=yes) - -if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno -a "x$enable_texlive_build" != xyes; then - kpsewhich='kpsewhich' - test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich" - SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null` - SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null` - SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null` - if test -z "$SELFAUTODIR"; then - AC_MSG_WARN([ -========================================= - -Could not extract SELFAUTO variables from $kpsewhich. -Either supply the correct PREFIX to --with-kpathsea, or supply ---disable-selfauto-loc. - -=========================================]) - fi - AC_DEFINE_UNQUOTED(SELFAUTOLOC, "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable]) - AC_DEFINE_UNQUOTED(SELFAUTODIR, "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable]) - AC_DEFINE_UNQUOTED(SELFAUTOPARENT, "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable]) -fi +AC_CHECK_HEADERS([fcntl.h unistd.h sys/time.h sys/wait.h]) dnl @@ -138,9 +47,9 @@ AC_CACHE_CHECK([whether works], ac_cv_good_new_hdr, return 0; ], ac_cv_good_new_hdr=yes, ac_cv_good_new_hdr=no)]) if test "$ac_cv_good_new_hdr" = yes; then - AC_DEFINE(HAVE_NEW_HDR, 1, [Define if exists and works.]) + AC_DEFINE([HAVE_NEW_HDR], [1], [Define if exists and works.]) fi -AC_CHECK_HEADERS(new.h unistd.h) +AC_CHECK_HEADERS([new.h]) dnl @@ -158,7 +67,7 @@ dnl AC_LANG_C need_fixlibc=0 -AC_CHECK_FUNCS([strerror], [:], [need_fixlibc=1]) +AC_CHECK_FUNCS([strerror], [], [need_fixlibc=1]) AC_CACHE_CHECK([for broken strtod], [ac_cv_broken_strtod], [AC_TRY_RUN([#include @@ -172,12 +81,11 @@ int main(int c, char **v) { [ac_cv_broken_strtod=no])]) if test "x$ac_cv_broken_strtod" = xyes; then need_fixlibc=1 - AC_DEFINE(HAVE_BROKEN_STRTOD, 1, [Define if strtod is broken.]) + AC_DEFINE([HAVE_BROKEN_STRTOD], [1], [Define if strtod is broken.]) fi AC_LANG_CPLUSPLUS -AC_CHECK_DECLS([strnlen]) -AC_LANG_C +AC_CHECK_DECLS([strnlen], [], [], [#include ]) AC_CHECK_FUNCS([strnlen], [have_strnlen=1], [need_fixlibc=1]) if test "x$have_strnlen" = x1; then AC_CACHE_CHECK([for broken strnlen], [ac_cv_broken_strnlen], @@ -193,11 +101,11 @@ int main(int c, char **v) { AC_DEFINE([HAVE_BROKEN_STRNLEN], [1], [Define if strnlen is broken.]) fi fi +AC_LANG_C AC_CHECK_FUNCS([ctime ftruncate mkstemp sigaction strdup strtoul vsnprintf waitpid]) -AC_CHECK_FUNC([floor], [:], [AC_CHECK_LIB(m, floor)]) -AC_CHECK_FUNC([fabs], [:], [AC_CHECK_LIB(m, fabs)]) -AC_CHECK_HEADERS([unistd.h fcntl.h sys/time.h sys/wait.h]) +AC_CHECK_FUNC([floor], [], [AC_CHECK_LIB([m], [floor])]) +AC_CHECK_FUNC([fabs], [], [AC_CHECK_LIB([m], [fabs])]) AM_CONDITIONAL([FIXLIBC], [test x$need_fixlibc = x1]) @@ -317,7 +225,7 @@ dnl is va_list addressable? dnl AC_LANG_CPLUSPLUS -AC_CACHE_CHECK([for addressable va_list type], +AC_CACHE_CHECK([for addressable va_list type], ac_cv_va_list_addr, [AC_TRY_COMPILE([#include void f(va_list *) { @@ -336,6 +244,101 @@ if test "x$ac_cv_va_list_addr" = xyes; then fi +dnl +dnl select programs to be compiled and automatically run +dnl + +m4_include([ac/lcdf-typetools.ac]) + +SELECTED_SUBDIRS= +AC_FOREACH([Kpse_Prog], kpse_lcdf_typetools_progs, + [test "x$enable_[]Kpse_Prog" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS Kpse_Prog" +]) +AC_SUBST(SELECTED_SUBDIRS) + +AC_FOREACH([Kpse_Opt], kpse_otftotfm_auto_opts, + [AS_IF([test "x$enable_auto_]Kpse_Opt[" != xno], + [AC_DEFINE([HAVE_AUTO_]AS_TR_CPP(Kpse_Opt), 1, + [Define to run ]Kpse_Opt[ from otftotfm.])]) +]) + + +dnl +dnl kpathsea +dnl + +dnl The configure option '--enable-texlive-build' is inherited +dnl and automatically enabled, when built as part of TeX Live. + +AM_CONDITIONAL([texlive_build], [test "x$enable_texlive_build" = xyes]) + +AC_ARG_WITH([kpathsea], + AS_HELP_STRING([--without-kpathsea], + [build otftotfm without kpathsea])) + +KPSE_KPATHSEA_FLAGS + +if test "x$enable_build" != xno || test -f config.force; then + +KPSE_ADD_FLAGS([kpathsea]) + +if test "x$with_kpathsea" != xno; then + AC_MSG_CHECKING([for kpathsea headers and library]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[kpse_tfm_format;]])], + [AC_MSG_RESULT([yes]) + AC_CHECK_DECLS([kpse_opentype_format], , , + [#include ])], + [AC_MSG_RESULT([no]) + with_kpathsea=no]) + + if test "x$with_kpathsea" = xno; then + AC_MSG_ERROR([ +========================================= + +I can't find the kpathsea library and/or header files. Tell me where to look +using the --with-kpathsea-libdir=DIR option (library under DIR) and +--with-kpathsea-includes=DIR option (header files under DIR/kpathsea), or +disable kpathsea support using --without-kpathsea. + +=========================================]) + fi + AC_DEFINE(HAVE_KPATHSEA, 1, [Define if you want to use kpathsea.]) +fi + +KPSE_RESTORE_FLAGS + +echo timestamp >config.force +fi + +AM_CONDITIONAL([have_kpathsea], [test "x$with_kpathsea" != xno]) + +AC_ARG_ENABLE([selfauto-set], + AS_HELP_STRING([--disable-selfauto-set], [disable setting SELFAUTO variables from kpsewhich]), + [], [enable_selfauto_set=yes]) + +if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno -a "x$enable_texlive_build" != xyes; then + kpsewhich='kpsewhich' + test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich" + SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null` + SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null` + SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null` + if test -z "$SELFAUTODIR"; then + AC_MSG_WARN([ +========================================= + +Could not extract SELFAUTO variables from $kpsewhich. +Either supply the correct PREFIX to --with-kpathsea, or supply +--disable-selfauto-loc. + +=========================================]) + fi + AC_DEFINE_UNQUOTED(SELFAUTOLOC, "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable]) + AC_DEFINE_UNQUOTED(SELFAUTODIR, "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable]) + AC_DEFINE_UNQUOTED(SELFAUTOPARENT, "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable]) +fi + + dnl dnl verbatim portions of the header dnl @@ -344,6 +347,7 @@ AC_DEFINE(HAVE_PERMSTRING, 1, [Define if PermStrings are available.]) AC_DEFINE(MMAFM_RUN_MMPFB, 1, [Define to 0 if you don't want mmafm to run mmpfb when it needs to get an intermediate master conversion program.]) dnl PATHNAME_SEPARATOR? + dnl dnl set path variables dnl diff --git a/Build/source/texk/lcdf-typetools/configure.ac.orig b/Build/source/texk/lcdf-typetools/configure.ac.orig index 8291c068782..d9c25bbf013 100644 --- a/Build/source/texk/lcdf-typetools/configure.ac.orig +++ b/Build/source/texk/lcdf-typetools/configure.ac.orig @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([lcdf-typetools], [2.92]) +AC_INIT([lcdf-typetools], [2.94]) AC_CONFIG_SRCDIR([NEWS]) AM_INIT_AUTOMAKE AM_CONFIG_HEADER([autoconf.h]) @@ -12,10 +12,11 @@ AC_PROG_CPP AC_PROG_CXX AC_PROG_CXXCPP -AC_ARG_ENABLE(warnings, [ --enable-warnings compile with -Wall], -[if test "$enableval" = yes ; then - CFLAGS="$CFLAGS -W -Wall" -fi]) +AC_ARG_ENABLE([warnings], + [AS_HELP_STRING([--enable-warnings], [compile with -W -Wall])], + [if test "$enableval" = yes; then + CFLAGS="$CFLAGS -W -Wall"; CXXFLAGS="$CXXFLAGS -W -Wall" + fi]) dnl AN_MAKEVAR([AR], [AC_PROG_AR]) dnl AN_PROGRAM([ar], [AC_PROG_AR]) @@ -96,135 +97,14 @@ AC_CXX_TEMPLATE_OBJS dnl -dnl directory searching +dnl standard headers +dnl (Though obsolete, AC_HEADER_STC changes the standard includes.) dnl +AC_LANG_C +AC_HEADER_STDC AC_HEADER_DIRENT - - -dnl -dnl select programs to be compiled and automatically run -dnl - -m4_include([m4/lcdf-typetools.m4]) - -SELECTED_SUBDIRS= -AC_FOREACH([Kpse_Prog], kpse_lcdf_typetools_progs, - [test "x$enable_[]Kpse_Prog" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS Kpse_Prog" -]) -AC_SUBST(SELECTED_SUBDIRS) - -AC_FOREACH([Kpse_Opt], kpse_otftotfm_auto_opts, - [AS_IF([test "x$enable_auto_]Kpse_Opt[" != xno], - [AC_DEFINE([HAVE_AUTO_]AS_TR_CPP(Kpse_Opt), 1, - [Define to run ]Kpse_Opt[ from otftotfm.])]) -]) - - -dnl -dnl kpathsea -dnl - -AC_ARG_WITH(kpathsea, [ --with-kpathsea=PREFIX Kpathsea is installed (under PREFIX)], - [kpathsea=$withval], [kpathsea=]) - -KPATHSEA_INCLUDES= -KPATHSEA_LIBS= -KPATHSEA_DEPEND= - -if test "x$kpathsea" != xno; then - SAVE_CPPFLAGS="$CPPFLAGS"; SAVE_LDFLAGS="$LDFLAGS" - if test "x$kpathsea" != x -a "x$kpathsea" != xyes; then - KPATHSEA_INCLUDES="-I$kpathsea/include" - KPATHSEA_LIBS="-L$kpathsea/lib" - else - kpathsea=yes - fi - - dnl check for kpathsea/kpathsea.h - if true; then - CPPFLAGS="$SAVE_CPPFLAGS $KPATHSEA_INCLUDES" - AC_CHECK_HEADER(kpathsea/kpathsea.h, [kpse_header=yes], [kpse_header=no]) - fi - - dnl if not found and kpathsea prefix not set, check /usr/local - if test "x$kpse_header" != xyes -a "x$kpathsea" = xyes -a -r /usr/local/include/kpathsea/tex-file.h; then - KPATHSEA_INCLUDES="-I/usr/local/include" - KPATHSEA_LIBS="-L/usr/local/lib" - CPPFLAGS="$SAVE_CPPFLAGS $KPATHSEA_INCLUDES" - AC_CHECK_HEADER(kpathsea/tex-file.h, [kpse_header=yes], [kpse_header=no]) - fi - - dnl check for -lkpathsea - if true; then - LDFLAGS="$SAVE_LDFLAGS $KPATHSEA_LIBS" - AC_CHECK_LIB(kpathsea, kpse_set_program_name, [kpse_library=yes], [kpse_library=no]) - fi - - dnl bail out if not found - if test "x$kpse_header" != xyes -o "x$kpse_library" != xyes; then - AC_MSG_ERROR([ -========================================= - -I can't find the kpathsea library and/or header files. Tell me where to look -using the --with-kpathsea=PREFIX option (header files should be under -PREFIX/include/kpathsea, and library under PREFIX/lib), or disable support -using --without-kpathsea. - -=========================================]) - fi - - dnl OK, found - AC_DEFINE(HAVE_KPATHSEA, 1, [Define if you want to use kpathsea.]) - if true; then - KPATHSEA_LIBS="$KPATHSEA_LIBS -lkpathsea" - fi - - dnl does it have opentype support? - if false; then - AC_DEFINE(HAVE_DECL_KPSE_OPENTYPE_FORMAT) - else - AC_CHECK_DECLS(kpse_opentype_format, :, :, [#include ]) - fi - - CPPFLAGS="$SAVE_CPPFLAGS"; LDFLAGS="$SAVE_LDFLAGS" -fi - -AM_CONDITIONAL([have_kpathsea], [test "x$with_kpathsea" != xno]) -AC_SUBST([KPATHSEA_INCLUDES]) -AC_SUBST([KPATHSEA_LIBS]) -AC_SUBST([KPATHSEA_DEPEND]) - -AC_ARG_ENABLE(selfauto-set, [ --disable-selfauto-set disable setting SELFAUTO variables from kpsewhich], :, enable_selfauto_set=yes) - -if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno; then - kpsewhich='kpsewhich' - test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich" - SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null` - SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null` - SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null` - if test -z "$SELFAUTODIR"; then - AC_MSG_WARN([ -========================================= - -Could not extract SELFAUTO variables from $kpsewhich. -Either supply the correct PREFIX to --with-kpathsea, or supply ---disable-selfauto-loc. - -=========================================]) - fi - AC_DEFINE_UNQUOTED(SELFAUTOLOC, "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable]) - AC_DEFINE_UNQUOTED(SELFAUTODIR, "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable]) - AC_DEFINE_UNQUOTED(SELFAUTOPARENT, "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable]) -fi - - -dnl -dnl TeX Live build stub -dnl - -KPATHSEA_RULE= -AC_SUBST([KPATHSEA_RULE]) +AC_CHECK_HEADERS([fcntl.h unistd.h sys/time.h sys/wait.h]) dnl @@ -239,9 +119,9 @@ AC_CACHE_CHECK([whether works], ac_cv_good_new_hdr, return 0; ], ac_cv_good_new_hdr=yes, ac_cv_good_new_hdr=no)]) if test "$ac_cv_good_new_hdr" = yes; then - AC_DEFINE(HAVE_NEW_HDR, 1, [Define if exists and works.]) + AC_DEFINE([HAVE_NEW_HDR], [1], [Define if exists and works.]) fi -AC_CHECK_HEADERS(new.h unistd.h) +AC_CHECK_HEADERS([new.h]) dnl @@ -259,7 +139,7 @@ dnl AC_LANG_C need_fixlibc=0 -AC_CHECK_FUNCS([strerror], [:], [need_fixlibc=1]) +AC_CHECK_FUNCS([strerror], [], [need_fixlibc=1]) AC_CACHE_CHECK([for broken strtod], [ac_cv_broken_strtod], [AC_TRY_RUN([#include @@ -273,10 +153,11 @@ int main(int c, char **v) { [ac_cv_broken_strtod=no])]) if test "x$ac_cv_broken_strtod" = xyes; then need_fixlibc=1 - AC_DEFINE(HAVE_BROKEN_STRTOD, 1, [Define if strtod is broken.]) + AC_DEFINE([HAVE_BROKEN_STRTOD], [1], [Define if strtod is broken.]) fi -AC_CHECK_DECLS([strnlen]) +AC_LANG_CPLUSPLUS +AC_CHECK_DECLS([strnlen], [], [], [#include ]) AC_CHECK_FUNCS([strnlen], [have_strnlen=1], [need_fixlibc=1]) if test "x$have_strnlen" = x1; then AC_CACHE_CHECK([for broken strnlen], [ac_cv_broken_strnlen], @@ -292,11 +173,11 @@ int main(int c, char **v) { AC_DEFINE([HAVE_BROKEN_STRNLEN], [1], [Define if strnlen is broken.]) fi fi +AC_LANG_C AC_CHECK_FUNCS([ctime ftruncate mkstemp sigaction strdup strtoul vsnprintf waitpid]) -AC_CHECK_FUNC([floor], [:], [AC_CHECK_LIB(m, floor)]) -AC_CHECK_FUNC([fabs], [:], [AC_CHECK_LIB(m, fabs)]) -AC_CHECK_HEADERS([unistd.h fcntl.h sys/time.h sys/wait.h]) +AC_CHECK_FUNC([floor], [], [AC_CHECK_LIB([m], [floor])]) +AC_CHECK_FUNC([fabs], [], [AC_CHECK_LIB([m], [fabs])]) AM_CONDITIONAL([FIXLIBC], [test x$need_fixlibc = x1]) @@ -409,7 +290,7 @@ dnl is va_list addressable? dnl AC_LANG_CPLUSPLUS -AC_CACHE_CHECK([for addressable va_list type], +AC_CACHE_CHECK([for addressable va_list type], ac_cv_va_list_addr, [AC_TRY_COMPILE([#include void f(va_list *) { @@ -428,6 +309,134 @@ if test "x$ac_cv_va_list_addr" = xyes; then fi +dnl +dnl select programs to be compiled and automatically run +dnl + +m4_include([m4/lcdf-typetools.m4]) + +SELECTED_SUBDIRS= +AC_FOREACH([Kpse_Prog], kpse_lcdf_typetools_progs, + [test "x$enable_[]Kpse_Prog" = xno || SELECTED_SUBDIRS="$SELECTED_SUBDIRS Kpse_Prog" +]) +AC_SUBST(SELECTED_SUBDIRS) + +AC_FOREACH([Kpse_Opt], kpse_otftotfm_auto_opts, + [AS_IF([test "x$enable_auto_]Kpse_Opt[" != xno], + [AC_DEFINE([HAVE_AUTO_]AS_TR_CPP(Kpse_Opt), 1, + [Define to run ]Kpse_Opt[ from otftotfm.])]) +]) + + +dnl +dnl kpathsea +dnl + +AC_ARG_WITH([kpathsea], + [AS_HELP_STRING([--with-kpathsea=PREFIX], [Kpathsea is installed (under PREFIX)])], + [kpathsea=$withval], [kpathsea=]) + +KPATHSEA_INCLUDES= +KPATHSEA_LIBS= +KPATHSEA_DEPEND= + +if test "x$kpathsea" != xno; then + SAVE_CPPFLAGS="$CPPFLAGS"; SAVE_LDFLAGS="$LDFLAGS" + if test "x$kpathsea" != x -a "x$kpathsea" != xyes; then + KPATHSEA_INCLUDES="-I$kpathsea/include" + KPATHSEA_LIBS="-L$kpathsea/lib" + else + kpathsea=yes + fi + + dnl check for kpathsea/kpathsea.h + if true; then + CPPFLAGS="$SAVE_CPPFLAGS $KPATHSEA_INCLUDES" + AC_CHECK_HEADER([kpathsea/kpathsea.h], [kpse_header=yes], [kpse_header=no]) + fi + + dnl if not found and kpathsea prefix not set, check /usr/local + if test "x$kpse_header" != xyes -a "x$kpathsea" = xyes -a -r /usr/local/include/kpathsea/tex-file.h; then + KPATHSEA_INCLUDES="-I/usr/local/include" + KPATHSEA_LIBS="-L/usr/local/lib" + CPPFLAGS="$SAVE_CPPFLAGS $KPATHSEA_INCLUDES" + AC_CHECK_HEADER([kpathsea/tex-file.h], [kpse_header=yes], [kpse_header=no]) + fi + + dnl check for -lkpathsea + if true; then + LDFLAGS="$SAVE_LDFLAGS $KPATHSEA_LIBS" + AC_CHECK_LIB([kpathsea], [kpse_set_program_name], [kpse_library=yes], [kpse_library=no]) + fi + + dnl bail out if not found + if test "x$kpse_header" != xyes -o "x$kpse_library" != xyes; then + AC_MSG_ERROR([ +========================================= + +I can't find the kpathsea library and/or header files. Tell me where to look +using the --with-kpathsea=PREFIX option (header files should be under +PREFIX/include/kpathsea, and library under PREFIX/lib), or disable support +using --without-kpathsea. + +=========================================]) + fi + + dnl OK, found + AC_DEFINE(HAVE_KPATHSEA, 1, [Define if you want to use kpathsea.]) + if true; then + KPATHSEA_LIBS="$KPATHSEA_LIBS -lkpathsea" + fi + + dnl does it have opentype support? + if false; then + AC_DEFINE(HAVE_DECL_KPSE_OPENTYPE_FORMAT) + else + AC_CHECK_DECLS([kpse_opentype_format], [], [], [#include ]) + fi + + CPPFLAGS="$SAVE_CPPFLAGS"; LDFLAGS="$SAVE_LDFLAGS" +fi + +AM_CONDITIONAL([have_kpathsea], [test "x$with_kpathsea" != xno]) +AC_SUBST([KPATHSEA_INCLUDES]) +AC_SUBST([KPATHSEA_LIBS]) +AC_SUBST([KPATHSEA_DEPEND]) + +AC_ARG_ENABLE([selfauto-set], + [AS_HELP_STRING([--disable-selfauto-set], [disable setting SELFAUTO variables from kpsewhich])], + [], [enable_selfauto_set=yes]) + +if test "x$enable_selfauto_set" = xyes -a "x$kpathsea" != xno; then + kpsewhich='kpsewhich' + test "x$kpathsea" != xyes -a -x "$kpathsea/bin/kpsewhich" && kpsewhich="$kpathsea/bin/kpsewhich" + SELFAUTOLOC=`$kpsewhich --expand-var='$SELFAUTOLOC' 2>/dev/null` + SELFAUTODIR=`$kpsewhich --expand-var='$SELFAUTODIR' 2>/dev/null` + SELFAUTOPARENT=`$kpsewhich --expand-var='$SELFAUTOPARENT' 2>/dev/null` + if test -z "$SELFAUTODIR"; then + AC_MSG_WARN([ +========================================= + +Could not extract SELFAUTO variables from $kpsewhich. +Either supply the correct PREFIX to --with-kpathsea, or supply +--disable-selfauto-loc. + +=========================================]) + fi + AC_DEFINE_UNQUOTED(SELFAUTOLOC, "$SELFAUTOLOC", [kpsewhich's $SELFAUTOLOC variable]) + AC_DEFINE_UNQUOTED(SELFAUTODIR, "$SELFAUTODIR", [kpsewhich's $SELFAUTODIR variable]) + AC_DEFINE_UNQUOTED(SELFAUTOPARENT, "$SELFAUTOPARENT", [kpsewhich's $SELFAUTOPARENT variable]) +fi + + +dnl +dnl TeX Live build stub +dnl + +KPATHSEA_RULE= +AC_SUBST([KPATHSEA_RULE]) + + dnl dnl verbatim portions of the header dnl diff --git a/Build/source/texk/lcdf-typetools/include/config.h b/Build/source/texk/lcdf-typetools/include/config.h index 90862b448a5..26a90a97b14 100644 --- a/Build/source/texk/lcdf-typetools/include/config.h +++ b/Build/source/texk/lcdf-typetools/include/config.h @@ -25,7 +25,7 @@ char *strerror(int errno); #endif /* Prototype strnlen if necessary. */ -#if !HAVE_STRNLEN || !HAVE_DECL_STRNLEN +#if !HAVE_DECL_STRNLEN size_t strnlen(const char *s, size_t maxlen); #endif diff --git a/Build/source/texk/lcdf-typetools/include/efont/otfcmap.hh b/Build/source/texk/lcdf-typetools/include/efont/otfcmap.hh index de7558ed35f..f95a3dc5c41 100644 --- a/Build/source/texk/lcdf-typetools/include/efont/otfcmap.hh +++ b/Build/source/texk/lcdf-typetools/include/efont/otfcmap.hh @@ -22,13 +22,14 @@ class Cmap { public: String _str; int _error; int _ntables; - int _first_unicode_table; + mutable int _first_unicode_table; mutable Vector _table_error; enum { HEADER_SIZE = 4, ENCODING_SIZE = 8, HIBYTE_SUBHEADERS = 524 }; enum Format { F_BYTE = 0, F_HIBYTE = 2, F_SEGMENTED = 4, F_TRIMMED = 6, F_HIBYTE32 = 8, F_TRIMMED32 = 10, F_SEGMENTED32 = 12 }; + enum { USE_FIRST_UNICODE_TABLE = -2 }; int parse_header(ErrorHandler *); int first_unicode_table() const { return _first_unicode_table; } @@ -42,12 +43,12 @@ class Cmap { public: inline Glyph Cmap::map_uni(uint32_t c) const { - return map_table(first_unicode_table(), c, ErrorHandler::default_handler()); + return map_table(USE_FIRST_UNICODE_TABLE, c, ErrorHandler::default_handler()); } inline void Cmap::unmap_all(Vector &g2c) const { - dump_table(first_unicode_table(), g2c, ErrorHandler::default_handler()); + dump_table(USE_FIRST_UNICODE_TABLE, g2c, ErrorHandler::default_handler()); } }} diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/clp.h b/Build/source/texk/lcdf-typetools/include/lcdf/clp.h index 233182d76dc..81d59bd99e9 100644 --- a/Build/source/texk/lcdf-typetools/include/lcdf/clp.h +++ b/Build/source/texk/lcdf-typetools/include/lcdf/clp.h @@ -165,6 +165,8 @@ typedef void (*Clp_ErrorHandler)(Clp_Parser *clp, const char *message); * value types, and current arguments. * @sa Clp_NewParser, Clp_SetOptions, Clp_SetArguments */ struct Clp_Parser { + int opt; /**< The last option. */ + int negated; /**< Whether the last option was negated. */ int have_val; /**< Whether the last option had a value. */ diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh b/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh index ec2a95bf036..9474421e85f 100644 --- a/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh +++ b/Build/source/texk/lcdf-typetools/include/lcdf/straccum.hh @@ -35,7 +35,13 @@ class StringAccum { public: explicit inline StringAccum(int capacity); /** @brief Construct a StringAccum containing the characters in @a s. */ - explicit inline StringAccum(const char *s, int len = -1) + explicit inline StringAccum(const char *cstr) + : _s(0), _len(0), _cap(0) { + append(cstr); + } + + /** @brief Construct a StringAccum containing the characters in @a s. */ + inline StringAccum(const char *s, int len) : _s(0), _len(0), _cap(0) { append(s, len); } @@ -74,6 +80,11 @@ class StringAccum { public: return reinterpret_cast(_s); } + /** @brief Return true iff the StringAccum is empty or out-of-memory. */ + bool empty() const { + return _len == 0; + } + /** @brief Return the length of the StringAccum. */ int length() const { return _len; @@ -200,8 +211,10 @@ class StringAccum { public: * All characters in the StringAccum are erased. Also resets the * StringAccum's out-of-memory status. */ inline void clear() { - if (_cap < 0) - _cap = 0, _s = 0; + if (_cap < 0) { + _cap = 0; + _s = 0; + } _len = 0; } @@ -220,10 +233,10 @@ class StringAccum { public: * On failure, null is returned and errno is set to ENOMEM. */ inline char *reserve(int n) { assert(n >= 0); - if (_len + n <= _cap || grow(_len + n)) - return (char *)(_s + _len); + if (_len + n <= _cap) + return reinterpret_cast(_s + _len); else - return 0; + return grow(_len + n); } /** @brief Set the StringAccum's length to @a len. @@ -235,6 +248,11 @@ class StringAccum { public: _len = len; } + /** @brief Set the StringAccum's length to @a len. + * @pre @a len >= 0 + * @return 0 on success, -ENOMEM on failure */ + int resize(int len); + /** @brief Adjust the StringAccum's length. * @param delta length adjustment * @pre If @a delta > 0, then length() + @a delta <= capacity(). @@ -258,10 +276,12 @@ class StringAccum { public: * reserve() call. */ inline char *extend(int nadjust, int nreserve = 0) { assert(nadjust >= 0 && nreserve >= 0); - char *c = reserve(nadjust + nreserve); - if (c) + if (_len + nadjust + nreserve <= _cap) { + char *x = reinterpret_cast(_s + _len); _len += nadjust; - return c; + return x; + } else + return hard_extend(nadjust, nreserve); } @@ -299,29 +319,24 @@ class StringAccum { public: append_utf8_hard(ch); } + /** @brief Append the null-terminated C string @a s to this StringAccum. + * @param s data to append */ + void append(const char *s); /** @brief Append the first @a len characters of @a s to this StringAccum. * @param s data to append * @param len length of data - * - * If @a len < 0, treats @a s as a null-terminated C string. */ - inline void append(const char *s, int len) { - if (len < 0) - len = strlen(s); - append_data(s, len); - } + * @pre @a len >= 0 */ + inline void append(const char *s, int len); /** @overload */ - inline void append(const unsigned char *s, int len) { - append(reinterpret_cast(s), len); - } + inline void append(const unsigned char *s, int len); /** @brief Append the data from @a begin to @a end to the end of this * StringAccum. * * Does nothing if @a begin >= @a end. */ - inline void append(const char *begin, const char *end) { - if (begin < end) - append_data(begin, end - begin); - } + inline void append(const char *begin, const char *end); + /** @overload */ + inline void append(const unsigned char *begin, const unsigned char *end); // word joining void append_break_lines(const String &text, int linelen, const String &leftmargin = String()); @@ -377,29 +392,13 @@ class StringAccum { public: int _len; int _cap; - bool grow(int); + char *grow(int); void assign_out_of_memory(); - // We must be careful about calls like "sa.append(sa.begin(), sa.end())"; - // a naive implementation might use sa's data after freeing it. - // append_external_data() takes a string guaranteed not to be part of the - // current StringAccum; append_internal_data() takes a string that likely - // is part of the current StringAccum; append_data() takes either kind. - inline void append_external_data(const char *s, int len) { - if (char *x = extend(len)) - memcpy(x, s, len); - } - void append_internal_data(const char *s, int len); - inline void append_data(const char *s, int len) { - const char *my_s = reinterpret_cast(_s); - if (s < my_s || s >= my_s + _cap) - append_external_data(s, len); - else - append_internal_data(s, len); - } + char *hard_extend(int nadjust, int nreserve); + void hard_append(const char *s, int len); void append_utf8_hard(unsigned ch); - friend StringAccum &operator<<(StringAccum &sa, const char *s); friend StringAccum &operator<<(StringAccum &sa, const String &str); #if HAVE_PERMSTRING @@ -442,6 +441,29 @@ StringAccum::StringAccum(int capacity) } } +inline void StringAccum::append(const char *s, int len) { + assert(len >= 0); + if (_len + len <= _cap) { + memcpy(_s + _len, s, len); + _len += len; + } else + hard_append(s, len); +} + +inline void StringAccum::append(const unsigned char *s, int len) { + append(reinterpret_cast(s), len); +} + +inline void StringAccum::append(const char *begin, const char *end) { + if (begin < end) + append(begin, end - begin); +} + +inline void StringAccum::append(const unsigned char *begin, const unsigned char *end) { + if (begin < end) + append(begin, end - begin); +} + /** @relates StringAccum @brief Append character @a c to StringAccum @a sa. @return @a sa @@ -467,11 +489,11 @@ operator<<(StringAccum &sa, unsigned char c) /** @relates StringAccum @brief Append null-terminated C string @a cstr to StringAccum @a sa. @return @a sa - @note Same as @a sa.append(@a cstr, -1). */ + @note Same as @a sa.append(@a cstr). */ inline StringAccum & operator<<(StringAccum &sa, const char *cstr) { - sa.append(cstr, -1); + sa.append(cstr); return sa; } @@ -481,7 +503,11 @@ operator<<(StringAccum &sa, const char *cstr) inline StringAccum & operator<<(StringAccum &sa, bool b) { - sa.append("truefalse" + (b ? 0 : 4), (b ? 4 : 5)); + static const char truefalse[] = "truefalse"; + if (b) + sa.append(truefalse, 4); + else + sa.append(truefalse + 4, 5); return sa; } @@ -528,7 +554,7 @@ inline StringAccum & operator<<(StringAccum &sa, const String &str) { if (!str.out_of_memory()) - sa.append_external_data(str.begin(), str.length()); + sa.hard_append(str.begin(), str.length()); else sa.assign_out_of_memory(); return sa; @@ -538,7 +564,7 @@ operator<<(StringAccum &sa, const String &str) inline StringAccum & operator<<(StringAccum &sa, PermString s) { - sa.append_external_data(s.c_str(), s.length()); + sa.append(s.c_str(), s.length()); return sa; } #endif diff --git a/Build/source/texk/lcdf-typetools/include/lcdf/string.hh b/Build/source/texk/lcdf-typetools/include/lcdf/string.hh index adbf6ef7904..a704c201572 100644 --- a/Build/source/texk/lcdf-typetools/include/lcdf/string.hh +++ b/Build/source/texk/lcdf-typetools/include/lcdf/string.hh @@ -43,6 +43,10 @@ class String { public: inline String(const char *s, int len) { assign(s, len, false); } + /** @overload */ + inline String(const unsigned char *s, int len) { + assign(reinterpret_cast(s), len, false); + } /** @brief Construct a String containing the characters from @a begin * to @a end. @@ -55,6 +59,11 @@ class String { public: inline String(const char *begin, const char *end) { assign(begin, (end > begin ? end - begin : 0), false); } + /** @overload */ + inline String(const unsigned char *begin, const unsigned char *end) { + assign(reinterpret_cast(begin), + (end > begin ? end - begin : 0), false); + } /** @brief Construct a String equal to "true" or "false" depending on the * value of @a x. */ @@ -102,7 +111,11 @@ class String { public: } /** @brief Return a String containing @a len unknown characters. */ - static String make_garbage(int len); + static String make_uninitialized(int len) { + String s; + s.append_uninitialized(len); + return s; + } /** @brief Return a String that directly references the first @a len * characters of @a s. @@ -185,10 +198,15 @@ class String { public: } /** @brief Return true iff the string is empty. */ - inline bool operator!() const { + inline bool empty() const { return _r.length == 0; } + /** @brief Return true iff the string is empty. */ + inline bool operator!() const { + return empty(); + } + /** @brief Return the @a i th character in the string. * @@ -228,14 +246,14 @@ class String { public: * pointer. The returned pointer is semi-temporary; it will persist until * the string is destroyed or appended to. */ inline const char *c_str() const { - // We may already have a '\0' in the right place. If _memo does not - // exist, then this is one of the special strings (null or + // We may already have a '\0' in the right place. If _memo has no + // capacity, then this is one of the special strings (null or // stable). We are guaranteed, in these strings, that _data[_length] - // exists. Otherwise must check whether _data[_length] exists. + // exists. Otherwise must check that _data[_length] exists. const char *end_data = _r.data + _r.length; if ((_r.memo && end_data >= _r.memo->real_data + _r.memo->dirty) || *end_data != '\0') { - if (char *x = const_cast(this)->append_garbage(1)) { + if (char *x = const_cast(this)->append_uninitialized(1)) { *x = '\0'; --_r.length; } @@ -468,12 +486,19 @@ class String { public: } #endif + /** @brief Append the null-terminated C string @a cstr to this string. + * @param cstr data to append */ + inline void append(const char *cstr) { + append(cstr, -1, 0); + } + /** @brief Append the first @a len characters of @a s to this string. * @param s data to append * @param len length of data - * - * If @a len @< 0, treats @a s as a null-terminated C string. */ - void append(const char *s, int len); + * @pre @a len @>= 0 */ + inline void append(const char *s, int len) { + append(s, len, 0); + } /** @brief Appends the data from @a begin to @a end to the end of this * string. @@ -492,14 +517,14 @@ class String { public: * * The caller may safely modify the returned memory. Null is returned if * the string becomes out-of-memory. */ - char *append_garbage(int len); + char *append_uninitialized(int len); /** @brief Append a copy of @a x to the end of this string. * * Returns the result. */ inline String &operator+=(const String &x) { - append(x._r.data, x._r.length); + append(x._r.data, x._r.length, x._r.memo); return *this; } @@ -507,7 +532,7 @@ class String { public: * * Returns the result. */ inline String &operator+=(const char *cstr) { - append(cstr, -1); + append(cstr); return *this; } @@ -686,6 +711,7 @@ class String { public: } #endif void assign_out_of_memory(); + void append(const char *s, int len, memo_t *memo); static memo_t *create_memo(char *space, int dirty, int capacity); static void delete_memo(memo_t *memo); @@ -698,7 +724,7 @@ class String { public: static String make_claim(char *, int, int); // claim memory - friend class rep_t; + friend struct rep_t; friend class StringAccum; }; @@ -796,7 +822,7 @@ inline String operator+(String a, const String &b) { /** @relates String */ inline String operator+(String a, const char *b) { - a.append(b, -1); + a.append(b); return a; } diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog deleted file mode 100644 index 03024b2ea44..00000000000 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/ChangeLog +++ /dev/null @@ -1,106 +0,0 @@ -2011-12-22 Peter Breitenlohner - - * Makefile.am: Replace DISTCHECK_CONFIGURE_FLAGS by - AM_DISTCHECK_CONFIGURE_FLAGS (for automake-1.11.2). - -2011-10-04 Peter Breitenlohner - - * Makefile.am (DISTCLEANFILES): Add CXXLD.sh. - -2011-09-25 Peter Breitenlohner - - * patch-01-const (new): Avoid cast from const to non-const. - -2011-09-07 Peter Breitenlohner - - * Makefile.am: Avoid pkgdata_DATA in order not to install an - empty $(pkgdatadir). - -2011-06-06 Peter Breitenlohner - - Import lcdf-typetools-2.92. - * version.ac: Adapt. - * patch-01-void-func (removed): Now distributed. - -2011-06-14 Peter Breitenlohner - - * patch-01-void-func (new): Patch from - Vladimir Volovich . - -2011-06-06 Peter Breitenlohner - - Import lcdf-typetools-2.90. - * version.ac: New file defining the lcdf-typetools version. - * configure.ac: Adapt. Define SHAREDIR as "/nonesuch" to avoid - useless build paths stored in the otftotfm binary. - * patch-03-warning (removed): Now distributed. - -2011-03-09 Peter Breitenlohner - - Import lcdf-typetools-2.88. - * configure.ac, Makefile.am: Adapt. - * patch-02-warnings (removed): Now distributed. - - * patch-03-warning (new): Avoid `uninitialized' warning (the - compiler may not realize that this actually can'thappen). - -2011-03-08 Peter Breitenlohner - - * patch-02-warnings (new): Remove unused variables; add explicit - cast for `-1' used as `uint32_t'. - -2010-10-04 Peter Breitenlohner - - Import lcdf-typetools-2.85. - * configure.ac, Makefile.am: Adapt. - * patch-01-otftotfm-Makefile (removed): Now distributed. - -2010-06-07 Peter Breitenlohner - - * configure.ac: Using AC_C_INLINE, there is no need to get rid - of a possible inline macro under C++. - -2010-04-26 Peter Breitenlohner - - Import lcdf-typetools-2.83. - * configure.ac, Makefile.am: Adapt. - * patch-01-otftotfm-Makefile (new): Adapt otftotfm/Makefile.am. - -2010-02-21 Peter Breitenlohner - - * include/efont/otfdata.hh [WIN32]: From lcdf-typetools-2.83pre. - * configure.ac: Fixed typo in generated AC_DEFINE descriptions. - -2010-02-21 Peter Breitenlohner - - Various MinGW32 (cross) build fixes. - * configure.ac, include/efont/otfdata.hh: - MinGW32 has but also needs . - MinGW32 uses instead of . - * configure.ac (LIBS) [WIN32]: Add -lwsock32. - - * t1rawafm/t1rawafm.cc: Do not define away 'std'. - * t1testpage/t1testpage.cc: Do not define away 'std'. - * ttftotype42/ttftotype42.cc (do_file): Remove 'if(binary)'. - -2010-02-20 Peter Breitenlohner - - * configure.ac: Don't fail configure if not building lcdf-typetools. - -2009-09-03 Karl Berry - - * configure.ac: AC_DEFINE(HAVE_KPATHSEA) if we have it, else - kpse stuff not really enabled, e.g., glyphlist.txt and - texnansx.enc not found - tlbuild mail from Jown Owens, 31 Aug 2009 14:34:39. - -2009-06-19 Peter Breitenlohner - - * configure.ac: enable compiler warnings (TeX Live style). - * liblcdf/clp.c (Clp_OptionChar, finish_string_list): declare - as static. - -2009-04-22 Peter Breitenlohner - - Adapt to TL2009 build system. - diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/TL-Changes b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/TL-Changes deleted file mode 100644 index 09e2d8d9558..00000000000 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/TL-Changes +++ /dev/null @@ -1,16 +0,0 @@ -Changes applied to the lcdf-typetools tree as obtained from: - http://www.lcdf.org/type/lcdf-typetools-2.92.tar.gz - -Removed: - depcomp - install-sh - missing - -Renamed/Moved: - Makefile.am -> Makefile.am.orig - configure.ac -> configure.ac.orig - m4/lcdf-typetools.m4 -> ac/lcdf-typetools.ac - -Created Autoconf macro file m4/ac_cxx_template_objs.m4 - adapting code in configure.ac.orig. - diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/patch-01-const b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/patch-01-const deleted file mode 100644 index 01bb341d512..00000000000 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.92-PATCHES/patch-01-const +++ /dev/null @@ -1,16 +0,0 @@ - No need to cast from const to non-const. - -diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.92.orig/liblcdf/permstr.cc lcdf-typetools-2.92/liblcdf/permstr.cc ---- lcdf-typetools-2.92.orig/liblcdf/permstr.cc 2011-02-07 15:30:19.000000000 +0100 -+++ lcdf-typetools-2.92/liblcdf/permstr.cc 2011-09-25 15:35:00.000000000 +0200 -@@ -110,8 +110,8 @@ - void - PermString::initialize(const char* s, int length) - { -- register unsigned char* m = (unsigned char*) s; -- register unsigned char* mm; -+ register const unsigned char* m = (const unsigned char*) s; -+ register const unsigned char* mm; - - if (length < 0) - length = (s ? strlen(s) : 0); diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog new file mode 100644 index 00000000000..c6648877f5a --- /dev/null +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/ChangeLog @@ -0,0 +1,113 @@ +2012-08-05 Peter Breitenlohner + + Import lcdf-typetools-2.94. + * version.ac: Adapted. + * configure.ac: Adapted. + * patch-01-const: Adapted + +2011-12-22 Peter Breitenlohner + + * Makefile.am: Replace DISTCHECK_CONFIGURE_FLAGS by + AM_DISTCHECK_CONFIGURE_FLAGS (for automake-1.11.2). + +2011-10-04 Peter Breitenlohner + + * Makefile.am (DISTCLEANFILES): Add CXXLD.sh. + +2011-09-25 Peter Breitenlohner + + * patch-01-const (new): Avoid cast from const to non-const. + +2011-09-07 Peter Breitenlohner + + * Makefile.am: Avoid pkgdata_DATA in order not to install an + empty $(pkgdatadir). + +2011-08-16 Peter Breitenlohner + + Import lcdf-typetools-2.92. + * version.ac: Adapt. + * patch-01-void-func (removed): Now distributed. + +2011-06-14 Peter Breitenlohner + + * patch-01-void-func (new): Patch from + Vladimir Volovich . + +2011-06-06 Peter Breitenlohner + + Import lcdf-typetools-2.90. + * version.ac: New file defining the lcdf-typetools version. + * configure.ac: Adapt. Define SHAREDIR as "/nonesuch" to avoid + useless build paths stored in the otftotfm binary. + * patch-03-warning (removed): Now distributed. + +2011-03-09 Peter Breitenlohner + + Import lcdf-typetools-2.88. + * configure.ac, Makefile.am: Adapt. + * patch-02-warnings (removed): Now distributed. + + * patch-03-warning (new): Avoid `uninitialized' warning (the + compiler may not realize that this actually can'thappen). + +2011-03-08 Peter Breitenlohner + + * patch-02-warnings (new): Remove unused variables; add explicit + cast for `-1' used as `uint32_t'. + +2010-10-04 Peter Breitenlohner + + Import lcdf-typetools-2.85. + * configure.ac, Makefile.am: Adapt. + * patch-01-otftotfm-Makefile (removed): Now distributed. + +2010-06-07 Peter Breitenlohner + + * configure.ac: Using AC_C_INLINE, there is no need to get rid + of a possible inline macro under C++. + +2010-04-26 Peter Breitenlohner + + Import lcdf-typetools-2.83. + * configure.ac, Makefile.am: Adapt. + * patch-01-otftotfm-Makefile (new): Adapt otftotfm/Makefile.am. + +2010-02-21 Peter Breitenlohner + + * include/efont/otfdata.hh [WIN32]: From lcdf-typetools-2.83pre. + * configure.ac: Fixed typo in generated AC_DEFINE descriptions. + +2010-02-21 Peter Breitenlohner + + Various MinGW32 (cross) build fixes. + * configure.ac, include/efont/otfdata.hh: + MinGW32 has but also needs . + MinGW32 uses instead of . + * configure.ac (LIBS) [WIN32]: Add -lwsock32. + + * t1rawafm/t1rawafm.cc: Do not define away 'std'. + * t1testpage/t1testpage.cc: Do not define away 'std'. + * ttftotype42/ttftotype42.cc (do_file): Remove 'if(binary)'. + +2010-02-20 Peter Breitenlohner + + * configure.ac: Don't fail configure if not building lcdf-typetools. + +2009-09-03 Karl Berry + + * configure.ac: AC_DEFINE(HAVE_KPATHSEA) if we have it, else + kpse stuff not really enabled, e.g., glyphlist.txt and + texnansx.enc not found + tlbuild mail from Jown Owens, 31 Aug 2009 14:34:39. + +2009-06-19 Peter Breitenlohner + + * configure.ac: enable compiler warnings (TeX Live style). + * liblcdf/clp.c (Clp_OptionChar, finish_string_list): declare + as static. + +2009-04-22 Peter Breitenlohner + + Adapt to TL2009 build system. + diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/TL-Changes b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/TL-Changes new file mode 100644 index 00000000000..754d53fe339 --- /dev/null +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/TL-Changes @@ -0,0 +1,16 @@ +Changes applied to the lcdf-typetools tree as obtained from: + http://www.lcdf.org/type/lcdf-typetools-2.94.tar.gz + +Removed: + depcomp + install-sh + missing + +Renamed/Moved: + Makefile.am -> Makefile.am.orig + configure.ac -> configure.ac.orig + m4/lcdf-typetools.m4 -> ac/lcdf-typetools.ac + +Created Autoconf macro file m4/ac_cxx_template_objs.m4 + adapting code in configure.ac.orig. + diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-01-const b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-01-const new file mode 100644 index 00000000000..84ca97ef3f6 --- /dev/null +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools-2.94-PATCHES/patch-01-const @@ -0,0 +1,16 @@ + No need to cast from const to non-const. + +diff -ur -x Makefile.in -x aclocal.m4 -x autoconf.h.in -x configure lcdf-typetools-2.94.orig/liblcdf/permstr.cc lcdf-typetools-2.94/liblcdf/permstr.cc +--- lcdf-typetools-2.94.orig/liblcdf/permstr.cc 2011-11-03 17:51:58.000000000 +0100 ++++ lcdf-typetools-2.94/liblcdf/permstr.cc 2012-08-05 12:09:59.000000000 +0200 +@@ -110,8 +110,8 @@ + void + PermString::initialize(const char* s, int length) + { +- register unsigned char* m = (unsigned char*) s; +- register unsigned char* mm; ++ register const unsigned char* m = (const unsigned char*) s; ++ register const unsigned char* mm; + + if (length < 0) + length = (s ? strlen(s) : 0); diff --git a/Build/source/texk/lcdf-typetools/lcdf-typetools.spec b/Build/source/texk/lcdf-typetools/lcdf-typetools.spec index 0a378a616f7..84bc70f1a1b 100644 --- a/Build/source/texk/lcdf-typetools/lcdf-typetools.spec +++ b/Build/source/texk/lcdf-typetools/lcdf-typetools.spec @@ -1,6 +1,6 @@ Summary: Programs to manipulate OpenType and multiple-master fonts Name: lcdf-typetools -Version: 2.92 +Version: 2.94 Copyright: GPL Vendor: Little Cambridgeport Design Factory Group: Utilities/Printing diff --git a/Build/source/texk/lcdf-typetools/libefont/afmparse.cc b/Build/source/texk/lcdf-typetools/libefont/afmparse.cc index f4a731f832f..d2bbd70ef6f 100644 --- a/Build/source/texk/lcdf-typetools/libefont/afmparse.cc +++ b/Build/source/texk/lcdf-typetools/libefont/afmparse.cc @@ -259,7 +259,7 @@ AfmParser::vis(const char *formatsigned, va_list valist) int n = (endbrack ? endbrack - (str + 1) : 0); if (!endbrack || n % 2 != 0) FAIL("should be hex values in "); - String s = String::make_garbage(n/2); + String s = String::make_uninitialized(n/2); unsigned char *data = s.mutable_udata(); str++; diff --git a/Build/source/texk/lcdf-typetools/libefont/otf.cc b/Build/source/texk/lcdf-typetools/libefont/otf.cc index 48a2eebd722..8b6d988d451 100644 --- a/Build/source/texk/lcdf-typetools/libefont/otf.cc +++ b/Build/source/texk/lcdf-typetools/libefont/otf.cc @@ -775,7 +775,7 @@ Coverage::Coverage(const Vector &gmap) throw () while (end > 0 && !gmap[end - 1]) --end; if (end > 0) { - _str = String::make_garbage(8 + end); + _str = String::make_uninitialized(8 + end); _str.align(4); uint8_t *data = _str.mutable_udata(); memset(data, 0, 8 + end); diff --git a/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc b/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc index 526a266a058..b62b7188b86 100644 --- a/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc +++ b/Build/source/texk/lcdf-typetools/libefont/otfcmap.cc @@ -2,7 +2,7 @@ /* otfcmap.{cc,hh} -- OpenType cmap table * - * Copyright (c) 2002-2011 Eddie Kohler + * Copyright (c) 2002-2012 Eddie Kohler * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -121,6 +121,12 @@ Cmap::check_table(int t, ErrorHandler *errh) const { if (!errh) errh = ErrorHandler::silent_handler(); + if (t == USE_FIRST_UNICODE_TABLE && _first_unicode_table == -1) { + errh->warning("font appears not to support Unicode"); + _first_unicode_table = 0; + } + if (t == USE_FIRST_UNICODE_TABLE) + t = _first_unicode_table; if (_error < 0 || t < 0 || t >= _ntables) return errh->error("no such table"); if (_table_error[t] > -2) @@ -245,13 +251,13 @@ Cmap::check_table(int t, ErrorHandler *errh) const } _table_error[t] = 0; - return 0; + return t; } Glyph Cmap::map_table(int t, uint32_t uni, ErrorHandler *errh) const { - if (check_table(t, errh) < 0) + if ((t = check_table(t, errh)) < 0) return 0; const uint8_t *data = _str.udata(); @@ -351,7 +357,7 @@ Cmap::map_table(int t, uint32_t uni, ErrorHandler *errh) const void Cmap::dump_table(int t, Vector &g2c, ErrorHandler *errh) const { - if (check_table(t, errh) < 0) + if ((t = check_table(t, errh)) < 0) return; const uint8_t *data = _str.udata(); @@ -462,8 +468,8 @@ Cmap::dump_table(int t, Vector &g2c, ErrorHandler *errh) const int Cmap::map_uni(const Vector &vin, Vector &vout) const { - int t = first_unicode_table(); - if (check_table(t) < 0) + int t; + if ((t = check_table(USE_FIRST_UNICODE_TABLE)) < 0) return -1; vout.resize(vin.size(), 0); for (int i = 0; i < vin.size(); i++) diff --git a/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc b/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc index 1267df342a0..ed8c1e2078c 100644 --- a/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc +++ b/Build/source/texk/lcdf-typetools/libefont/otfdescrip.cc @@ -26,42 +26,115 @@ struct Mapping { static const Mapping scripts[] = { { T("DFLT"), "Default" }, { T("arab"), "Arabic" }, + { T("armi"), "Imperial Aramaic" }, { T("armn"), "Armenian" }, + { T("avst"), "Avestan" }, + { T("bali"), "Balinese" }, + { T("bamu"), "Bamum" }, + { T("batk"), "Batak" }, { T("beng"), "Bengali" }, + { T("bng2"), "Bengali v.2" }, { T("bopo"), "Bopomofo" }, + { T("brah"), "Brahmi" }, { T("brai"), "Braille" }, + { T("bugi"), "Buginese" }, + { T("buhd"), "Buhid" }, { T("byzm"), "Byzantine Music" }, + { T("cakm"), "Chakma" }, { T("cans"), "Canadian Syllabics" }, + { T("cari"), "Carian" }, + { T("cham"), "Cham" }, { T("cher"), "Cherokee" }, + { T("copt"), "Coptic" }, + { T("cprt"), "Cypriot Syllabary" }, { T("cyrl"), "Cyrillic" }, + { T("dev2"), "Devanagari v.2" }, { T("deva"), "Devanagari" }, + { T("dsrt"), "Deseret" }, + { T("egyp"), "Egyptian heiroglyphs" }, { T("ethi"), "Ethiopic" }, { T("geor"), "Georgian" }, + { T("gjr2"), "Gujarati v.2" }, + { T("glag"), "Glagolitic" }, + { T("goth"), "Gothic" }, { T("grek"), "Greek" }, { T("gujr"), "Gujarati" }, + { T("gur2"), "Gurmukhi v.2" }, { T("guru"), "Gurmukhi" }, { T("hang"), "Hangul" }, { T("hani"), "CJK Ideographic" }, + { T("hano"), "Hanunoo" }, { T("hebr"), "Hebrew" }, + { T("ital"), "Old Italic" }, { T("jamo"), "Hangul Jamo" }, + { T("java"), "Javanese" }, + { T("kali"), "Kayah Li" }, { T("kana"), "Hiragana/Katakana" }, + { T("khar"), "Kharosthi" }, { T("khmr"), "Khmer" }, + { T("knd2"), "Kannada v.2" }, { T("knda"), "Kannada" }, + { T("kthi"), "Kaithi" }, + { T("lana"), "Tai Tham (Lanna)" }, { T("lao "), "Lao" }, { T("latn"), "Latin" }, + { T("lepc"), "Lepcha" }, + { T("limb"), "Limbu" }, + { T("linb"), "Linear B" }, + { T("lisu"), "Lisu (Fraser)" }, + { T("lyci"), "Lycian" }, + { T("lydi"), "Lydian" }, + { T("mand"), "Mandaic, Mandaean" }, + { T("math"), "Mathematical Alphanumeric Symbols" }, + { T("merc"), "Meroitic Cursive" }, + { T("mero"), "Meroitic Hieroglyphs" }, + { T("mlm2"), "Malayalam v.2" }, { T("mlym"), "Malayalam" }, { T("mong"), "Mongolian" }, + { T("mtei"), "Meitei Mayek (Meithei, Meetei)" }, + { T("musc"), "Musical Symbols" }, { T("mymr"), "Myanmar" }, + { T("nko "), "N'Ko" }, { T("ogam"), "Ogham" }, - { T("orya"), "Oriya" }, + { T("olck"), "Ol Chiki" }, + { T("orkh"), "Old Turkic, Orkhon Runic" }, + { T("ory2"), "Odia v.2 (formerly Oriya v.2)" }, + { T("orya"), "Odia (formerly Oriya)" }, + { T("osma"), "Osmanya" }, + { T("phag"), "Phags-pa" }, + { T("phli"), "Inscriptional Pahlavi" }, + { T("phnx"), "Phoenician" }, + { T("prti"), "Inscriptional Parthian" }, + { T("rjng"), "Rejang" }, { T("runr"), "Runic" }, + { T("samr"), "Samaritan" }, + { T("sarb"), "Old South Arabian" }, + { T("saur"), "Saurashtra" }, + { T("shaw"), "Shavian" }, + { T("shrd"), "Sharada" }, { T("sinh"), "Sinhala" }, + { T("sora"), "Sora Sompeng" }, + { T("sund"), "Sundanese" }, + { T("sylo"), "Syloti Nagri" }, { T("syrc"), "Syriac" }, + { T("tagb"), "Tagbanwa" }, + { T("takr"), "Takri" }, + { T("tale"), "Tai Le" }, + { T("talu"), "New Tai Lue" }, { T("taml"), "Tamil" }, + { T("tavt"), "Tai Viet" }, + { T("tel2"), "Telugu v.2" }, { T("telu"), "Telugu" }, + { T("tfng"), "Tifinagh" }, + { T("tglg"), "Tagalog" }, { T("thaa"), "Thaana" }, { T("thai"), "Thai" }, { T("tibt"), "Tibetan" }, + { T("tml2"), "Tamil v.2" }, + { T("ugar"), "Ugaritic Cuneiform" }, + { T("vai "), "Vai" }, + { T("xpeo"), "Old Persian Cuneiform" }, + { T("xsux"), "Sumero-Akkadian Cuneiform" }, { T("yi "), "Yi" } }; @@ -72,8 +145,10 @@ static const Mapping languages[] = { { T("AFK "), "Afrikaans" }, { T("AFR "), "Afar" }, { T("AGW "), "Agaw" }, + { T("ALS "), "Alsatian" }, { T("ALT "), "Altai" }, { T("AMH "), "Amharic" }, + { T("APPH"), "Phonetic transcription—Americanist conventions" }, { T("ARA "), "Arabic" }, { T("ARI "), "Aari" }, { T("ARK "), "Arakanese" }, @@ -104,6 +179,7 @@ static const Mapping languages[] = { { T("BLT "), "Balti" }, { T("BMB "), "Bambara" }, { T("BML "), "Bamileke" }, + { T("BOS "), "Bosnian" }, { T("BRE "), "Breton" }, { T("BRH "), "Brahui" }, { T("BRI "), "Braj Bhasha" }, @@ -122,6 +198,7 @@ static const Mapping languages[] = { { T("CHU "), "Chuvash" }, { T("CMR "), "Comorian" }, { T("COP "), "Coptic" }, + { T("COS "), "Corsican" }, { T("CRE "), "Cree" }, { T("CRR "), "Carrier" }, { T("CRT "), "Crimean Tatar" }, @@ -130,12 +207,14 @@ static const Mapping languages[] = { { T("DAN "), "Danish" }, { T("DAR "), "Dargwa" }, { T("DCR "), "Woods Cree" }, - { T("DEU "), "German (Standard)" }, + { T("DEU "), "German" }, { T("DGR "), "Dogri" }, - { T("DHV "), "Dhivehi" }, + { T("DHV "), "Dhivehi" }, // deprecated + { T("DIV "), "Dhivehi" }, { T("DJR "), "Djerma" }, { T("DNG "), "Dangme" }, { T("DNK "), "Dinka" }, + { T("DRI "), "Dari" }, { T("DUN "), "Dungan" }, { T("DZN "), "Dzongkha" }, { T("EBI "), "Ebira" }, @@ -159,7 +238,7 @@ static const Mapping languages[] = { { T("FNE "), "Forest Nenets" }, { T("FON "), "Fon" }, { T("FOS "), "Faroese" }, - { T("FRA "), "French (Standard)" }, + { T("FRA "), "French" }, { T("FRI "), "Frisian" }, { T("FRL "), "Friulian" }, { T("FTA "), "Futa" }, @@ -199,6 +278,7 @@ static const Mapping languages[] = { { T("IND "), "Indonesian" }, { T("ING "), "Ingush" }, { T("INU "), "Inuktitut" }, + { T("IPPH"), "Phonetic transcription—IPA conventions" }, { T("IRI "), "Irish" }, { T("IRT "), "Irish Traditional" }, { T("ISL "), "Icelandic" }, @@ -236,6 +316,7 @@ static const Mapping languages[] = { { T("KMS "), "Komso" }, { T("KNR "), "Kanuri" }, { T("KOD "), "Kodagu" }, + { T("KOH "), "Korean Old Hangul" }, { T("KOK "), "Konkani" }, { T("KON "), "Kikongo" }, { T("KOP "), "Komi-Permyak" }, @@ -275,6 +356,7 @@ static const Mapping languages[] = { { T("LSB "), "Lower Sorbian" }, { T("LSM "), "Lule Sami" }, { T("LTH "), "Lithuanian" }, + { T("LTZ "), "Luxembourgish" }, { T("LUB "), "Luba" }, { T("LUG "), "Luganda" }, { T("LUH "), "Luhya" }, @@ -284,6 +366,7 @@ static const Mapping languages[] = { { T("MAK "), "Makua" }, { T("MAL "), "Malayalam Traditional" }, { T("MAN "), "Mansi" }, + { T("MAP "), "Mapudungun" }, { T("MAR "), "Marathi" }, { T("MAW "), "Marwari" }, { T("MBN "), "Mbundu" }, @@ -303,6 +386,7 @@ static const Mapping languages[] = { { T("MNI "), "Manipuri" }, { T("MNK "), "Maninka" }, { T("MNX "), "Manx Gaelic" }, + { T("MOH "), "Mohawk" }, { T("MOK "), "Moksha" }, { T("MOL "), "Moldavian" }, { T("MON "), "Mon" }, @@ -319,10 +403,12 @@ static const Mapping languages[] = { { T("NDG "), "Ndonga" }, { T("NEP "), "Nepali" }, { T("NEW "), "Newari" }, + { T("NGR "), "Nagari" }, { T("NHC "), "Norway House Cree" }, { T("NIS "), "Nisi" }, { T("NIU "), "Niuean" }, { T("NKL "), "Nkole" }, + { T("NKO "), "N'Ko" }, { T("NLD "), "Dutch" }, { T("NOG "), "Nogai" }, { T("NOR "), "Norwegian" }, @@ -330,9 +416,10 @@ static const Mapping languages[] = { { T("NTA "), "Northern Tai" }, { T("NTO "), "Esperanto" }, { T("NYN "), "Nynorsk" }, + { T("OCI "), "Occitan" }, { T("OCR "), "Oji-Cree" }, { T("OJB "), "Ojibway" }, - { T("ORI "), "Oriya" }, + { T("ORI "), "Odia (formerly Oriya)" }, { T("ORO "), "Oromo" }, { T("OSS "), "Ossetian" }, { T("PAA "), "Palestinian Aramaic" }, @@ -341,7 +428,7 @@ static const Mapping languages[] = { { T("PAP "), "Palpa" }, { T("PAS "), "Pashto" }, { T("PGR "), "Polytonic Greek" }, - { T("PIL "), "Pilipino" }, + { T("PIL "), "Filipino" }, { T("PLG "), "Palaung" }, { T("PLK "), "Polish" }, { T("PRO "), "Provencal" }, @@ -416,7 +503,7 @@ static const Mapping languages[] = { { T("TSG "), "Tsonga" }, { T("TUA "), "Turoyo Aramaic" }, { T("TUL "), "Tulu" }, - { T("TUR "), "Turkish" }, + { T("TUR "), "Turkish" }, // deprecated? { T("TUV "), "Tuvin" }, { T("TWI "), "Twi" }, { T("UDM "), "Udmurt" }, @@ -432,12 +519,14 @@ static const Mapping languages[] = { { T("WCR "), "West-Cree" }, { T("WEL "), "Welsh" }, { T("WLF "), "Wolof" }, + { T("XBD "), "Tai Lue" }, { T("XHS "), "Xhosa" }, - { T("YAK "), "Yakut" }, + { T("YAK "), "Sakha" }, { T("YBA "), "Yoruba" }, { T("YCR "), "Y-Cree" }, { T("YIC "), "Yi Classic" }, { T("YIM "), "Yi Modern" }, + { T("ZHH "), "Chinese, Hong Kong SAR" }, { T("ZHP "), "Chinese Phonetic" }, { T("ZHS "), "Chinese Simplified" }, { T("ZHT "), "Chinese Traditional" }, @@ -460,10 +549,20 @@ static const Mapping features[] = { { T("calt"), "Contextual Alternates" }, { T("case"), "Case-Sensitive Forms" }, { T("ccmp"), "Glyph Composition/Decomposition" }, + { T("cfar"), "Conjunct Form After Ro" }, + { T("cjct"), "Conjunct Forms" }, { T("clig"), "Contextual Ligatures" }, + { T("cpct"), "Centered CJK Punctuation" }, { T("cpsp"), "Capital Spacing" }, { T("cswh"), "Contextual Swash" }, { T("curs"), "Cursive Positioning" }, + { T("cv01"), "Character Variants 1" }, + { T("cv02"), "Character Variants 2" }, + { T("cv03"), "Character Variants 3" }, + { T("cv04"), "Character Variants 4" }, + { T("cv05"), "Character Variants 5" }, + { T("cv06"), "Character Variants 6" }, + // ... up to cv99 { T("dist"), "Distances" }, { T("dlig"), "Discretionary Ligatures" }, { T("dnom"), "Denominators" }, @@ -481,11 +580,13 @@ static const Mapping features[] = { { T("hkna"), "Horizontal Kana Alternates" }, { T("hlig"), "Historical Ligatures" }, { T("hngl"), "Hangul" }, + { T("hojo"), "Hojo Kanji Forms (JIS X 0212-1990 Kanji Forms)" }, { T("hwid"), "Half Widths" }, { T("init"), "Initial Forms" }, { T("isol"), "Isolated Forms" }, { T("ital"), "Italics" }, { T("jalt"), "Justification Alternates" }, + { T("jp04"), "JIS2004 Forms" }, { T("jp78"), "JIS78 Forms" }, { T("jp83"), "JIS83 Forms" }, { T("jp90"), "JIS90 Forms" }, @@ -495,6 +596,8 @@ static const Mapping features[] = { { T("ljmo"), "Leading Jamo Forms" }, { T("lnum"), "Lining Figures" }, { T("locl"), "Localized Forms" }, + { T("ltra"), "Left-to-right alternates" }, + { T("ltrm"), "Left-to-right mirrored forms" }, { T("mark"), "Mark Positioning" }, { T("med2"), "Medial Forms #2" }, { T("medi"), "Medial Forms" }, @@ -511,6 +614,7 @@ static const Mapping features[] = { { T("ornm"), "Ornaments" }, { T("palt"), "Proportional Alternate Widths" }, { T("pcap"), "Petite Capitals" }, + { T("pkna"), "Proportional Kana" }, { T("pnum"), "Proportional Figures" }, { T("pref"), "Pre-Base Forms" }, { T("pres"), "Pre-base Substitutions" }, @@ -519,10 +623,12 @@ static const Mapping features[] = { { T("pwid"), "Proportional Widths" }, { T("qwid"), "Quarter Widths" }, { T("rand"), "Randomize" }, + { T("rkrf"), "Rakar Forms" }, { T("rlig"), "Required Ligatures" }, { T("rphf"), "Reph Forms" }, { T("rtbd"), "Right Bounds" }, { T("rtla"), "Right-to-left Alternates" }, + { T("rtlm"), "Right-to-left Mirrored Forms" }, { T("ruby"), "Ruby Notation Forms" }, { T("salt"), "Stylistic Alternates" }, { T("sinf"), "Scientific Inferiors" }, diff --git a/Build/source/texk/lcdf-typetools/libefont/otfname.cc b/Build/source/texk/lcdf-typetools/libefont/otfname.cc index 28d8320a83d..c140da4f39d 100644 --- a/Build/source/texk/lcdf-typetools/libefont/otfname.cc +++ b/Build/source/texk/lcdf-typetools/libefont/otfname.cc @@ -88,14 +88,14 @@ Name::parse_header(ErrorHandler *errh) int len = _str.length(); const uint8_t *data = _str.udata(); if (len == 0) - return errh->error("font has no 'name' table"), -EFAULT; + return errh->error("font has no % table"), -EFAULT; if (HEADER_SIZE > len) - return errh->error("'name' table too small"), -EFAULT; + return errh->error("% table too small"), -EFAULT; if (!(data[0] == '\000' && data[1] == '\000')) - return errh->error("bad 'name' version number"), -ERANGE; + return errh->error("bad % version number"), -ERANGE; int count = USHORT_AT(data + 2); if (HEADER_SIZE + count*NAMEREC_SIZE > len) - return errh->error("'name' table too small"), -EFAULT; + return errh->error("% table too small"), -EFAULT; return 0; } @@ -152,7 +152,11 @@ Name::utf8_name(const_iterator i) const String Name::english_name(int nameid) const { - return utf8_name(std::find_if(begin(), end(), EnglishPlatformPred(nameid))); + const_iterator end = this->end(); + const_iterator it = std::find_if(begin(), end, PlatformPred(nameid, P_MICROSOFT, E_MS_UNICODE_BMP, L_MS_ENGLISH_AMERICAN)); + if (it == end) + it = std::find_if(begin(), end, PlatformPred(nameid, P_MACINTOSH, E_MAC_ROMAN, 0)); + return utf8_name(it); } bool diff --git a/Build/source/texk/lcdf-typetools/liblcdf/clp.c b/Build/source/texk/lcdf-typetools/liblcdf/clp.c index b4a70c538c4..13394529302 100644 --- a/Build/source/texk/lcdf-typetools/liblcdf/clp.c +++ b/Build/source/texk/lcdf-typetools/liblcdf/clp.c @@ -476,6 +476,7 @@ Clp_NewParser(int argc, const char * const *argv, int nopt, const Clp_Option *op if (!clp || !cli || !iopt || !cli->valtype) goto failed; + clp->opt = -1; clp->negated = 0; clp->have_val = 0; clp->vstr = 0; @@ -1175,15 +1176,18 @@ parse_string_list(Clp_Parser *clp, const char *arg, int complain, void *user_dat } if (complain) { - const char *complaint = (ambiguous ? "ambiguous" : "invalid"); - if (!ambiguous) { + const char *complaint; + if (ambiguous) + complaint = "ambiguous value %<%s%> for option %<%O%>"; + else { + complaint = "unknown value %<%s%> for option %<%O%>"; ambiguous = sl->nitems_invalid_report; for (idx = 0; idx < ambiguous; idx++) ambiguous_values[idx] = idx; } return ambiguity_error (clp, ambiguous, ambiguous_values, sl->items, sl->iopt, - "", "option %<%O%> value %<%s%> is %s", arg, complaint); + "", complaint, arg); } else return 0; } @@ -1820,7 +1824,8 @@ Clp_Next(Clp_Parser *clp) /* Get the next argument or option */ if (!next_argument(clp, cli->option_processing ? 0 : 2)) { clp->val.s = clp->vstr; - return clp->have_val ? Clp_NotOption : Clp_Done; + clp->opt = clp->have_val ? Clp_NotOption : Clp_Done; + return clp->opt; } clp->negated = cli->whole_negated; @@ -1858,7 +1863,7 @@ Clp_Next(Clp_Parser *clp) Clp_OptionError(clp, "unrecognized option %<%s%s%>", cli->option_chars, cli->xtext); - return Clp_BadOption; + return (clp->opt = Clp_BadOption); } /* Set the current option */ @@ -1871,19 +1876,20 @@ Clp_Next(Clp_Parser *clp) || (!cli->iopt[optno].imandatory && !cli->iopt[optno].ioptional)) { if (clp->have_val) { Clp_OptionError(clp, "%<%O%> can%,t take an argument"); - return Clp_BadOption; + clp->opt = Clp_BadOption; } else - return cli->opt[optno].option_id; + clp->opt = cli->opt[optno].option_id; + return clp->opt; } /* Get an argument if we need one, or if it's optional */ /* Sanity-check the argument type. */ opt = &cli->opt[optno]; if (opt->val_type <= 0) - return Clp_Error; + return (clp->opt = Clp_Error); vtpos = val_type_binsearch(cli, opt->val_type); if (vtpos == cli->nvaltype || cli->valtype[vtpos].val_type != opt->val_type) - return Clp_Error; + return (clp->opt = Clp_Error); /* complain == 1 only if the argument was explicitly given, or it is mandatory. */ @@ -1903,14 +1909,16 @@ Clp_Next(Clp_Parser *clp) Clp_OptionError(clp, "%<%O%> requires a non-option argument"); else Clp_OptionError(clp, "%<%O%> requires an argument"); - return Clp_BadOption; + return (clp->opt = Clp_BadOption); } } else if (cli->is_short && !clp->have_val - && cli->xtext[clp_utf8_charlen(cli, cli->xtext)]) + && cli->xtext[clp_utf8_charlen(cli, cli->xtext)]) { /* The -[option]argument case: Assume that the rest of the current string is the argument. */ next_argument(clp, 1); + complain = 1; + } /* Parse the argument */ if (clp->have_val) { @@ -1918,14 +1926,14 @@ Clp_Next(Clp_Parser *clp) if (atr->func(clp, clp->vstr, complain, atr->user_data) <= 0) { /* parser failed */ clp->have_val = 0; - if (cli->iopt[optno].imandatory) - return Clp_BadOption; + if (complain) + return (clp->opt = Clp_BadOption); else Clp_RestoreParser(clp, &clpsave); } } - return opt->option_id; + return (clp->opt = opt->option_id); } diff --git a/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc b/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc index df0380369c4..67db3aea37e 100644 --- a/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc +++ b/Build/source/texk/lcdf-typetools/liblcdf/straccum.cc @@ -67,13 +67,13 @@ StringAccum::assign_out_of_memory() _len = 0; } -bool +char * StringAccum::grow(int want) { // can't append to out-of-memory strings if (_cap < 0) { errno = ENOMEM; - return false; + return 0; } int ncap = (_cap ? (_cap + MEMO_SPACE) * 2 : 128) - MEMO_SPACE; @@ -84,17 +84,46 @@ StringAccum::grow(int want) if (!n) { assign_out_of_memory(); errno = ENOMEM; - return false; + return 0; } n += MEMO_SPACE; if (_s) { - memcpy(n, _s, _cap); + memcpy(n, _s, _len); delete[] (_s - MEMO_SPACE); } _s = n; _cap = ncap; - return true; + return reinterpret_cast(_s + _len); +} + +int +StringAccum::resize(int len) +{ + assert(len >= 0); + if (len > _cap && !grow(len)) + return -ENOMEM; + else { + _len = len; + return 0; + } +} + +char * +StringAccum::hard_extend(int nadjust, int nreserve) +{ + char *x = grow(_len + nadjust + nreserve); + if (x) + _len += nadjust; + return x; +} + +const char * +StringAccum::c_str() +{ + if (_len < _cap || grow(_len)) + _s[_len] = '\0'; + return reinterpret_cast(_s); } void @@ -125,22 +154,21 @@ StringAccum::append_utf8_hard(unsigned ch) append((unsigned char) '?'); } -const char * -StringAccum::c_str() -{ - if (_len < _cap || grow(_len)) - _s[_len] = '\0'; - return reinterpret_cast(_s); -} - void -StringAccum::append_internal_data(const char *s, int len) +StringAccum::hard_append(const char *s, int len) { - if (out_of_memory()) - /* do nothing */; - else if (!_s || _len + len <= _cap) - append_external_data(s, len); - else { + // We must be careful about calls like "sa.append(sa.begin(), sa.end())"; + // a naive implementation might use sa's data after freeing it. + const char *my_s = reinterpret_cast(_s); + + if (_len + len <= _cap) { + success: + memcpy(_s + _len, s, len); + _len += len; + } else if (s < my_s || s >= my_s + _cap) { + if (grow(_len + len)) + goto success; + } else { unsigned char *old_s = _s; int old_len = _len; @@ -157,6 +185,12 @@ StringAccum::append_internal_data(const char *s, int len) } } +void +StringAccum::append(const char *s) +{ + hard_append(s, strlen(s)); +} + String StringAccum::take_string() { diff --git a/Build/source/texk/lcdf-typetools/liblcdf/string.cc b/Build/source/texk/lcdf-typetools/liblcdf/string.cc index 915121e443c..cd0410de155 100644 --- a/Build/source/texk/lcdf-typetools/liblcdf/string.cc +++ b/Build/source/texk/lcdf-typetools/liblcdf/string.cc @@ -4,7 +4,7 @@ * Eddie Kohler * * Copyright (c) 1999-2000 Massachusetts Institute of Technology - * Copyright (c) 2001-2011 Eddie Kohler + * Copyright (c) 2001-2012 Eddie Kohler * Copyright (c) 2008-2009 Meraki, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -42,14 +42,6 @@ * and its substrings generally share memory. Accessing a character by index * takes O(1) time; so does creating a substring. * - *

Initialization

- * - * The String implementation must be explicitly initialized before use; see - * static_initialize(). Explicit initialization is used because static - * constructors and other automatic initialization tricks don't work in the - * kernel. However, at user level, you can declare a String::Initializer - * object to initialize the library. - * *

Out-of-memory strings

* * When there is not enough memory to create a particular string, a special @@ -265,14 +257,6 @@ String::make_stable(const char *s, int len) return String(s, len, 0); } -String -String::make_garbage(int len) -{ - String s; - s.append_garbage(len); - return s; -} - String String::make_fill(int c, int len) { @@ -333,7 +317,7 @@ String::assign(const char *str, int len, bool need_deref) } char * -String::append_garbage(int len) +String::append_uninitialized(int len) { // Appending anything to "out of memory" leaves it as "out of memory" if (len <= 0 || _r.data == &oom_data) @@ -387,7 +371,7 @@ String::append_garbage(int len) } void -String::append(const char *s, int len) +String::append(const char *s, int len, memo_t *memo) { if (!s) { assert(len <= 0); @@ -401,14 +385,17 @@ String::append(const char *s, int len) assign_out_of_memory(); else if (len == 0) /* do nothing */; - else if (!(_r.memo - && s >= _r.memo->real_data - && s + len <= _r.memo->real_data + _r.memo->capacity)) { - if (char *space = append_garbage(len)) + else if (_r.length == 0 && memo && !out_of_memory()) { + deref(); + assign_memo(s, len, memo); + } else if (!(_r.memo + && s >= _r.memo->real_data + && s + len <= _r.memo->real_data + _r.memo->capacity)) { + if (char *space = append_uninitialized(len)) memcpy(space, s, len); } else { String preserve_s(*this); - if (char *space = append_garbage(len)) + if (char *space = append_uninitialized(len)) memcpy(space, s, len); } } @@ -417,7 +404,7 @@ void String::append_fill(int c, int len) { assert(len >= 0); - if (char *space = append_garbage(len)) + if (char *space = append_uninitialized(len)) memset(space, c, len); } @@ -745,7 +732,7 @@ String::align(int n) int offset = reinterpret_cast(_r.data) % n; if (offset) { String s; - s.append_garbage(_r.length + n + 1); + s.append_uninitialized(_r.length + n + 1); offset = reinterpret_cast(s._r.data) % n; memcpy((char *)s._r.data + n - offset, _r.data, _r.length); s._r.data += n - offset; diff --git a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 index 82942ad329e..29d04ec1b4d 100644 --- a/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 +++ b/Build/source/texk/lcdf-typetools/mmafm/mmafm.1 @@ -1,5 +1,5 @@ .\" -*-nroff-*- -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 b/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 index 850be8e85f8..663e37c27ee 100644 --- a/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 +++ b/Build/source/texk/lcdf-typetools/mmpfb/mmpfb.1 @@ -1,5 +1,5 @@ .\" -*-nroff-*- -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 index c3f76691c5b..652d943b38c 100644 --- a/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 +++ b/Build/source/texk/lcdf-typetools/otfinfo/otfinfo.1 @@ -1,5 +1,5 @@ '\"t -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 index d83263f40b4..13401ec6e09 100644 --- a/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 +++ b/Build/source/texk/lcdf-typetools/otftotfm/otftotfm.1 @@ -1,5 +1,5 @@ '\"t -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 index 779914d281f..86696ead291 100644 --- a/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 +++ b/Build/source/texk/lcdf-typetools/t1dotlessj/t1dotlessj.1 @@ -1,4 +1,4 @@ -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 b/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 index bebd5fec146..1a056aee1e2 100644 --- a/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 +++ b/Build/source/texk/lcdf-typetools/t1lint/t1lint.1 @@ -1,4 +1,4 @@ -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 b/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 index 15925e273c3..fd095ccc6ca 100644 --- a/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 +++ b/Build/source/texk/lcdf-typetools/t1rawafm/t1rawafm.1 @@ -1,4 +1,4 @@ -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 index a5a6d98a06c..493eeafc468 100644 --- a/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 +++ b/Build/source/texk/lcdf-typetools/t1reencode/t1reencode.1 @@ -1,4 +1,4 @@ -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 index d9b328cc24c..15724f0cad9 100644 --- a/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 +++ b/Build/source/texk/lcdf-typetools/t1testpage/t1testpage.1 @@ -1,4 +1,4 @@ -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 index 9a63e69ac09..d7a84f1c0de 100644 --- a/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 +++ b/Build/source/texk/lcdf-typetools/ttftotype42/ttftotype42.1 @@ -1,4 +1,4 @@ -.ds V 2.92 +.ds V 2.94 .de M .BR "\\$1" "(\\$2)\\$3" .. diff --git a/Build/source/texk/lcdf-typetools/version.ac b/Build/source/texk/lcdf-typetools/version.ac index 4d356a0d765..b8b6564e89c 100644 --- a/Build/source/texk/lcdf-typetools/version.ac +++ b/Build/source/texk/lcdf-typetools/version.ac @@ -1,5 +1,5 @@ dnl -dnl Copyright (C) 2011 Peter Breitenlohner +dnl Copyright (C) 2011, 2012 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current lcdf-typetools version -m4_define([lcdf_typetools_version], [2.92]) +m4_define([lcdf_typetools_version], [2.94]) -- cgit v1.2.3