texlive[73540] Build/source: configure fixes from Vincenzo Mantova,
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 21 16:14:18 CET 2025
Revision: 73540
https://tug.org/svn/texlive?view=revision&revision=73540
Author: karl
Date: 2025-01-21 16:14:18 +0100 (Tue, 21 Jan 2025)
Log Message:
-----------
configure fixes from Vincenzo Mantova, https://tug.org/pipermail/tlbuild/2024q2/005555.html
Modified Paths:
--------------
trunk/Build/source/configure
trunk/Build/source/libs/configure
trunk/Build/source/libs/mpfi/ChangeLog
trunk/Build/source/libs/mpfi/ac/withenable.ac
trunk/Build/source/libs/pplib/ChangeLog
trunk/Build/source/libs/pplib/ac/withenable.ac
trunk/Build/source/libs/xpdf/ChangeLog
trunk/Build/source/libs/xpdf/ac/xpdf.ac
trunk/Build/source/texk/bibtex-x/ChangeLog
trunk/Build/source/texk/bibtex-x/configure
trunk/Build/source/texk/bibtex-x/configure.ac
trunk/Build/source/texk/configure
trunk/Build/source/texk/ptexenc/ChangeLog
trunk/Build/source/texk/ptexenc/Makefile.am
trunk/Build/source/texk/ptexenc/Makefile.in
trunk/Build/source/texk/web2c/ChangeLog
trunk/Build/source/texk/web2c/Makefile.in
trunk/Build/source/texk/web2c/configure
trunk/Build/source/texk/web2c/configure.ac
trunk/Build/source/texk/web2c/uptexdir/ChangeLog
trunk/Build/source/texk/web2c/uptexdir/am/uptex.am
trunk/Build/source/utils/configure
Modified: trunk/Build/source/configure
===================================================================
--- trunk/Build/source/configure 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/configure 2025-01-21 15:14:18 UTC (rev 73540)
@@ -6995,6 +6995,10 @@
## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
## configure options and TL libraries required for pplib
+test "x$need_pplib" = xyes && {
+ need_zlib=yes
+}
+
## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
## configure options and TL libraries required for harfbuzz
Modified: trunk/Build/source/libs/configure
===================================================================
--- trunk/Build/source/libs/configure 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/libs/configure 2025-01-21 15:14:18 UTC (rev 73540)
@@ -6117,6 +6117,10 @@
## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
## configure options and TL libraries required for pplib
+test "x$need_pplib" = xyes && {
+ need_zlib=yes
+}
+
## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
## configure options and TL libraries required for harfbuzz
Modified: trunk/Build/source/libs/mpfi/ChangeLog
===================================================================
--- trunk/Build/source/libs/mpfi/ChangeLog 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/libs/mpfi/ChangeLog 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,3 +1,9 @@
+2025-01-21 Vincenzo Mantova <vlmantova at gmail.com>
+
+ * ac/withenable.ac (KPSE_WITH_LIB): dependencies are
+ [mpfr gmp], no third option. (KPSE_WITH_LIB fails to check.)
+ https://tug.org/pipermail/tlbuild/2024q2/005555.html
+
2024-12-10 Florian Schmaus <flo at geekplace.eu>
* configure.ac: remove MPFI_CONFIGS, not defined anywhere.
Modified: trunk/Build/source/libs/mpfi/ac/withenable.ac
===================================================================
--- trunk/Build/source/libs/mpfi/ac/withenable.ac 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/libs/mpfi/ac/withenable.ac 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,7 +1,7 @@
## libs/mpfi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/mpfi/
dnl
-dnl Copyright (C) 2022 Luigi Scarso <luigi.scarso at gmail.com>
+dnl Copyright 2022-2025 Luigi Scarso <luigi.scarso at gmail.com>
dnl You may freely use, modify and/or distribute this file.
dnl
## configure options and TL libraries required for mpfi
-KPSE_WITH_LIB([mpfi], [mpfr], [gmp])
+KPSE_WITH_LIB([mpfi], [mpfr gmp])
Modified: trunk/Build/source/libs/pplib/ChangeLog
===================================================================
--- trunk/Build/source/libs/pplib/ChangeLog 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/libs/pplib/ChangeLog 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,3 +1,8 @@
+2025-01-21 Vincenzo Mantova <vlmantova at gmail.com>
+
+ * ac/withenable.ac (KPSE_WITH_LIB): depend on zlib.
+ https://tug.org/pipermail/tlbuild/2024q2/005555.html
+
2023-12-23 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* pplib-src/src/util/README.md,
Modified: trunk/Build/source/libs/pplib/ac/withenable.ac
===================================================================
--- trunk/Build/source/libs/pplib/ac/withenable.ac 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/libs/pplib/ac/withenable.ac 2025-01-21 15:14:18 UTC (rev 73540)
@@ -4,4 +4,4 @@
dnl You may freely use, modify and/or distribute this file.
dnl
## configure options and TL libraries required for pplib
-KPSE_WITH_LIB([pplib], , [tree])
+KPSE_WITH_LIB([pplib], [zlib], [tree])
Modified: trunk/Build/source/libs/xpdf/ChangeLog
===================================================================
--- trunk/Build/source/libs/xpdf/ChangeLog 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/libs/xpdf/ChangeLog 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,3 +1,8 @@
+2025-01-21 Vincenzo Mantova <vlmantova at gmail.com>
+
+ * ac/xpdf.ac call gfxFont->isOk(), which is defined by vendor xpdf.
+ https://tug.org/pipermail/tlbuild/2024q2/005555.html
+
2022-04-24 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
* Import xpdf-4.04.
Modified: trunk/Build/source/libs/xpdf/ac/xpdf.ac
===================================================================
--- trunk/Build/source/libs/xpdf/ac/xpdf.ac 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/libs/xpdf/ac/xpdf.ac 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,7 +1,7 @@
dnl $Id$
## libs/xpdf/ac/xpdf.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
dnl
-dnl Copyright 2015-2020 Karl Berry <tex-live at tug.org>
+dnl Copyright 2015-2025 Karl Berry <tex-live at tug.org>
dnl Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
@@ -9,4 +9,4 @@
## TL sources)
KPSE_TRY_LIBXX([xpdf],
[#include <GfxFont.h>],
- [GfxFont *gfxFont; gfxFont->decRefCnt();])
+ [GfxFont *gfxFont; gfxFont->isOk();])
Modified: trunk/Build/source/texk/bibtex-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/bibtex-x/ChangeLog 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/bibtex-x/ChangeLog 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,3 +1,8 @@
+2025-01-21 Vincenzo Mantova <vlmantova at gmail.com>
+
+ * configure.ac (KPSE_KPATHSEA_FLAGS): call even if bibtexu is disabled.
+ https://tug.org/pipermail/tlbuild/2024q2/005555.html
+
2024-01-27 Karl Berry <karl at freefriends.org>
* tests/bibtexu-iscjk.test: sed -E is not portable to Solaris 10
Modified: trunk/Build/source/texk/bibtex-x/configure
===================================================================
--- trunk/Build/source/texk/bibtex-x/configure 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/bibtex-x/configure 2025-01-21 15:14:18 UTC (rev 73540)
@@ -20615,8 +20615,7 @@
fi
-if test "x$enable_bibtexu" != xno; then
- kpse_save_CPPFLAGS=$CPPFLAGS
+kpse_save_CPPFLAGS=$CPPFLAGS
kpse_save_LIBS=$LIBS
##tldbg _KPSE_INIT: Initialize TL infrastructure.
@@ -22366,7 +22365,9 @@
KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"
fi
-kpse_search_save_LIBS=$LIBS
+
+if test "x$enable_bibtexu" != xno; then
+ kpse_search_save_LIBS=$LIBS
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
printf %s "checking for library containing pthread_create... " >&6; }
if test ${ac_cv_search_pthread_create+y}
Modified: trunk/Build/source/texk/bibtex-x/configure.ac
===================================================================
--- trunk/Build/source/texk/bibtex-x/configure.ac 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/bibtex-x/configure.ac 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,7 +1,7 @@
dnl $Id$
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright 2015-2022 Karl Berry <tex-live at tug.org>
+dnl Copyright 2015-2025 Karl Berry <tex-live at tug.org>
dnl Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
dnl This file is free software; the copyright holder
@@ -30,10 +30,12 @@
AC_SEARCH_LIBS([pow], [m])
+dnl BibTeX8 needs kpathsea even if bibtexu is disabled.
+KPSE_KPATHSEA_FLAGS
+
if test "x$enable_bibtexu" != xno; then
dnl As of ICU 65.1, ICU requires -lpthread on x86_64-linux and, most
dnl likely, on other platforms. See upmendex/configure.ac for more info.
-KPSE_KPATHSEA_FLAGS
KPSE_SEARCH_LIBS([PTHREAD_LIB], [pthread_create], [pthread])
KPSE_ICU_FLAGS([icuio icui18n], [--ldflags-icuio])
fi
Modified: trunk/Build/source/texk/configure
===================================================================
--- trunk/Build/source/texk/configure 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/configure 2025-01-21 15:14:18 UTC (rev 73540)
@@ -6117,6 +6117,10 @@
## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
## configure options and TL libraries required for pplib
+test "x$need_pplib" = xyes && {
+ need_zlib=yes
+}
+
## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
## configure options and TL libraries required for harfbuzz
Modified: trunk/Build/source/texk/ptexenc/ChangeLog
===================================================================
--- trunk/Build/source/texk/ptexenc/ChangeLog 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/ptexenc/ChangeLog 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,3 +1,8 @@
+2025-01-21 Vincenzo Mantova <vlmantova at gmail.com>
+
+ * Makefile.am (nobase_include_HEADERS): include ptexenc/unicode-jp.h.
+ https://tug.org/pipermail/tlbuild/2024q2/005555.html
+
2024-10-20 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* unicode.c, ptexenc/unicode.h, tex8benc.h:
Modified: trunk/Build/source/texk/ptexenc/Makefile.am
===================================================================
--- trunk/Build/source/texk/ptexenc/Makefile.am 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/ptexenc/Makefile.am 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,5 +1,7 @@
+## $Id$
## Makefile.am for the TeX Live subdirectory texk/ptexenc/
##
+## Copyright (C) 2015-2025 Karl Berry <tex-live at tug.org>
## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
##
@@ -32,7 +34,8 @@
nobase_include_HEADERS = \
ptexenc/ptexenc.h \
- ptexenc/unicode.h
+ ptexenc/unicode.h \
+ ptexenc/unicode-jp.h
pkgconfigdir = ${libdir}/pkgconfig
Modified: trunk/Build/source/texk/ptexenc/Makefile.in
===================================================================
--- trunk/Build/source/texk/ptexenc/Makefile.in 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/ptexenc/Makefile.in 2025-01-21 15:14:18 UTC (rev 73540)
@@ -602,7 +602,8 @@
libptexenc_la_LIBADD = $(KPATHSEA_LIBS)
nobase_include_HEADERS = \
ptexenc/ptexenc.h \
- ptexenc/unicode.h
+ ptexenc/unicode.h \
+ ptexenc/unicode-jp.h
pkgconfigdir = ${libdir}/pkgconfig
pkgconfig_DATA = ptexenc.pc
Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/web2c/ChangeLog 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,3 +1,15 @@
+2025-01-21 Vincenzo Mantova <vlmantova at gmail.com>
+
+ * configure.ac (KPSE_HARFBUZZ_FLAGS): needed for lua[jit]hbtex,
+ not luatex[53].
+ (KPSE_CHECK_FRAMEWORK, KPSE_FONTCONFIG_FLAGS) [enable_xetex]:
+ make checks conditional.
+ https://tug.org/pipermail/tlbuild/2024q2/005555.html
+
+2025-01-19 Karl Berry <karl at freefriends.org>
+
+ * configure.ac (LIBS):
+
2025-01-01 Andreas Scherer <https://ascherer.github.io>
* ctangleboot.cin: CWEB 4.12.1 release.
Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/web2c/Makefile.in 2025-01-21 15:14:18 UTC (rev 73540)
@@ -126,11 +126,11 @@
$(am__append_6) $(am__append_16) $(am__append_25) \
$(am__append_34) $(am__append_42) $(am__append_55) \
$(am__append_56) $(am__append_58) $(am__append_62) \
- $(am__EXEEXT_46) $(am__append_68) $(am__append_71) \
- $(am__append_76) $(am__append_81) $(am__append_84) \
- $(am__append_105) $(am__append_106) $(am__append_107) \
- $(am__append_108) $(am__append_110) $(am__append_118) \
- $(am__append_120) $(am__append_122) $(am__append_145) \
+ $(am__EXEEXT_46) $(am__append_69) $(am__append_72) \
+ $(am__append_77) $(am__append_82) $(am__append_85) \
+ $(am__append_106) $(am__append_107) $(am__append_108) \
+ $(am__append_109) $(am__append_111) $(am__append_119) \
+ $(am__append_121) $(am__append_123) $(am__append_146) \
libmd5/md5.test
@WEB_TRUE at am__append_1 = $(web_programs)
@WEB_TRUE at am__append_2 = $(web_tests)
@@ -203,61 +203,65 @@
@PWEB_TRUE at am__append_65 = $(pweb_tests)
@UPTEX_TRUE at am__append_66 = uptex
@UPWEB_TRUE at am__append_67 = $(upweb_programs)
- at UPTEX_TRUE@am__append_68 = $(uptex_tests)
- at UPTEX_TRUE@am__append_69 = uptrip.diffs
- at UPTEX_TRUE@am__append_70 = uptrip-clean
- at UPWEB_TRUE@am__append_71 = $(upweb_tests)
- at EUPTEX_TRUE@am__append_72 = euptex
- at EUPTEX_TRUE@@UPTEX_FALSE at am__append_73 = euptex$(EXEEXT):uptex
- at EUPTEX_TRUE@am__append_74 = euptex$(EXEEXT):eptex
- at EUPTEX_TRUE@@PTEX_FALSE at am__append_75 = euptex$(EXEEXT):ptex
- at EUPTEX_TRUE@am__append_76 = $(euptex_tests)
- at EUPTEX_TRUE@am__append_77 = euptrip.diffs
- at EUPTEX_TRUE@am__append_78 = euptrip-clean
- at HITEX_TRUE@am__append_79 = hitex hishrink histretch
- at HITEX_TRUE@am__append_80 = himktables
- at HITEX_TRUE@am__append_81 = $(hitex_tests)
- at MINGW32_TRUE@am__append_82 = \
+ at UPWEB_TRUE@am__append_68 = upbibtex$(EXEEXT):pbibtex \
+ at UPWEB_TRUE@ updvitype$(EXEEXT):pdvitype \
+ at UPWEB_TRUE@ uppltotf$(EXEEXT):ppltotf \
+ at UPWEB_TRUE@ uptftopl$(EXEEXT):ptftopl
+ at UPTEX_TRUE@am__append_69 = $(uptex_tests)
+ at UPTEX_TRUE@am__append_70 = uptrip.diffs
+ at UPTEX_TRUE@am__append_71 = uptrip-clean
+ at UPWEB_TRUE@am__append_72 = $(upweb_tests)
+ at EUPTEX_TRUE@am__append_73 = euptex
+ at EUPTEX_TRUE@@UPTEX_FALSE at am__append_74 = euptex$(EXEEXT):uptex
+ at EUPTEX_TRUE@am__append_75 = euptex$(EXEEXT):eptex
+ at EUPTEX_TRUE@@PTEX_FALSE at am__append_76 = euptex$(EXEEXT):ptex
+ at EUPTEX_TRUE@am__append_77 = $(euptex_tests)
+ at EUPTEX_TRUE@am__append_78 = euptrip.diffs
+ at EUPTEX_TRUE@am__append_79 = euptrip-clean
+ at HITEX_TRUE@am__append_80 = hitex hishrink histretch
+ at HITEX_TRUE@am__append_81 = himktables
+ at HITEX_TRUE@am__append_82 = $(hitex_tests)
+ at MINGW32_TRUE@am__append_83 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
- at PDFTEX_TRUE@am__append_83 = pdftex ttf2afm pdftosrc
- at PDFTEX_TRUE@am__append_84 = $(pdftex_tests) $(ttf2afm_tests) \
+ at PDFTEX_TRUE@am__append_84 = pdftex ttf2afm pdftosrc
+ at PDFTEX_TRUE@am__append_85 = $(pdftex_tests) $(ttf2afm_tests) \
@PDFTEX_TRUE@ $(pdftosrc_tests)
- at LUATEX_TRUE@am__append_85 = luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_86 = call_luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_87 = install-luatex-links
- at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = uninstall-luatex-links
- at LUATEX_TRUE@@WIN32_FALSE at am__append_89 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
- at LUAHBTEX_TRUE@am__append_90 = luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_91 = call_luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_92 = install-luahbtex-links
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = uninstall-luahbtex-links
+ at LUATEX_TRUE@am__append_86 = luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_87 = call_luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = install-luatex-links
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_89 = uninstall-luatex-links
+ at LUATEX_TRUE@@WIN32_FALSE at am__append_90 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+ at LUAHBTEX_TRUE@am__append_91 = luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_92 = call_luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = install-luahbtex-links
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_94 = uninstall-luahbtex-links
# keep texlua[c] as links to luatex unless luatex is not installed.
- at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_94 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
- at LUAJITTEX_TRUE@am__append_95 = luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_96 = call_luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_97 = install-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = uninstall-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_99 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
- at LUAJITHBTEX_TRUE@am__append_100 = luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_101 = call_luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_102 = install-luajithbtex-links
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = uninstall-luajithbtex-links
+ at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_95 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+ at LUAJITTEX_TRUE@am__append_96 = luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_97 = call_luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = install-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_99 = uninstall-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_100 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+ at LUAJITHBTEX_TRUE@am__append_101 = luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_102 = call_luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = install-luajithbtex-links
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_104 = uninstall-luajithbtex-links
# keep texluajit[c] as links to luajittex unless luajittex is not installed.
- at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_104 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
- at LUATEX_TRUE@am__append_105 = $(luatex_tests)
- at LUAHBTEX_TRUE@am__append_106 = $(luahbtex_tests)
- at LUAJITTEX_TRUE@am__append_107 = $(luajittex_tests)
- at LUAJITHBTEX_TRUE@am__append_108 = $(luajithbtex_tests)
- at TEXPROF_TRUE@am__append_109 = texprof texprofile
- at TEXPROF_TRUE@am__append_110 = $(texprof_tests)
- at XETEX_TRUE@am__append_111 = xetex
- at XETEX_MACOSX_TRUE@am__append_112 = -DXETEX_MAC
- at XETEX_MACOSX_TRUE@am__append_113 = -std=c++11
- at XETEX_MACOSX_FALSE@am__append_114 = $(FONTCONFIG_INCLUDES)
- at XETEX_MACOSX_FALSE@am__append_115 = $(FONTCONFIG_LIBS)
- at XETEX_MACOSX_TRUE@am__append_116 = \
+ at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_105 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+ at LUATEX_TRUE@am__append_106 = $(luatex_tests)
+ at LUAHBTEX_TRUE@am__append_107 = $(luahbtex_tests)
+ at LUAJITTEX_TRUE@am__append_108 = $(luajittex_tests)
+ at LUAJITHBTEX_TRUE@am__append_109 = $(luajithbtex_tests)
+ at TEXPROF_TRUE@am__append_110 = texprof texprofile
+ at TEXPROF_TRUE@am__append_111 = $(texprof_tests)
+ at XETEX_TRUE@am__append_112 = xetex
+ at XETEX_MACOSX_TRUE@am__append_113 = -DXETEX_MAC
+ at XETEX_MACOSX_TRUE@am__append_114 = -std=c++11
+ at XETEX_MACOSX_FALSE@am__append_115 = $(FONTCONFIG_INCLUDES)
+ at XETEX_MACOSX_FALSE@am__append_116 = $(FONTCONFIG_LIBS)
+ at XETEX_MACOSX_TRUE@am__append_117 = \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.mm \
@@ -264,73 +268,73 @@
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
- at XETEX_MACOSX_FALSE@am__append_117 = \
+ at XETEX_MACOSX_FALSE@am__append_118 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h
- at XETEX_TRUE@am__append_118 = $(xetex_tests)
- at OTANGLE_TRUE@am__append_119 = $(omegaware_programs)
- at OTANGLE_TRUE@am__append_120 = $(OTANGLE_tests) $(OMFONTS_tests)
- at ALEPH_TRUE@am__append_121 = aleph
- at ALEPH_TRUE@am__append_122 = $(aleph_tests)
- at SYNCTEX_TRUE@am__append_123 = synctex
- at SYNCTEX_TRUE@am__append_124 = $(LTLIBSYNCTEX)
- at SYNCTEX_TRUE@am__append_125 = $(LIBSYNCTEX)
- at MINGW32_TRUE@am__append_126 = $(KPATHSEA_INCLUDES)
- at MINGW32_TRUE@am__append_127 = -lshlwapi $(KPATHSEA_LIBS)
- at MINGW32_TRUE@am__append_128 = -lshlwapi
- at TEX_SYNCTEX_TRUE@am__append_129 = -I$(srcdir)/synctexdir \
+ at XETEX_TRUE@am__append_119 = $(xetex_tests)
+ at OTANGLE_TRUE@am__append_120 = $(omegaware_programs)
+ at OTANGLE_TRUE@am__append_121 = $(OTANGLE_tests) $(OMFONTS_tests)
+ at ALEPH_TRUE@am__append_122 = aleph
+ at ALEPH_TRUE@am__append_123 = $(aleph_tests)
+ at SYNCTEX_TRUE@am__append_124 = synctex
+ at SYNCTEX_TRUE@am__append_125 = $(LTLIBSYNCTEX)
+ at SYNCTEX_TRUE@am__append_126 = $(LIBSYNCTEX)
+ at MINGW32_TRUE@am__append_127 = $(KPATHSEA_INCLUDES)
+ at MINGW32_TRUE@am__append_128 = -lshlwapi $(KPATHSEA_LIBS)
+ at MINGW32_TRUE@am__append_129 = -lshlwapi
+ at TEX_SYNCTEX_TRUE@am__append_130 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
- at TEX_SYNCTEX_TRUE@am__append_130 = $(ZLIB_LIBS)
- at TEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_DEPEND)
- at TEX_SYNCTEX_TRUE@am__append_132 = \
+ at TEX_SYNCTEX_TRUE@am__append_131 = $(ZLIB_LIBS)
+ at TEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_DEPEND)
+ at TEX_SYNCTEX_TRUE@am__append_133 = \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
- at ETEX_SYNCTEX_TRUE@am__append_133 = -I$(srcdir)/synctexdir \
+ at ETEX_SYNCTEX_TRUE@am__append_134 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
- at ETEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_LIBS)
- at ETEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_DEPEND)
- at ETEX_SYNCTEX_TRUE@am__append_136 = \
+ at ETEX_SYNCTEX_TRUE@am__append_135 = $(ZLIB_LIBS)
+ at ETEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_DEPEND)
+ at ETEX_SYNCTEX_TRUE@am__append_137 = \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
- at EUPTEX_SYNCTEX_TRUE@am__append_137 = -I$(srcdir)/synctexdir \
+ at EUPTEX_SYNCTEX_TRUE@am__append_138 = -I$(srcdir)/synctexdir \
@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
- at EUPTEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_LIBS)
- at EUPTEX_SYNCTEX_TRUE@am__append_139 = $(ZLIB_DEPEND)
- at EUPTEX_SYNCTEX_TRUE@am__append_140 = \
+ at EUPTEX_SYNCTEX_TRUE@am__append_139 = $(ZLIB_LIBS)
+ at EUPTEX_SYNCTEX_TRUE@am__append_140 = $(ZLIB_DEPEND)
+ at EUPTEX_SYNCTEX_TRUE@am__append_141 = \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h
- at PDFTEX_SYNCTEX_TRUE@am__append_141 = -I$(srcdir)/synctexdir \
+ at PDFTEX_SYNCTEX_TRUE@am__append_142 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
- at PDFTEX_SYNCTEX_TRUE@am__append_142 = \
+ at PDFTEX_SYNCTEX_TRUE@am__append_143 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
- at XETEX_SYNCTEX_TRUE@am__append_143 = -I$(srcdir)/synctexdir \
+ at XETEX_SYNCTEX_TRUE@am__append_144 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
- at XETEX_SYNCTEX_TRUE@am__append_144 = \
+ at XETEX_SYNCTEX_TRUE@am__append_145 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h
- at SYNCTEX_TRUE@am__append_145 = $(synctex_tests)
+ at SYNCTEX_TRUE@am__append_146 = $(synctex_tests)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -3013,7 +3017,7 @@
NMEDIT = @NMEDIT@
OBJCXX = @OBJCXX@
OBJCXXDEPMODE = @OBJCXXDEPMODE@
-OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_113)
+OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_114)
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTANGLE = @OTANGLE@
@@ -3162,8 +3166,8 @@
libluaharfbuzz.a libluajitharfbuzz.a libxetex.a libsynctex.a \
libmd5.a
EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_125)
-lib_LTLIBRARIES = $(am__append_124)
+lib_LIBRARIES = $(am__append_126)
+lib_LTLIBRARIES = $(am__append_125)
dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
nodist_man_MANS =
TEST_EXTENSIONS = .pl .test
@@ -3712,25 +3716,24 @@
CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_27) \
$(am__append_36) $(am__append_44) $(am__append_60) \
- $(am__append_64) $(am__append_70) $(am__append_78)
+ $(am__append_64) $(am__append_71) $(am__append_79)
TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_26) \
$(am__append_35) $(am__append_43) $(am__append_59) \
- $(am__append_63) $(am__append_69) $(am__append_77)
+ $(am__append_63) $(am__append_70) $(am__append_78)
bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
$(am__append_24) $(am__append_33) $(am__append_41) \
- $(am__append_49) $(am__append_54) upbibtex$(EXEEXT):pbibtex \
- updvitype$(EXEEXT):pdvitype uppltotf$(EXEEXT):ppltotf \
- uptftopl$(EXEEXT):ptftopl $(am__append_73) $(am__append_74) \
- $(am__append_75) $(am__append_89) $(am__append_94) \
- $(am__append_99) $(am__append_104)
+ $(am__append_49) $(am__append_54) $(am__append_68) \
+ $(am__append_74) $(am__append_75) $(am__append_76) \
+ $(am__append_90) $(am__append_95) $(am__append_100) \
+ $(am__append_105)
install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
$(am__append_39) $(am__append_47) $(am__append_52) \
- $(am__append_87) $(am__append_92) $(am__append_97) \
- $(am__append_102)
+ $(am__append_88) $(am__append_93) $(am__append_98) \
+ $(am__append_103)
uninstall_exe_links = $(am__append_13) $(am__append_23) \
$(am__append_32) $(am__append_40) $(am__append_48) \
- $(am__append_53) $(am__append_88) $(am__append_93) \
- $(am__append_98) $(am__append_103)
+ $(am__append_53) $(am__append_89) $(am__append_94) \
+ $(am__append_99) $(am__append_104)
NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \
cwebdir/cweave.trs cwebdir/ctwill.log cwebdir/ctwill.trs \
cwebdir/refsort.log cwebdir/refsort.trs cwebdir/twinx.log \
@@ -3907,18 +3910,18 @@
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
nodist_initex_SOURCES = callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_129)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_130)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_130)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_131)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_132)
+dist_tex_SOURCES = texextra.c $(am__append_133)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_131)
+tex_prereq = texd.h $(am__append_132)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -4418,10 +4421,10 @@
mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
mplibdir/mpmathinterval.w mplibdir/mpmathdecimal.w \
mplibdir/mpmathdouble.w mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_133)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_134)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_134)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_135)
etex_DEPENDENCIES = $(ZLIB_DEPEND)
# e-TeX C sources
@@ -4428,11 +4431,11 @@
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
- etexdir/etex_version.h $(am__append_136)
+ etexdir/etex_version.h $(am__append_137)
# We must create etexd.h and etexdir/etex_version.h before building the
# etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_135)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_136)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -4578,11 +4581,11 @@
uptexdir/newjfm.test uptexdir/uparse.test uptexdir/gkhuge.test \
uptexdir/gk256.test
euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
- -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_137)
+ -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_138)
# With --enable-ipc, e-upTeX may need to link with -lsocket.
euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_138)
+ $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_139)
euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
# e-upTeX C sources
@@ -4589,12 +4592,12 @@
euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
- $(am__append_140)
+ $(am__append_141)
# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
euptex_prereq = euptexd.h etexdir/etex_version.h \
uptexdir/ptex_version.h euptexdir/eptex_version.h \
- uptexdir/uptex_version.h $(am__append_139)
+ uptexdir/uptex_version.h $(am__append_140)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4718,7 +4721,7 @@
pdftexdir/writejbig2.c pdftexdir/writejpg.c \
pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
- $(am__append_82)
+ $(am__append_83)
@MINGW32_TRUE at REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -4734,7 +4737,7 @@
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_141)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_142)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -4747,7 +4750,7 @@
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
- $(am__append_142)
+ $(am__append_143)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -5455,18 +5458,18 @@
xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
$(GRAPHITE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) \
- $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_112) \
- $(am__append_114)
+ $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_113) \
+ $(am__append_115)
xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
$(ICU_LIBS) $(ICU_LIBS_EXTRA) $(TECKIT_LIBS) $(LIBPNG_LIBS) \
$(FREETYPE2_LIBS) $(PPLIB_LIBS) $(ZLIB_LIBS) libmd5.a \
- $(am__append_115)
+ $(am__append_116)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
$(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) \
$(PPLIB_DEPEND) libmd5.a
@XETEX_MACOSX_TRUE at xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_143)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_144)
xetex_CFLAGS = $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -5475,7 +5478,7 @@
nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
xetexdir/etex_version.h xetexdir/xetex_version.h \
- $(am__append_144)
+ $(am__append_145)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \
@@ -5509,7 +5512,7 @@
xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \
xetexdir/image/mfileio.h xetexdir/image/numbers.c \
xetexdir/image/numbers.h xetexdir/image/pngimage.c \
- xetexdir/image/pngimage.h $(am__append_116) $(am__append_117)
+ xetexdir/image/pngimage.h $(am__append_117) $(am__append_118)
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -5618,13 +5621,13 @@
synctex_SOURCES = \
synctexdir/synctex_main.c
-synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_126)
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_127)
+synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_127)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_128)
libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
-libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_128)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_129)
libsynctex_la_SOURCES = \
synctexdir/synctex_parser.c \
synctexdir/synctex_parser_local.h \
Modified: trunk/Build/source/texk/web2c/configure
===================================================================
--- trunk/Build/source/texk/web2c/configure 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/web2c/configure 2025-01-21 15:14:18 UTC (rev 73540)
@@ -24331,7 +24331,8 @@
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Mac OS X ApplicationServices framework" >&5
+if test "x$enable_xetex" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Mac OS X ApplicationServices framework" >&5
printf %s "checking for Mac OS X ApplicationServices framework... " >&6; }
if test ${kpse_cv_have_ApplicationServices+y}
then :
@@ -24367,7 +24368,7 @@
fi
-if test -n "$ac_tool_prefix"; then
+ if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -24542,7 +24543,7 @@
-if test "x$kpse_cv_have_ApplicationServices:$kpse_cv_have_fontconfig" = xno:no
+ if test "x$kpse_cv_have_ApplicationServices:$kpse_cv_have_fontconfig" = xno:no
then :
if test "x$enable_xetex" = xyes
then :
@@ -24557,6 +24558,7 @@
fi
fi
+fi
if test "x$kpse_cv_have_ApplicationServices" = xyes; then
XETEX_MACOSX_TRUE=
XETEX_MACOSX_FALSE='#'
@@ -29710,9 +29712,10 @@
fi
-# LuaTeX and XeTeX need harfbuzz.
+# XeTeX and lua[jit]hbtex need harfbuzz, but not regular luatex[53].
if test "x$enable_xetex" = xyes \
- || test "x$enable_luatex" = xyes || test "x$enable_luatex53" = xyes; then
+ || test "x$enable_luahbtex" = xyes \
+ || test "x$enable_luajithbtex" = xyes; then
##tldbg _KPSE_LIB_FLAGS: Setup graphite2 (-lgraphite2) flags.
echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=graphite2, libname=graphite2, options=, tlincl=-IBLD/libs/graphite2/include -DGRAPHITE2_STATIC, tllib=BLD/libs/graphite2/libgraphite2.a, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/graphite2/include/graphite2/Font.h.' >&5
##tldbg _KPSE_LIB_FLAGS_TL: graphite2 (graphite2) .
Modified: trunk/Build/source/texk/web2c/configure.ac
===================================================================
--- trunk/Build/source/texk/web2c/configure.ac 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/web2c/configure.ac 2025-01-21 15:14:18 UTC (rev 73540)
@@ -156,11 +156,15 @@
AC_SUBST([lua_socketlibs])
AC_SUBST([ipc_socketlibs])
-KPSE_CHECK_FRAMEWORK([ApplicationServices], [CTFontRef font])
-KPSE_FONTCONFIG_FLAGS
-AS_IF([test "x$kpse_cv_have_ApplicationServices:$kpse_cv_have_fontconfig" = xno:no],
- [WEB2C_DISABLE([xetex], [neither ApplicationServices framework nor fontconfig library])])
-AM_CONDITIONAL([XETEX_MACOSX], [test "x$kpse_cv_have_ApplicationServices" = xyes])
+if test "x$enable_xetex" = xyes; then
+ KPSE_CHECK_FRAMEWORK([ApplicationServices], [CTFontRef font])
+ KPSE_FONTCONFIG_FLAGS
+ AS_IF([test "x$kpse_cv_have_ApplicationServices:$kpse_cv_have_fontconfig" = xno:no],
+ [WEB2C_DISABLE([xetex],
+ [neither ApplicationServices framework nor fontconfig library])])
+fi
+AM_CONDITIONAL([XETEX_MACOSX],
+ [test "x$kpse_cv_have_ApplicationServices" = xyes])
dnl Generate *TEX and ALEPH conditionals.
m4_foreach([Kpse_Prog], [kpse_tex_progs],
@@ -279,9 +283,10 @@
KPSE_ZZIPLIB_FLAGS
KPSE_TECKIT_FLAGS
-# LuaTeX and XeTeX need harfbuzz.
+# XeTeX and lua[jit]hbtex need harfbuzz, but not regular luatex[53].
if test "x$enable_xetex" = xyes \
- || test "x$enable_luatex" = xyes || test "x$enable_luatex53" = xyes; then
+ || test "x$enable_luahbtex" = xyes \
+ || test "x$enable_luajithbtex" = xyes; then
KPSE_HARFBUZZ_FLAGS
fi # end xetex/luatex for harfbuzz
Modified: trunk/Build/source/texk/web2c/uptexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/web2c/uptexdir/ChangeLog 2025-01-21 15:14:18 UTC (rev 73540)
@@ -1,3 +1,8 @@
+2025-01-21 Vincenzo Mantova <vlmantova at gmail.com>
+
+ * configure.ac (bin_links) [UPWEB]: make up...->p... links conditional.
+ https://tug.org/pipermail/tlbuild/2024q2/005555.html
+
2025-01-02 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* kanji.c, uptex-m.ch:
Modified: trunk/Build/source/texk/web2c/uptexdir/am/uptex.am
===================================================================
--- trunk/Build/source/texk/web2c/uptexdir/am/uptex.am 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/texk/web2c/uptexdir/am/uptex.am 2025-01-21 15:14:18 UTC (rev 73540)
@@ -104,7 +104,9 @@
upbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
$(tie_m) bibtex.web bibtex.ch
EXTRA_DIST += uptexdir/upbibtex.ch
+if UPWEB
bin_links += upbibtex$(EXEEXT):pbibtex
+endif # UPWEB
## upDVItype
##
@@ -122,7 +124,9 @@
updvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
$(tie_m) dvitype.web dvitype.ch
EXTRA_DIST += uptexdir/updvitype.ch
+if UPWEB
bin_links += updvitype$(EXEEXT):pdvitype
+endif # UPWEB
## upPLtoTF
##
@@ -140,7 +144,9 @@
uppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
$(tie_m) pltotf.web pltotf.ch
EXTRA_DIST += uptexdir/uppltotf.ch
+if UPWEB
bin_links += uppltotf$(EXEEXT):ppltotf
+endif # UPWEB
## upTFtoPL
##
@@ -158,7 +164,9 @@
uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
$(tie_m) tftopl.web tftopl.ch
EXTRA_DIST += uptexdir/uptftopl.ch
+if UPWEB
bin_links += uptftopl$(EXEEXT):ptftopl
+endif # UPWEB
##
EXTRA_DIST += \
Modified: trunk/Build/source/utils/configure
===================================================================
--- trunk/Build/source/utils/configure 2025-01-21 00:41:39 UTC (rev 73539)
+++ trunk/Build/source/utils/configure 2025-01-21 15:14:18 UTC (rev 73540)
@@ -6117,6 +6117,10 @@
## libs/pplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pplib/
## configure options and TL libraries required for pplib
+test "x$need_pplib" = xyes && {
+ need_zlib=yes
+}
+
## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
## configure options and TL libraries required for harfbuzz
More information about the tex-live-commits
mailing list.