From 1c0abb83d537ef1e3b95ebd92c646a5d70793d93 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 18 Jun 2014 12:05:20 +0000 Subject: texk/web2c: Better handling of native subdirectory web2c/web2c Add gmp and mpfr libraries in preparation for Metapost 2.0 git-svn-id: svn://tug.org/texlive/trunk@34290 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 4 + Build/source/texk/web2c/Makefile.am | 8 +- Build/source/texk/web2c/Makefile.in | 10 ++ Build/source/texk/web2c/aclocal.m4 | 2 + Build/source/texk/web2c/c-auto.in | 3 - Build/source/texk/web2c/configure | 157 +++++++++++++++++++------ Build/source/texk/web2c/configure.ac | 18 +-- Build/source/texk/web2c/ctangleboot.cin | 92 ++++++++------- Build/source/texk/web2c/cwebboot.cin | 122 ++++++++++--------- Build/source/texk/web2c/cwebboot.hin | 20 ++-- Build/source/texk/web2c/doc/Makefile.in | 8 ++ Build/source/texk/web2c/lib/Makefile.in | 8 ++ Build/source/texk/web2c/man/Makefile.in | 8 ++ Build/source/texk/web2c/omegafonts/Makefile.in | 8 ++ Build/source/texk/web2c/otps/Makefile.in | 8 ++ Build/source/texk/web2c/otps/win32/Makefile.in | 8 ++ Build/source/texk/web2c/web2c/ChangeLog | 4 + Build/source/texk/web2c/web2c/Makefile.am | 6 +- Build/source/texk/web2c/web2c/Makefile.in | 1 - Build/source/texk/web2c/web2c/configure | 20 ++-- Build/source/texk/web2c/window/Makefile.in | 8 ++ 21 files changed, 341 insertions(+), 182 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 39e8567d13d..0cad925cfea 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner + + * configure.ac: Drop the obsolete NATIVE_TEXLIVE_BUILD. + 2014-05-20 Karl Berry * doc/web2c.texi (Languages and hyphenation): consistent diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index 8f5238f644c..7801f2a03ab 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am for the TeX Live subdirectory texk/web2c/ +## Makefile.am for the TeX Live subdirectory texk/web2c/. ## ## Copyright (C) 2009-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. @@ -97,7 +97,11 @@ $(proglib): ${srcdir}/lib/*.c @PIXMAN_RULE@ ## Rebuild libcairo @CAIRO_RULE@ -## Rebuild libxpdf & Co +## Rebuild libgmp +@GMP_RULE@ +## Rebuild libmpfr +@MPFR_RULE@ +## Rebuild libxpdf @XPDF_RULE@ ## Rebuild poppler @POPPLER_RULE@ diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index da335b20771..43e81a37e12 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -343,6 +343,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ @@ -353,6 +354,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ + $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ @@ -1800,6 +1802,9 @@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ FT2_CONFIG = @FT2_CONFIG@ +GMP_DEPEND = @GMP_DEPEND@ +GMP_INCLUDES = @GMP_INCLUDES@ +GMP_LIBS = @GMP_LIBS@ GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ @@ -1848,6 +1853,9 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MPFR_DEPEND = @MPFR_DEPEND@ +MPFR_INCLUDES = @MPFR_INCLUDES@ +MPFR_LIBS = @MPFR_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ OBJCXX = @OBJCXX@ @@ -13866,6 +13874,8 @@ $(proglib): ${srcdir}/lib/*.c @FREETYPE2_RULE@ @PIXMAN_RULE@ @CAIRO_RULE@ +@GMP_RULE@ +@MPFR_RULE@ @XPDF_RULE@ @POPPLER_RULE@ @ZZIPLIB_RULE@ diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4 index aa0557e0793..a1dd423c3f2 100644 --- a/Build/source/texk/web2c/aclocal.m4 +++ b/Build/source/texk/web2c/aclocal.m4 @@ -1228,6 +1228,7 @@ m4_include([../../m4/kpse-cross.m4]) m4_include([../../m4/kpse-cxx-hack.m4]) m4_include([../../m4/kpse-fontconfig-flags.m4]) m4_include([../../m4/kpse-freetype2-flags.m4]) +m4_include([../../m4/kpse-gmp-flags.m4]) m4_include([../../m4/kpse-graphite2-flags.m4]) m4_include([../../m4/kpse-harfbuzz-flags.m4]) m4_include([../../m4/kpse-icu-flags.m4]) @@ -1238,6 +1239,7 @@ m4_include([../../m4/kpse-lt-hack.m4]) m4_include([../../m4/kpse-lua52-flags.m4]) m4_include([../../m4/kpse-luajit-flags.m4]) m4_include([../../m4/kpse-macos-framework.m4]) +m4_include([../../m4/kpse-mpfr-flags.m4]) m4_include([../../m4/kpse-pixman-flags.m4]) m4_include([../../m4/kpse-poppler-flags.m4]) m4_include([../../m4/kpse-ptexenc-flags.m4]) diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in index cd1b7bafe5e..5c02f3bd4f3 100644 --- a/Build/source/texk/web2c/c-auto.in +++ b/Build/source/texk/web2c/c-auto.in @@ -237,9 +237,6 @@ /* metafont: Define to include mftalk (generic server) window support. */ #undef MFTALKWIN -/* Define to 1 if building binaries for TeX Live, else 0. */ -#undef NATIVE_TEXLIVE_BUILD - /* metafont: Define to include NeXT window support. */ #undef NEXTWIN diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 2350513a978..70cf8f8a2d6 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Web2C 2014. +# Generated by GNU Autoconf 2.69 for Web2C 2015/dev. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Web2C' PACKAGE_TARNAME='web2c' -PACKAGE_VERSION='2014' -PACKAGE_STRING='Web2C 2014' +PACKAGE_VERSION='2015/dev' +PACKAGE_STRING='Web2C 2015/dev' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -673,6 +673,14 @@ POPPLER_RULE POPPLER_DEPEND POPPLER_LIBS POPPLER_INCLUDES +MPFR_RULE +MPFR_DEPEND +MPFR_LIBS +MPFR_INCLUDES +GMP_RULE +GMP_DEPEND +GMP_LIBS +GMP_INCLUDES CAIRO_RULE CAIRO_DEPEND CAIRO_LIBS @@ -1007,6 +1015,12 @@ with_system_libpng with_system_freetype2 with_system_pixman with_system_cairo +with_system_gmp +with_gmp_includes +with_gmp_libdir +with_system_mpfr +with_mpfr_includes +with_mpfr_libdir with_system_poppler with_system_xpdf with_system_zziplib @@ -1575,7 +1589,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 Web2C 2014 to adapt to many kinds of systems. +\`configure' configures Web2C 2015/dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1649,7 +1663,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Web2C 2014:";; + short | recursive ) echo "Configuration of Web2C 2015/dev:";; esac cat <<\_ACEOF @@ -1756,6 +1770,13 @@ Optional Packages: pkg-config) --with-system-cairo use installed cairo headers and library (requires pkg-config) + --with-system-gmp use installed gmp headers and library + --with-gmp-includes=DIR gmp headers installed in DIR + --with-gmp-libdir=DIR gmp library installed in DIR + --with-system-mpfr use installed mpfr headers and library + --with-mpfr-includes=DIR + mpfr headers installed in DIR + --with-mpfr-libdir=DIR mpfr library installed in DIR --with-system-poppler use installed poppler headers and library (requires pkg-config) --with-system-xpdf use installed poppler headers and library instead of @@ -1862,7 +1883,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Web2C configure 2014 +Web2C configure 2015/dev generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2951,7 +2972,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 Web2C $as_me 2014, which was +It was created by Web2C $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3332,7 +3353,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -WEB2CVERSION=2014 +WEB2CVERSION=2015/dev am__api_version='1.14' @@ -8444,7 +8465,7 @@ fi # Define the identity of the package. PACKAGE='web2c' - VERSION='2014' + VERSION='2015/dev' cat >>confdefs.h <<_ACEOF @@ -13743,11 +13764,6 @@ _ACEOF fi -if test "x$host_alias" != x && test "x$build_alias" = x; then : - as_fn_error $? "when cross-compiling you must specify both --host and --build." "$LINENO" 5 -fi -eval kpse_build_alias=\${build_alias-$build} - if test "x$cross_compiling" = xyes; then cross_TRUE= @@ -18403,14 +18419,6 @@ if test -z "$WIN32_TRUE"; then : fi -# A compilation variable for doing a TL build so we can -# adjust the luatex banner, maybe others. -if test "x$enable_native_texlive_build" = xyes; then : - -$as_echo "#define NATIVE_TEXLIVE_BUILD 1" >>confdefs.h - -fi - case $with_editor in #( ''|yes|no) : if test "x$kpse_cv_have_win32" = xno; then : @@ -18589,7 +18597,7 @@ fi # and maybe -lresolv for inet_aton(). lua_socketlibs=$socketlibs kpse_save_LIBS=$LIBS -LUA52_DEFINES=-DLUA_COMPAT_MODULE +LUA52_DEFINES='-DLUA_COMPAT_MODULE -DLUAI_HASHLIMIT=6' if test "x$kpse_cv_have_win32" = xno; then LUA52_DEFINES="$LUA52_DEFINES -DLUA_USE_POSIX" @@ -18660,7 +18668,7 @@ fi fi fi -LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT +LUAJIT_DEFINES='-DLUAJIT_ENABLE_LUA52COMPAT -DLUAI_HASHLIMIT=6' case $host_os:$host_cpu in #( *darwin*:x86_64) : @@ -21684,7 +21692,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -Web2C config.lt 2014 +Web2C config.lt 2015/dev configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -23321,6 +23329,76 @@ ${top_builddir}/../../libs/cairo/cairo/cairo.h: cd ${top_builddir}/../../libs/cairo && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi +## _KPSE_LIB_FLAGS: Setup gmp (-lgmp) flags + +# Check whether --with-system-gmp was given. +if test "${with_system_gmp+set}" = set; then : + withval=$with_system_gmp; +fi + +# Check whether --with-gmp-includes was given. +if test "${with_gmp_includes+set}" = set; then : + withval=$with_gmp_includes; +fi + +# Check whether --with-gmp-libdir was given. +if test "${with_gmp_libdir+set}" = set; then : + withval=$with_gmp_libdir; +fi +if test "x$with_system_gmp" = xyes; then + if test "x$with_gmp_includes" != x && test "x$with_gmp_includes" != xyes; then + GMP_INCLUDES="-I$with_gmp_includes" +fi +GMP_LIBS="-lgmp" +if test "x$with_gmp_libdir" != x && test "x$with_gmp_libdir" != xyes; then + GMP_LIBS="-L$with_gmp_libdir $GMP_LIBS" +fi +else + GMP_INCLUDES="-I$kpse_BLD/libs/gmp/include" + GMP_LIBS="$kpse_BLD/libs/gmp/libgmp.a" + GMP_DEPEND='${top_builddir}/../../libs/gmp/libgmp.a' + GMP_RULE='# Rebuild libgmp +$(GMP_DEPEND): ${top_builddir}/../../libs/gmp/include/gmp.h + cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild +${top_builddir}/../../libs/gmp/include/gmp.h: + cd ${top_builddir}/../../libs/gmp && $(MAKE) $(AM_MAKEFLAGS) rebuild' +fi + +## _KPSE_LIB_FLAGS: Setup mpfr (-lmpfr) flags + +# Check whether --with-system-mpfr was given. +if test "${with_system_mpfr+set}" = set; then : + withval=$with_system_mpfr; +fi + +# Check whether --with-mpfr-includes was given. +if test "${with_mpfr_includes+set}" = set; then : + withval=$with_mpfr_includes; +fi + +# Check whether --with-mpfr-libdir was given. +if test "${with_mpfr_libdir+set}" = set; then : + withval=$with_mpfr_libdir; +fi +if test "x$with_system_mpfr" = xyes; then + if test "x$with_mpfr_includes" != x && test "x$with_mpfr_includes" != xyes; then + MPFR_INCLUDES="-I$with_mpfr_includes" +fi +MPFR_LIBS="-lmpfr" +if test "x$with_mpfr_libdir" != x && test "x$with_mpfr_libdir" != xyes; then + MPFR_LIBS="-L$with_mpfr_libdir $MPFR_LIBS" +fi +else + MPFR_INCLUDES="-I$kpse_BLD/libs/mpfr/include" + MPFR_LIBS="$kpse_BLD/libs/mpfr/libmpfr.a" + MPFR_DEPEND='${top_builddir}/../../libs/mpfr/libmpfr.a' + MPFR_RULE='# Rebuild libmpfr +$(MPFR_DEPEND): ${top_builddir}/../../libs/mpfr/include/mpfr.h + cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild +${top_builddir}/../../libs/mpfr/include/mpfr.h: + cd ${top_builddir}/../../libs/mpfr && $(MAKE) $(AM_MAKEFLAGS) rebuild' +fi + ## _KPSE_LIB_FLAGS: Setup poppler (-lpoppler) flags # Check whether --with-system-poppler was given. @@ -24014,11 +24092,6 @@ $as_echo "$tool_ok" >&6; } fi fi - - -subdirs="$subdirs web2c" - - ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile omegafonts/Makefile otps/Makefile otps/win32/Makefile window/Makefile" ac_config_files="$ac_config_files web2c-sh" @@ -24030,6 +24103,16 @@ ac_config_files="$ac_config_files ctangleboot-sh" ac_config_files="$ac_config_files silent-sh" +if test "x$host_alias" != x && test "x$build_alias" = x; then : + as_fn_error $? "when cross-compiling you must specify both --host and --build." "$LINENO" 5 +fi +eval kpse_build_alias=\${build_alias-$build} + + + +subdirs="$subdirs web2c" + + cat >confcache <<\_ACEOF @@ -24715,7 +24798,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 Web2C $as_me 2014, which was +This file was extended by Web2C $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24785,7 +24868,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="\\ -Web2C config.status 2014 +Web2C config.status 2015/dev configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -26863,10 +26946,12 @@ test $ac_write_fail = 0 || as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 if test "x$cross_compiling" = xyes; then : - cache_file=/dev/null - ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \ - CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\ - CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'" + if test "x$cache_file" != x/dev/null; then : + cache_file=config.cache +fi +ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \ +CC='$BUILDCC' CFLAGS='$BUILDCFLAGS' \ +CPPFLAGS='$BUILDCPPFLAGS' LDFLAGS='$BUILDLDFLAGS'" fi # configure is writing to config.log, and then calls config.status. diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 87e2ad500e5..2ec55be1551 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -35,7 +35,6 @@ AC_SUBST([WEB2CVERSION]) dnl Common code for all programs using libkpathsea. KPSE_COMMON([web2c programs]) -KPSE_CANONICAL_HOST AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes]) @@ -61,12 +60,6 @@ KPSE_ASM_UNDERSCORE KPSE_COND_MINGW32 KPSE_WIN32_CALL -# A compilation variable for doing a TL build so we can -# adjust the luatex banner, maybe others. -AS_IF([test "x$enable_native_texlive_build" = xyes], - [AC_DEFINE([NATIVE_TEXLIVE_BUILD], 1, - [Define to 1 if building binaries for TeX Live, else 0.])]) - AS_CASE([$with_editor], [''|yes|no], [AS_IF([test "x$kpse_cv_have_win32" = xno], [with_editor="vi +%d '%s'"], @@ -282,6 +275,8 @@ KPSE_LIBPNG_FLAGS KPSE_FREETYPE2_FLAGS KPSE_PIXMAN_FLAGS KPSE_CAIRO_FLAGS +KPSE_GMP_FLAGS +KPSE_MPFR_FLAGS KPSE_POPPLER_FLAGS KPSE_XPDF_FLAGS KPSE_ZZIPLIB_FLAGS @@ -380,8 +375,6 @@ if test "x$cross_compiling" = xyes; then fi fi -AC_CONFIG_SUBDIRS([web2c]) - AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile omegafonts/Makefile otps/Makefile otps/win32/Makefile window/Makefile]) @@ -391,11 +384,6 @@ AC_CONFIG_FILES([ctangleboot-sh], [chmod +x ctangleboot-sh]) AC_CONFIG_FILES([silent-sh], [chmod +x silent-sh]) dnl The subdirectory web2c must be configured for the build system. -dnl When cross compiling, can not share the cache file with the subdirectory! -AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes], -[cache_file=/dev/null - ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \ - CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\ - CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"])]) +KPSE_NATIVE_SUBDIRS([web2c]) AC_OUTPUT diff --git a/Build/source/texk/web2c/ctangleboot.cin b/Build/source/texk/web2c/ctangleboot.cin index 969424ab520..caa5fdee8ac 100644 --- a/Build/source/texk/web2c/ctangleboot.cin +++ b/Build/source/texk/web2c/ctangleboot.cin @@ -50,12 +50,12 @@ #define period_ast 026 #define minus_gt_ast 027 \ -#define xisalpha(c) (isalpha(c) &&((eight_bits) c<0200) ) -#define xisdigit(c) (isdigit(c) &&((eight_bits) c<0200) ) -#define xisspace(c) (isspace(c) &&((eight_bits) c<0200) ) -#define xislower(c) (islower(c) &&((eight_bits) c<0200) ) -#define xisupper(c) (isupper(c) &&((eight_bits) c<0200) ) -#define xisxdigit(c) (isxdigit(c) &&((eight_bits) c<0200) ) \ +#define xisalpha(c) (isalpha((eight_bits) c) &&((eight_bits) c<0200) ) +#define xisdigit(c) (isdigit((eight_bits) c) &&((eight_bits) c<0200) ) +#define xisspace(c) (isspace((eight_bits) c) &&((eight_bits) c<0200) ) +#define xislower(c) (islower((eight_bits) c) &&((eight_bits) c<0200) ) +#define xisupper(c) (isupper((eight_bits) c) &&((eight_bits) c<0200) ) +#define xisxdigit(c) (isxdigit((eight_bits) c) &&((eight_bits) c<0200) ) \ #define length(c) (c+1) ->byte_start-(c) ->byte_start #define print_id(c) term_write((c) ->byte_start,length((c) ) ) @@ -190,21 +190,21 @@ extern char*byte_ptr; extern name_pointer hash[]; extern hash_pointer hash_end; extern hash_pointer h; -#line 132 "cwebdir/ctang-w2c.ch" +#line 148 "cwebdir/ctang-w2c.ch" #include "cwebboot.h" #line 112 "cwebdir/common.h" /*:8*//*9:*/ #line 122 "cwebdir/common.h" -#line 144 "cwebdir/ctang-w2c.ch" +#line 160 "cwebdir/ctang-w2c.ch" extern int history; #line 128 "cwebdir/common.h" /*:9*//*10:*/ #line 137 "cwebdir/common.h" -#line 158 "cwebdir/ctang-w2c.ch" +#line 174 "cwebdir/ctang-w2c.ch" extern int include_depth; #line 139 "cwebdir/common.h" extern FILE*file[]; @@ -216,7 +216,7 @@ extern char scn_file_name[]; extern char file_name[][max_file_name_length]; extern char change_file_name[]; -#line 165 "cwebdir/ctang-w2c.ch" +#line 181 "cwebdir/ctang-w2c.ch" extern int line[]; extern int change_line; #line 150 "cwebdir/common.h" @@ -368,35 +368,35 @@ extern sixteen_bits section_count; /*40:*/ #line 533 "cwebdir/ctangle.w" -#line 267 "cwebdir/ctang-w2c.ch" +#line 283 "cwebdir/ctang-w2c.ch" static void phase_two(void); #line 535 "cwebdir/ctangle.w" /*:40*//*45:*/ #line 602 "cwebdir/ctangle.w" -#line 293 "cwebdir/ctang-w2c.ch" +#line 309 "cwebdir/ctang-w2c.ch" static void output_defs(void); #line 604 "cwebdir/ctangle.w" /*:45*//*47:*/ #line 648 "cwebdir/ctangle.w" -#line 311 "cwebdir/ctang-w2c.ch" +#line 327 "cwebdir/ctang-w2c.ch" static void out_char(eight_bits); #line 650 "cwebdir/ctangle.w" /*:47*//*89:*/ #line 1457 "cwebdir/ctangle.w" -#line 406 "cwebdir/ctang-w2c.ch" +#line 441 "cwebdir/ctang-w2c.ch" static void phase_one(void); #line 1459 "cwebdir/ctangle.w" /*:89*//*91:*/ #line 1475 "cwebdir/ctangle.w" -#line 424 "cwebdir/ctang-w2c.ch" +#line 459 "cwebdir/ctang-w2c.ch" static void skip_limbo(void); #line 1477 "cwebdir/ctangle.w" @@ -485,7 +485,7 @@ return wrap_up(); /*:2*//*20:*/ #line 183 "cwebdir/ctangle.w" -#line 191 "cwebdir/ctang-w2c.ch" +#line 207 "cwebdir/ctang-w2c.ch" int names_match(name_pointer p,const char*first,int l,char t) #line 188 "cwebdir/ctangle.w" { @@ -497,21 +497,21 @@ return!strncmp(first,p->byte_start,l); #line 198 "cwebdir/ctangle.w" void -#line 200 "cwebdir/ctang-w2c.ch" +#line 216 "cwebdir/ctang-w2c.ch" init_node(name_pointer node) #line 202 "cwebdir/ctangle.w" { node->equiv= (char*)text_info; } void -#line 206 "cwebdir/ctang-w2c.ch" +#line 222 "cwebdir/ctang-w2c.ch" init_p(name_pointer p,char t){} #line 207 "cwebdir/ctangle.w" /*:21*//*25:*/ #line 260 "cwebdir/ctangle.w" -#line 216 "cwebdir/ctang-w2c.ch" +#line 232 "cwebdir/ctang-w2c.ch" static void store_two_bytes(sixteen_bits x) #line 264 "cwebdir/ctangle.w" @@ -524,7 +524,7 @@ if(tok_ptr+2> tok_mem_end)overflow("token"); /*:25*//*29:*/ #line 336 "cwebdir/ctangle.w" -#line 227 "cwebdir/ctang-w2c.ch" +#line 243 "cwebdir/ctang-w2c.ch" static void push_level(name_pointer p) #line 340 "cwebdir/ctangle.w" @@ -542,7 +542,7 @@ cur_section= 0; /*:29*//*30:*/ #line 355 "cwebdir/ctangle.w" -#line 238 "cwebdir/ctang-w2c.ch" +#line 254 "cwebdir/ctang-w2c.ch" static void pop_level(int flag) #line 359 "cwebdir/ctangle.w" @@ -559,7 +559,7 @@ if(stack_ptr> stack)cur_state= *stack_ptr; /*:30*//*32:*/ #line 391 "cwebdir/ctangle.w" -#line 248 "cwebdir/ctang-w2c.ch" +#line 264 "cwebdir/ctang-w2c.ch" static void get_output(void) #line 394 "cwebdir/ctangle.w" @@ -608,7 +608,7 @@ out_char(section_number); /*:32*//*36:*/ #line 481 "cwebdir/ctangle.w" -#line 258 "cwebdir/ctang-w2c.ch" +#line 274 "cwebdir/ctang-w2c.ch" static void flush_buffer(void) #line 484 "cwebdir/ctangle.w" @@ -625,7 +625,7 @@ cur_line++; /*:36*//*41:*/ #line 536 "cwebdir/ctangle.w" -#line 276 "cwebdir/ctang-w2c.ch" +#line 292 "cwebdir/ctang-w2c.ch" static void phase_two(void){ #line 539 "cwebdir/ctangle.w" @@ -676,7 +676,7 @@ for(an_output_file= end_output_files;an_output_file> cur_out_file;){ an_output_file--; sprint_section_name(output_file_name,*an_output_file); fclose(C_file); -#line 285 "cwebdir/ctang-w2c.ch" +#line 301 "cwebdir/ctang-w2c.ch" C_file= fopen(output_file_name,"wb"); #line 578 "cwebdir/ctangle.w" if(C_file==0)fatal("! Cannot open output file:",output_file_name); @@ -702,7 +702,7 @@ if(show_happiness)printf("\nDone."); /*:41*//*46:*/ #line 605 "cwebdir/ctangle.w" -#line 302 "cwebdir/ctang-w2c.ch" +#line 318 "cwebdir/ctang-w2c.ch" static void output_defs(void) #line 608 "cwebdir/ctangle.w" @@ -745,7 +745,7 @@ pop_level(0); #line 651 "cwebdir/ctangle.w" static void -#line 320 "cwebdir/ctang-w2c.ch" +#line 336 "cwebdir/ctang-w2c.ch" out_char(eight_bits cur_char) #line 655 "cwebdir/ctangle.w" { @@ -846,7 +846,7 @@ default:C_putc(cur_char);out_state= normal;break; /*:48*//*57:*/ #line 813 "cwebdir/ctangle.w" -#line 329 "cwebdir/ctang-w2c.ch" +#line 345 "cwebdir/ctang-w2c.ch" static eight_bits skip_ahead(void) #line 816 "cwebdir/ctangle.w" @@ -866,7 +866,7 @@ if(c!=ignore||*(loc-1)=='>')return(c); /*:57*//*59:*/ #line 848 "cwebdir/ctangle.w" -#line 339 "cwebdir/ctang-w2c.ch" +#line 355 "cwebdir/ctang-w2c.ch" static int skip_comment(boolean is_long_comment) #line 851 "cwebdir/ctangle.w" @@ -902,7 +902,7 @@ else loc++; /*:59*//*62:*/ #line 900 "cwebdir/ctangle.w" -#line 356 "cwebdir/ctang-w2c.ch" +#line 372 "cwebdir/ctang-w2c.ch" static eight_bits get_next(void) #line 903 "cwebdir/ctangle.w" @@ -924,7 +924,7 @@ else id_first= cur_file_name; id_loc= id_first+strlen(id_first); if(changing)store_two_bytes((sixteen_bits)change_line); else store_two_bytes((sixteen_bits)cur_line); -#line 387 "cwebdir/ctang-w2c.ch" +#line 409 "cwebdir/ctang-w2c.ch" {int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200); app_repl(a_l%0400);} #line 1234 "cwebdir/ctangle.w" @@ -1023,7 +1023,9 @@ else if(isalpha(c)||isxalpha(c)||ishigh(c)) #line 972 "cwebdir/ctangle.w" { id_first= --loc; -while(isalpha(*++loc)||isdigit(*loc)||isxalpha(*loc)||ishigh(*loc)); +#line 389 "cwebdir/ctang-w2c.ch" +while(isalpha((unsigned char)*++loc)||isdigit((unsigned char)*loc)||isxalpha(*loc)||ishigh(*loc)); +#line 975 "cwebdir/ctangle.w" id_loc= loc;return(identifier); } @@ -1188,7 +1190,7 @@ mistake:/*63:*/ switch(c){ case'+':if(*loc=='+')compress(plus_plus);break; case'-':if(*loc=='-'){compress(minus_minus);} -#line 366 "cwebdir/ctang-w2c.ch" +#line 382 "cwebdir/ctang-w2c.ch" else if(*loc=='>'){if(*(loc+1)=='*'){loc++;compress(minus_gt_ast);} else compress(minus_gt);}break; #line 956 "cwebdir/ctangle.w" @@ -1218,7 +1220,7 @@ return(c); /*:62*//*75:*/ #line 1199 "cwebdir/ctangle.w" -#line 377 "cwebdir/ctang-w2c.ch" +#line 399 "cwebdir/ctang-w2c.ch" static void scan_repl(eight_bits t) #line 1203 "cwebdir/ctangle.w" @@ -1233,7 +1235,7 @@ else id_first= cur_file_name; id_loc= id_first+strlen(id_first); if(changing)store_two_bytes((sixteen_bits)change_line); else store_two_bytes((sixteen_bits)cur_line); -#line 387 "cwebdir/ctang-w2c.ch" +#line 409 "cwebdir/ctang-w2c.ch" {int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200); app_repl(a_l%0400);} #line 1234 "cwebdir/ctangle.w" @@ -1278,7 +1280,7 @@ else id_first= cur_file_name; id_loc= id_first+strlen(id_first); if(changing)store_two_bytes((sixteen_bits)change_line); else store_two_bytes((sixteen_bits)cur_line); -#line 387 "cwebdir/ctang-w2c.ch" +#line 409 "cwebdir/ctang-w2c.ch" {int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200); app_repl(a_l%0400);} #line 1234 "cwebdir/ctangle.w" @@ -1303,7 +1305,7 @@ else id_first= cur_file_name; id_loc= id_first+strlen(id_first); if(changing)store_two_bytes((sixteen_bits)change_line); else store_two_bytes((sixteen_bits)cur_line); -#line 387 "cwebdir/ctang-w2c.ch" +#line 409 "cwebdir/ctang-w2c.ch" {int a_l= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a_l/0400)+0200); app_repl(a_l%0400);} #line 1234 "cwebdir/ctangle.w" @@ -1359,12 +1361,16 @@ case'x': if(xisdigit(*(id_first+1)))c= *(++id_first)-'0'; else if(xisxdigit(*(id_first+1))){ ++id_first; -c= toupper(*id_first)-'A'+10; +#line 418 "cwebdir/ctang-w2c.ch" +c= toupper((unsigned char)*id_first)-'A'+10; +#line 1321 "cwebdir/ctangle.w" } if(xisdigit(*(id_first+1)))c= 16*c+*(++id_first)-'0'; else if(xisxdigit(*(id_first+1))){ ++id_first; -c= 16*c+toupper(*id_first)-'A'+10; +#line 423 "cwebdir/ctang-w2c.ch" +c= 16*c+toupper((unsigned char)*id_first)-'A'+10; +#line 1326 "cwebdir/ctangle.w" } break; case'\\':c= '\\';break; @@ -1409,7 +1415,7 @@ cur_text= text_ptr;(++text_ptr)->tok_start= tok_ptr; /*:75*//*82:*/ #line 1357 "cwebdir/ctangle.w" -#line 397 "cwebdir/ctang-w2c.ch" +#line 432 "cwebdir/ctang-w2c.ch" static void scan_section(void) #line 1360 "cwebdir/ctangle.w" @@ -1522,7 +1528,7 @@ cur_text->text_link= section_flag; /*:82*//*90:*/ #line 1460 "cwebdir/ctangle.w" -#line 415 "cwebdir/ctang-w2c.ch" +#line 450 "cwebdir/ctang-w2c.ch" static void phase_one(void){ #line 1463 "cwebdir/ctangle.w" @@ -1538,7 +1544,7 @@ phase= 2; /*:90*//*92:*/ #line 1478 "cwebdir/ctangle.w" -#line 433 "cwebdir/ctang-w2c.ch" +#line 468 "cwebdir/ctang-w2c.ch" static void skip_limbo(void) #line 1481 "cwebdir/ctangle.w" @@ -1599,7 +1605,7 @@ default:err_print("! Double @ should be used in limbo"); #line 1533 "cwebdir/ctangle.w" void -#line 442 "cwebdir/ctang-w2c.ch" +#line 477 "cwebdir/ctang-w2c.ch" print_stats(void){ #line 1536 "cwebdir/ctangle.w" printf("\nMemory usage statistics:\n"); diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin index dfe81a7c209..3f6232421a3 100644 --- a/Build/source/texk/web2c/cwebboot.cin +++ b/Build/source/texk/web2c/cwebboot.cin @@ -18,7 +18,7 @@ /*:8*//*22:*/ #line 471 "cwebdir/common.w" -#line 193 "cwebdir/comm-w2c.ch" +#line 213 "cwebdir/comm-w2c.ch" #include #include #include "help.h" @@ -48,8 +48,8 @@ #define buf_size 1000 #define longest_name 1000 #define long_buf_size (buf_size+longest_name) -#define xisspace(c) (isspace(c) &&((unsigned char) c<0200) ) -#define xisupper(c) (isupper(c) &&((unsigned char) c<0200) ) \ +#define xisspace(c) (isspace((unsigned char) c) &&((unsigned char) c<0200) ) +#define xisupper(c) (isupper((unsigned char) c) &&((unsigned char) c<0200) ) \ #define max_include_depth 10 \ @@ -226,7 +226,7 @@ name_pointer hash[hash_size]; hash_pointer hash_end= hash+hash_size-1; hash_pointer h; -#line 319 "cwebdir/comm-w2c.ch" +#line 345 "cwebdir/comm-w2c.ch" /*:34*//*58:*/ #line 1082 "cwebdir/common.w" @@ -250,7 +250,7 @@ FILE*C_file; FILE*tex_file; FILE*idx_file; FILE*scn_file; -#line 705 "cwebdir/comm-w2c.ch" +#line 731 "cwebdir/comm-w2c.ch" FILE*active_file; char*found_filename; #line 1376 "cwebdir/common.w" @@ -276,14 +276,14 @@ char*change_limit; /*55:*/ #line 1017 "cwebdir/common.w" -#line 493 "cwebdir/comm-w2c.ch" +#line 519 "cwebdir/comm-w2c.ch" static int section_name_cmp(char**,int,name_pointer); #line 1019 "cwebdir/common.w" /*:55*//*71:*/ #line 1251 "cwebdir/common.w" -#line 622 "cwebdir/comm-w2c.ch" +#line 648 "cwebdir/comm-w2c.ch" static void scan_args(void); #line 1253 "cwebdir/common.w" @@ -322,7 +322,7 @@ root= NULL; #line 65 "cwebdir/comm-w2c.ch" ; /*24:*/ -#line 228 "cwebdir/comm-w2c.ch" +#line 248 "cwebdir/comm-w2c.ch" kpse_set_program_name(argv[0],"cweb"); #line 473 "cwebdir/common.w" @@ -334,7 +334,7 @@ kpse_set_program_name(argv[0],"cweb"); /*70:*/ #line 1233 "cwebdir/common.w" -#line 614 "cwebdir/comm-w2c.ch" +#line 640 "cwebdir/comm-w2c.ch" show_banner= show_happiness= show_progress= 1; #line 1235 "cwebdir/common.w" @@ -346,14 +346,14 @@ show_banner= show_happiness= show_progress= 1; scan_args(); if(program==ctangle){ -#line 714 "cwebdir/comm-w2c.ch" +#line 740 "cwebdir/comm-w2c.ch" if((C_file= fopen(C_file_name,"wb"))==NULL) #line 1381 "cwebdir/common.w" fatal("! Cannot open output file ",C_file_name); } else{ -#line 720 "cwebdir/comm-w2c.ch" +#line 746 "cwebdir/comm-w2c.ch" if((tex_file= fopen(tex_file_name,"wb"))==NULL) #line 1386 "cwebdir/common.w" fatal("! Cannot open output file ",tex_file_name); @@ -367,7 +367,7 @@ fatal("! Cannot open output file ",tex_file_name); /*:4*//*9:*/ #line 172 "cwebdir/common.w" -#line 93 "cwebdir/comm-w2c.ch" +#line 101 "cwebdir/comm-w2c.ch" int input_ln(FILE*fp) #line 175 "cwebdir/common.w" { @@ -376,7 +376,7 @@ register char*k; if(feof(fp))return(0); limit= k= buffer; while(k<=buffer_end&&(c= getc(fp))!=EOF&&c!='\n') -#line 99 "cwebdir/comm-w2c.ch" +#line 107 "cwebdir/comm-w2c.ch" if((*(k++)= c)!=' '&&c!='\r')limit= k; #line 182 "cwebdir/common.w" if(k> buffer_end) @@ -392,7 +392,7 @@ return(1); /*:9*//*12:*/ #line 251 "cwebdir/common.w" -#line 121 "cwebdir/comm-w2c.ch" +#line 129 "cwebdir/comm-w2c.ch" static void prime_the_change_buffer(void) #line 254 "cwebdir/common.w" @@ -406,7 +406,9 @@ change_line++; if(!input_ln(change_file))return; if(limit buffer+1&&buffer[0]=='@'){ -char xyz_code= xisupper(buffer[1])?tolower(buffer[1]):buffer[1]; +#line 152 "cwebdir/comm-w2c.ch" +char xyz_code= xisupper(buffer[1])?tolower((unsigned char)buffer[1]):buffer[1]; +#line 341 "cwebdir/common.w" /*17:*/ #line 358 "cwebdir/common.w" @@ -521,7 +525,7 @@ if(lines_dont_match)n++; #line 378 "cwebdir/common.w" void -#line 140 "cwebdir/comm-w2c.ch" +#line 160 "cwebdir/comm-w2c.ch" reset_input(void) #line 381 "cwebdir/common.w" { @@ -529,7 +533,7 @@ limit= buffer;loc= buffer+1;buffer[0]= ' '; /*19:*/ #line 393 "cwebdir/common.w" -#line 152 "cwebdir/comm-w2c.ch" +#line 172 "cwebdir/comm-w2c.ch" if((found_filename= kpse_find_cweb(web_file_name))==NULL|| (web_file= fopen(found_filename,"r"))==NULL){ fatal("! Cannot open input file ",web_file_name); @@ -541,7 +545,7 @@ free(found_filename); web_file_open= 1; -#line 165 "cwebdir/comm-w2c.ch" +#line 185 "cwebdir/comm-w2c.ch" if((found_filename= kpse_find_cweb(change_file_name))==NULL|| (change_file= fopen(found_filename,"r"))==NULL){ fatal("! Cannot open change file ",change_file_name); @@ -563,7 +567,7 @@ limit= buffer;loc= buffer+1;buffer[0]= ' ';input_has_ended= 0; /*:18*//*21:*/ #line 426 "cwebdir/common.w" -#line 185 "cwebdir/comm-w2c.ch" +#line 205 "cwebdir/comm-w2c.ch" int get_line(void) #line 428 "cwebdir/common.w" { @@ -587,7 +591,9 @@ changed_section[section_count]= 1;change_pending= 0; } *limit= ' '; if(buffer[0]=='@'){ -if(xisupper(buffer[1]))buffer[1]= tolower(buffer[1]); +#line 312 "cwebdir/comm-w2c.ch" +if(xisupper(buffer[1]))buffer[1]= tolower((unsigned char)buffer[1]); +#line 554 "cwebdir/common.w" if(buffer[1]=='x'||buffer[1]=='y'){ loc= buffer+2; err_print("! Where is the matching @z?"); @@ -647,7 +653,7 @@ include_depth++; /*25:*/ #line 474 "cwebdir/common.w" { -#line 241 "cwebdir/comm-w2c.ch" +#line 261 "cwebdir/comm-w2c.ch" char*cur_file_name_end= cur_file_name+max_file_name_length-1; char*k= cur_file_name; #line 479 "cwebdir/common.w" @@ -661,7 +667,7 @@ while(*loc!=' '&&*loc!='\t'&&*loc!='"'&&k<=cur_file_name_end)*k++= *loc++; if(k> cur_file_name_end)too_long(); *k= '\0'; -#line 248 "cwebdir/comm-w2c.ch" +#line 268 "cwebdir/comm-w2c.ch" if((found_filename= kpse_find_cweb(cur_file_name))!=NULL&& (cur_file= fopen(found_filename,"r"))!=NULL){ @@ -688,7 +694,7 @@ return 1; #line 569 "cwebdir/common.w" void -#line 292 "cwebdir/comm-w2c.ch" +#line 318 "cwebdir/comm-w2c.ch" check_complete(void){ #line 572 "cwebdir/common.w" if(change_limit!=change_buffer){ @@ -704,14 +710,14 @@ err_print("! Change file entry did not match"); #line 660 "cwebdir/common.w" name_pointer -#line 331 "cwebdir/comm-w2c.ch" +#line 357 "cwebdir/comm-w2c.ch" id_lookup(const char*first,const char*last,char t) #line 666 "cwebdir/common.w" { -#line 338 "cwebdir/comm-w2c.ch" +#line 364 "cwebdir/comm-w2c.ch" const char*i= first; -#line 344 "cwebdir/comm-w2c.ch" +#line 370 "cwebdir/comm-w2c.ch" int h; #line 669 "cwebdir/common.w" int l; @@ -721,7 +727,7 @@ l= last-first; /*38:*/ #line 683 "cwebdir/common.w" -#line 353 "cwebdir/comm-w2c.ch" +#line 379 "cwebdir/comm-w2c.ch" h= (unsigned char)*i; while(++ilink; if(p==NULL){ p= name_ptr; -#line 368 "cwebdir/comm-w2c.ch" +#line 394 "cwebdir/comm-w2c.ch" p->link= hash[h];hash[h]= p; #line 697 "cwebdir/common.w" } @@ -767,7 +773,7 @@ return(p); #line 764 "cwebdir/common.w" void -#line 387 "cwebdir/comm-w2c.ch" +#line 413 "cwebdir/comm-w2c.ch" print_section_name(name_pointer p) #line 768 "cwebdir/common.w" { @@ -789,7 +795,7 @@ if(q)term_write("...",3); #line 783 "cwebdir/common.w" void -#line 397 "cwebdir/comm-w2c.ch" +#line 423 "cwebdir/comm-w2c.ch" sprint_section_name(char*dest,name_pointer p) #line 788 "cwebdir/common.w" { @@ -811,7 +817,7 @@ s= p->byte_start; /*:45*//*46:*/ #line 804 "cwebdir/common.w" -#line 407 "cwebdir/comm-w2c.ch" +#line 433 "cwebdir/comm-w2c.ch" static void print_prefix_name(name_pointer p) #line 808 "cwebdir/common.w" @@ -825,13 +831,13 @@ if(s+l<(p+1)->byte_start)term_write("...",3); /*:46*//*47:*/ #line 825 "cwebdir/common.w" -#line 418 "cwebdir/comm-w2c.ch" +#line 444 "cwebdir/comm-w2c.ch" static int web_strcmp(char*j,int j_len,char*k,int k_len) #line 829 "cwebdir/common.w" { -#line 430 "cwebdir/comm-w2c.ch" +#line 456 "cwebdir/comm-w2c.ch" char*j1= j+j_len,*k1= k+k_len; while(kllink= p):(par->rlink= p); /*:49*//*50:*/ #line 884 "cwebdir/common.w" -#line 473 "cwebdir/comm-w2c.ch" +#line 499 "cwebdir/comm-w2c.ch" static void extend_section_name(name_pointer p,char*first,char*last,int ispref) #line 891 "cwebdir/common.w" @@ -897,7 +903,7 @@ if(ispref)*(byte_ptr-1)= ' '; #line 912 "cwebdir/common.w" name_pointer -#line 484 "cwebdir/comm-w2c.ch" +#line 510 "cwebdir/comm-w2c.ch" section_lookup(char*first,char*last,int ispref) #line 917 "cwebdir/common.w" @@ -990,7 +996,7 @@ return r; /*:51*//*56:*/ #line 1020 "cwebdir/common.w" -#line 504 "cwebdir/comm-w2c.ch" +#line 530 "cwebdir/comm-w2c.ch" static int section_name_cmp(char**pfirst,int len,name_pointer r) #line 1025 "cwebdir/common.w" @@ -1025,7 +1031,7 @@ default:return c; #line 1095 "cwebdir/common.w" void -#line 524 "cwebdir/comm-w2c.ch" +#line 550 "cwebdir/comm-w2c.ch" err_print(const char*s) #line 1099 "cwebdir/common.w" { @@ -1060,7 +1066,7 @@ update_terminal;mark_error; /*:60*//*63:*/ #line 1150 "cwebdir/common.w" -#line 544 "cwebdir/comm-w2c.ch" +#line 570 "cwebdir/comm-w2c.ch" int wrap_up(void){ #line 1152 "cwebdir/common.w" putchar('\n'); @@ -1088,7 +1094,7 @@ else return(0); /*:63*//*66:*/ #line 1179 "cwebdir/common.w" void -#line 564 "cwebdir/comm-w2c.ch" +#line 590 "cwebdir/comm-w2c.ch" fatal(const char*s,const char*t) #line 1182 "cwebdir/common.w" { @@ -1100,7 +1106,7 @@ history= fatal_message;exit(wrap_up()); /*:66*//*67:*/ #line 1190 "cwebdir/common.w" void -#line 573 "cwebdir/comm-w2c.ch" +#line 599 "cwebdir/comm-w2c.ch" overflow(const char*t) #line 1193 "cwebdir/common.w" { @@ -1111,7 +1117,7 @@ printf("\n! Sorry, %s capacity exceeded",t);fatal("",""); /*:67*//*72:*/ #line 1254 "cwebdir/common.w" -#line 632 "cwebdir/comm-w2c.ch" +#line 658 "cwebdir/comm-w2c.ch" static void scan_args(void) #line 1257 "cwebdir/common.w" @@ -1125,40 +1131,40 @@ boolean flag_change; while(--argc> 0){ if((**(++argv)=='-'||**argv=='+')&&*(*argv+1))/*76:*/ -#line 657 "cwebdir/comm-w2c.ch" +#line 683 "cwebdir/comm-w2c.ch" { if(strcmp("-help",*argv)==0||strcmp("--help",*argv)==0) /*86:*/ -#line 772 "cwebdir/comm-w2c.ch" +#line 798 "cwebdir/comm-w2c.ch" usagehelp(program==ctangle?CTANGLEHELP:CWEAVEHELP,NULL); /*:86*/ -#line 660 "cwebdir/comm-w2c.ch" +#line 686 "cwebdir/comm-w2c.ch" ; if(strcmp("-version",*argv)==0||strcmp("--version",*argv)==0) /*87:*/ -#line 781 "cwebdir/comm-w2c.ch" +#line 807 "cwebdir/comm-w2c.ch" printversionandexit((program==ctangle?ctangle_banner:cweave_banner), "Silvio Levy and Donald E. Knuth",NULL,NULL); /*:87*/ -#line 662 "cwebdir/comm-w2c.ch" +#line 688 "cwebdir/comm-w2c.ch" ; #line 1346 "cwebdir/common.w" if(**argv=='-')flag_change= 0; -#line 668 "cwebdir/comm-w2c.ch" +#line 694 "cwebdir/comm-w2c.ch" else flag_change= 1; if(*(*argv+1)=='d') if(sscanf(*argv+2,"%u",&kpathsea_debug)!=1)/*77:*/ #line 1352 "cwebdir/common.w" { -#line 691 "cwebdir/comm-w2c.ch" +#line 717 "cwebdir/comm-w2c.ch" if(program==ctangle){ fprintf(stderr,"ctangle: Need one to three file arguments.\n"); usage("ctangle"); @@ -1170,11 +1176,11 @@ usage("cweave"); } /*:77*/ -#line 670 "cwebdir/comm-w2c.ch" +#line 696 "cwebdir/comm-w2c.ch" ; #line 1348 "cwebdir/common.w" for(dot_pos= *argv+1;*dot_pos> '\0';dot_pos++) -#line 676 "cwebdir/comm-w2c.ch" +#line 702 "cwebdir/comm-w2c.ch" flags[(unsigned char)*dot_pos]= flag_change; #line 1350 "cwebdir/common.w" } @@ -1274,7 +1280,7 @@ sprintf(scn_file_name,"%s.scn",*argv); found_out= 1; } -#line 657 "cwebdir/comm-w2c.ch" +#line 683 "cwebdir/comm-w2c.ch" /*:75*/ #line 1277 "cwebdir/common.w" @@ -1282,7 +1288,7 @@ else/*77:*/ #line 1352 "cwebdir/common.w" { -#line 691 "cwebdir/comm-w2c.ch" +#line 717 "cwebdir/comm-w2c.ch" if(program==ctangle){ fprintf(stderr,"ctangle: Need one to three file arguments.\n"); usage("ctangle"); @@ -1302,7 +1308,7 @@ if(!found_web)/*77:*/ #line 1352 "cwebdir/common.w" { -#line 691 "cwebdir/comm-w2c.ch" +#line 717 "cwebdir/comm-w2c.ch" if(program==ctangle){ fprintf(stderr,"ctangle: Need one to three file arguments.\n"); usage("ctangle"); @@ -1316,7 +1322,7 @@ usage("cweave"); /*:77*/ #line 1281 "cwebdir/common.w" ; -#line 642 "cwebdir/comm-w2c.ch" +#line 668 "cwebdir/comm-w2c.ch" if(found_change<=0)strcpy(change_file_name,DEV_NULL); #line 1283 "cwebdir/common.w" } diff --git a/Build/source/texk/web2c/cwebboot.hin b/Build/source/texk/web2c/cwebboot.hin index 1e9e1edbaa3..a8a03287963 100644 --- a/Build/source/texk/web2c/cwebboot.hin +++ b/Build/source/texk/web2c/cwebboot.hin @@ -1,49 +1,49 @@ /*84:*/ -#line 761 "cwebdir/comm-w2c.ch" +#line 787 "cwebdir/comm-w2c.ch" /* Prototypes for functions, either * declared in common.w and used in ctangle.w and cweave.w, or * used in common.w and declared in ctangle.w and cweave.w. */ /*35:*/ -#line 319 "cwebdir/comm-w2c.ch" +#line 345 "cwebdir/comm-w2c.ch" extern int names_match(name_pointer,const char*,int,char); #line 652 "cwebdir/common.w" /*:35*//*40:*/ -#line 377 "cwebdir/comm-w2c.ch" +#line 403 "cwebdir/comm-w2c.ch" extern void init_p(name_pointer p,char t); #line 705 "cwebdir/common.w" /*:40*//*48:*/ -#line 443 "cwebdir/comm-w2c.ch" +#line 469 "cwebdir/comm-w2c.ch" extern void init_node(name_pointer node); #line 854 "cwebdir/common.w" /*:48*//*59:*/ -#line 514 "cwebdir/comm-w2c.ch" +#line 540 "cwebdir/comm-w2c.ch" extern void err_print(const char*); #line 1094 "cwebdir/common.w" /*:59*//*62:*/ -#line 534 "cwebdir/comm-w2c.ch" +#line 560 "cwebdir/comm-w2c.ch" extern int wrap_up(void); extern void print_stats(void); #line 1143 "cwebdir/common.w" /*:62*//*65:*/ -#line 553 "cwebdir/comm-w2c.ch" +#line 579 "cwebdir/comm-w2c.ch" extern void fatal(const char*,const char*); extern void overflow(const char*); #line 1175 "cwebdir/common.w" /*:65*//*83:*/ -#line 742 "cwebdir/comm-w2c.ch" +#line 768 "cwebdir/comm-w2c.ch" extern void common_init(void); extern int input_ln(FILE*fp); @@ -56,9 +56,9 @@ extern void sprint_section_name(char*dest,name_pointer p); extern name_pointer section_lookup(char*first,char*last,int ispref); #line 1417 "cwebdir/common.w" -#line 757 "cwebdir/comm-w2c.ch" +#line 783 "cwebdir/comm-w2c.ch" /*:83*/ -#line 765 "cwebdir/comm-w2c.ch" +#line 791 "cwebdir/comm-w2c.ch" extern const char*versionstring; diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in index cb95a644beb..4915ac15207 100644 --- a/Build/source/texk/web2c/doc/Makefile.in +++ b/Build/source/texk/web2c/doc/Makefile.in @@ -90,6 +90,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ @@ -100,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ + $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ @@ -257,6 +259,9 @@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ FT2_CONFIG = @FT2_CONFIG@ +GMP_DEPEND = @GMP_DEPEND@ +GMP_INCLUDES = @GMP_INCLUDES@ +GMP_LIBS = @GMP_LIBS@ GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ @@ -305,6 +310,9 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MPFR_DEPEND = @MPFR_DEPEND@ +MPFR_INCLUDES = @MPFR_INCLUDES@ +MPFR_LIBS = @MPFR_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ OBJCXX = @OBJCXX@ diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in index 1aa34f9eadb..d7f16b355ba 100644 --- a/Build/source/texk/web2c/lib/Makefile.in +++ b/Build/source/texk/web2c/lib/Makefile.in @@ -91,6 +91,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ @@ -101,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ + $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ @@ -253,6 +255,9 @@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ FT2_CONFIG = @FT2_CONFIG@ +GMP_DEPEND = @GMP_DEPEND@ +GMP_INCLUDES = @GMP_INCLUDES@ +GMP_LIBS = @GMP_LIBS@ GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ @@ -301,6 +306,9 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MPFR_DEPEND = @MPFR_DEPEND@ +MPFR_INCLUDES = @MPFR_INCLUDES@ +MPFR_LIBS = @MPFR_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ OBJCXX = @OBJCXX@ diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index c0b729a0a07..423415a6246 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -105,6 +105,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ @@ -115,6 +116,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ + $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ @@ -234,6 +236,9 @@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ FT2_CONFIG = @FT2_CONFIG@ +GMP_DEPEND = @GMP_DEPEND@ +GMP_INCLUDES = @GMP_INCLUDES@ +GMP_LIBS = @GMP_LIBS@ GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ @@ -282,6 +287,9 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MPFR_DEPEND = @MPFR_DEPEND@ +MPFR_INCLUDES = @MPFR_INCLUDES@ +MPFR_LIBS = @MPFR_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ OBJCXX = @OBJCXX@ diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in index cb5ef6b5c83..0bdda56f512 100644 --- a/Build/source/texk/web2c/omegafonts/Makefile.in +++ b/Build/source/texk/web2c/omegafonts/Makefile.in @@ -98,6 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ @@ -108,6 +109,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ + $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ @@ -479,6 +481,9 @@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ FT2_CONFIG = @FT2_CONFIG@ +GMP_DEPEND = @GMP_DEPEND@ +GMP_INCLUDES = @GMP_INCLUDES@ +GMP_LIBS = @GMP_LIBS@ GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ @@ -527,6 +532,9 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MPFR_DEPEND = @MPFR_DEPEND@ +MPFR_INCLUDES = @MPFR_INCLUDES@ +MPFR_LIBS = @MPFR_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ OBJCXX = @OBJCXX@ diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in index 5a44a78181d..af7795eb19e 100644 --- a/Build/source/texk/web2c/otps/Makefile.in +++ b/Build/source/texk/web2c/otps/Makefile.in @@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ @@ -107,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ + $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ @@ -518,6 +520,9 @@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ FT2_CONFIG = @FT2_CONFIG@ +GMP_DEPEND = @GMP_DEPEND@ +GMP_INCLUDES = @GMP_INCLUDES@ +GMP_LIBS = @GMP_LIBS@ GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ @@ -566,6 +571,9 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MPFR_DEPEND = @MPFR_DEPEND@ +MPFR_INCLUDES = @MPFR_INCLUDES@ +MPFR_LIBS = @MPFR_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ OBJCXX = @OBJCXX@ diff --git a/Build/source/texk/web2c/otps/win32/Makefile.in b/Build/source/texk/web2c/otps/win32/Makefile.in index 1ae7eac19e2..592bef999de 100644 --- a/Build/source/texk/web2c/otps/win32/Makefile.in +++ b/Build/source/texk/web2c/otps/win32/Makefile.in @@ -91,6 +91,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ @@ -101,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ + $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ @@ -241,6 +243,9 @@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ FT2_CONFIG = @FT2_CONFIG@ +GMP_DEPEND = @GMP_DEPEND@ +GMP_INCLUDES = @GMP_INCLUDES@ +GMP_LIBS = @GMP_LIBS@ GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ @@ -289,6 +294,9 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MPFR_DEPEND = @MPFR_DEPEND@ +MPFR_INCLUDES = @MPFR_INCLUDES@ +MPFR_LIBS = @MPFR_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ OBJCXX = @OBJCXX@ diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog index 5be7cd95065..36b4304c111 100644 --- a/Build/source/texk/web2c/web2c/ChangeLog +++ b/Build/source/texk/web2c/web2c/ChangeLog @@ -1,3 +1,7 @@ +2014-06-16 Peter Breitenlohner + + * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. + 2014-01-15 Peter Breitenlohner * fixwrites.c: Recognize dumpname as string. diff --git a/Build/source/texk/web2c/web2c/Makefile.am b/Build/source/texk/web2c/web2c/Makefile.am index 93669d91c30..b882ae924e4 100644 --- a/Build/source/texk/web2c/web2c/Makefile.am +++ b/Build/source/texk/web2c/web2c/Makefile.am @@ -1,10 +1,8 @@ -## Makefile.am for the TeX Live subdirectory texk/web2c/web2c/ +## Makefile.am for the TeX Live subdirectory texk/web2c/web2c/. ## -## Copyright (C) 2009-2013 Peter Breitenlohner +## Copyright (C) 2009-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## -ACLOCAL_AMFLAGS = -I ../../../m4 - AM_CPPFLAGS = -I$(srcdir)/../.. AM_YFLAGS = -d -v AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in index bfa346a334b..40dd458e3f0 100644 --- a/Build/source/texk/web2c/web2c/Makefile.in +++ b/Build/source/texk/web2c/web2c/Makefile.in @@ -373,7 +373,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../../../m4 AM_CPPFLAGS = -I$(srcdir)/../.. AM_YFLAGS = -d -v AM_CFLAGS = $(WARNING_CFLAGS) diff --git a/Build/source/texk/web2c/web2c/configure b/Build/source/texk/web2c/web2c/configure index 1b47ff86d8f..60910e838e1 100755 --- a/Build/source/texk/web2c/web2c/configure +++ b/Build/source/texk/web2c/web2c/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Web2C Tools 2014. +# Generated by GNU Autoconf 2.69 for Web2C Tools 2015/dev. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Web2C Tools' PACKAGE_TARNAME='web2c-tools' -PACKAGE_VERSION='2014' -PACKAGE_STRING='Web2C Tools 2014' +PACKAGE_VERSION='2015/dev' +PACKAGE_STRING='Web2C Tools 2015/dev' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1325,7 +1325,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 Web2C Tools 2014 to adapt to many kinds of systems. +\`configure' configures Web2C Tools 2015/dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1395,7 +1395,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Web2C Tools 2014:";; + short | recursive ) echo "Configuration of Web2C Tools 2015/dev:";; esac cat <<\_ACEOF @@ -1513,7 +1513,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Web2C Tools configure 2014 +Web2C Tools configure 2015/dev generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2306,7 +2306,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 Web2C Tools $as_me 2014, which was +It was created by Web2C Tools $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7796,7 +7796,7 @@ fi # Define the identity of the package. PACKAGE='web2c-tools' - VERSION='2014' + VERSION='2015/dev' cat >>confdefs.h <<_ACEOF @@ -13905,7 +13905,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 Web2C Tools $as_me 2014, which was +This file was extended by Web2C Tools $as_me 2015/dev, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13971,7 +13971,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="\\ -Web2C Tools config.status 2014 +Web2C Tools config.status 2015/dev configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in index f789e13eb06..62f9d921fe1 100644 --- a/Build/source/texk/web2c/window/Makefile.in +++ b/Build/source/texk/web2c/window/Makefile.in @@ -91,6 +91,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ + $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \ @@ -101,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \ + $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \ @@ -251,6 +253,9 @@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ FT2_CONFIG = @FT2_CONFIG@ +GMP_DEPEND = @GMP_DEPEND@ +GMP_INCLUDES = @GMP_INCLUDES@ +GMP_LIBS = @GMP_LIBS@ GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@ GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@ GRAPHITE2_LIBS = @GRAPHITE2_LIBS@ @@ -299,6 +304,9 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MPFR_DEPEND = @MPFR_DEPEND@ +MPFR_INCLUDES = @MPFR_INCLUDES@ +MPFR_LIBS = @MPFR_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ OBJCXX = @OBJCXX@ -- cgit v1.2.3