summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog21
-rw-r--r--Build/source/m4/kpse-pkgs.m47
-rw-r--r--Build/source/m4/kpse-poppler-flags.m434
-rw-r--r--Build/source/m4/kpse-pplib-flags.m430
-rw-r--r--Build/source/m4/kpse-setup.m44
-rw-r--r--Build/source/m4/kpse-xpdf-flags.m448
6 files changed, 95 insertions, 49 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 2fd00ef866e..a34db9d835f 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,24 @@
+2021-02-09 Karl Berry <karl@freefriends.org>
+
+ * kpse-setup.m4 (_KPSE_RECURSE): add debug if configure not found.
+
+2021-02-07 Karl Berry <karl@freefriends.org>
+
+ * kpse-pkgs.m4 (KPSE_UTILS_PKGS): new utils program xml2pmx.
+
+2020-05-14 Karl Berry <karl@freefriends.org>
+
+ * kpse-pkgs.m4 (KPSE_LIBS_PKGS),
+ (KPSE_POPPLER_SYSTEM_FLAGS): remove poppler.
+ * kpse-poppler-flags.m4: remove file.
+ * kpse-xpdf-flags.m4 (KPSE_XPDF_OPTIONS): no more system option.
+ (KPSE_XPDF_SYSTEM_FLAGS): no-op.
+
+2020-04-21 Luigi Scarso <luigi.scarso@gmail.com>
+
+ * kpse-pkgs.m4 (KPSE_LIBS_PKGS): add pplib.
+ * Add kpse-pplib-flags.m4.
+
2020-03-14 Karl Berry <karl@freefriends.org>
* kpse-setup.m4 (KPSE_SETUP): make that powerpc*, not powerpc-*.
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 8ed6ca3e65c..5cba46b6bb1 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -1,6 +1,6 @@
# $Id$
# Private Autoconf macros for the TeX Live (TL) tree.
-# Copyright 2016-2019 Karl Berry <tex-live@tug.org>
+# Copyright 2016-2020 Karl Berry <tex-live@tug.org>
# Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -25,13 +25,13 @@
# Each library must precede required other libraries (if any).
AC_DEFUN([KPSE_LIBS_PKGS], [dnl
m4_define([kpse_libs_pkgs], [dnl
+pplib
harfbuzz
icu
teckit
graphite2
zziplib
xpdf
-poppler
mpfr
gmp
cairo
@@ -58,6 +58,7 @@ AC_REQUIRE([KPSE_LIBS_PREPARE])[]dnl
AC_REQUIRE([KPSE_KPATHSEA_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_PTEXENC_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_ZLIB_SYSTEM_FLAGS])[]dnl
+AC_REQUIRE([KPSE_PPLIB_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_LIBPAPER_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_LIBPNG_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl
@@ -66,7 +67,6 @@ AC_REQUIRE([KPSE_PIXMAN_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_CAIRO_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_GMP_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_MPFR_SYSTEM_FLAGS])[]dnl
-AC_REQUIRE([KPSE_POPPLER_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_XPDF_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_ZZIPLIB_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_GRAPHITE2_SYSTEM_FLAGS])[]dnl
@@ -92,6 +92,7 @@ texdoctk
tpic2pdftex
vlna
xindy
+xml2pmx
xpdfopen
])]) # KPSE_UTILS_PKGS
diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4
deleted file mode 100644
index 812d8c7d028..00000000000
--- a/Build/source/m4/kpse-poppler-flags.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
-#
-# This file is free software; the copyright holder
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# KPSE_POPPLER_FLAGS
-# ------------------
-# Provide the configure option '--with-system-poppler' (if in the TL tree).
-#
-# Set the make variables POPPLER_INCLUDES and POPPLER_LIBS to the CPPFLAGS and
-# LIBS required for the `-lpoppler' library in libs/poppler/ of the TL tree.
-AC_DEFUN([KPSE_POPPLER_FLAGS], [dnl
-AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
-AC_REQUIRE([KPSE_ZLIB_FLAGS])[]dnl
-_KPSE_LIB_FLAGS([poppler], [poppler], [],
- [-IBLD/libs/poppler/include],
- [BLD/libs/poppler/libpoppler.a], [],
- [], [${top_builddir}/../../libs/poppler/include/Stream.h])[]dnl
-test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
-]) # KPSE_POPPLER_FLAGS
-
-# KPSE_POPPLER_OPTIONS([WITH-SYSTEM])
-# -----------------------------------
-AC_DEFUN([KPSE_POPPLER_OPTIONS], [_KPSE_LIB_OPTIONS([poppler], [$1], [pkg-config])])
-
-# KPSE_POPPLER_SYSTEM_FLAGS
-# -------------------------
-AC_DEFUN([KPSE_POPPLER_SYSTEM_FLAGS], [dnl
-_KPSE_PKG_CONFIG_FLAGS([poppler], [poppler], [0.30])
-POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-POPPLER_INCLUDES="$POPPLER_VERSION $POPPLER_INCLUDES"
-]) # KPSE_POPPLER_SYSTEM_FLAGS
diff --git a/Build/source/m4/kpse-pplib-flags.m4 b/Build/source/m4/kpse-pplib-flags.m4
new file mode 100644
index 00000000000..e6674542261
--- /dev/null
+++ b/Build/source/m4/kpse-pplib-flags.m4
@@ -0,0 +1,30 @@
+# Public macros for the TeX Live (TL) tree.
+# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 0
+
+# KPSE_PPLIB_FLAGS
+# -----------------
+# Provide the configure options '--with-system-PPLIB' (if in the TL tree).
+#
+# Set the make variables PPLIB_INCLUDES and PPLIB_LIBS to the CPPFLAGS and
+# LIBS required for the `-lpplib' library in libs/pplib/ of the TL tree.
+AC_DEFUN([KPSE_PPLIB_FLAGS], [dnl
+AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
+_KPSE_LIB_FLAGS([pplib], [pplib], [tree],
+ [-IBLD/libs/pplib/include], [BLD/libs/pplib/libpplib.a], [],
+ [], [${top_builddir}/../../libs/pplib/include/pplib.h])[]dnl
+]) # KPSE_PPLIB_FLAGS
+
+# KPSE_PPLIB_OPTIONS([WITH-SYSTEM])
+# ----------------------------------
+AC_DEFUN([KPSE_PPLIB_OPTIONS], [_KPSE_LIB_OPTIONS([PPLIB], [$1], [pkg-config])])
+
+# KPSE_PPLIB_SYSTEM_FLAGS
+# ------------------------
+AC_DEFUN([KPSE_PPLIB_SYSTEM_FLAGS], [dnl
+_KPSE_PKG_CONFIG_FLAGS([PPLIB], [PPLIB])])
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 1c04d6d3665..8da68c573a0 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -1,6 +1,6 @@
# $Id$
# Private macros for the TeX Live (TL) tree.
-# Copyright 2017-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2017-2021 Karl Berry <tex-live@tug.org>
# Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
@@ -283,6 +283,8 @@ m4_ifdef([have_]Kpse_pkg, [dnl
if test -x $srcdir/$4Kpse_Pkg/configure; then
$3 && Kpse_add([MAKE_SUBDIRS])
Kpse_add([CONF_SUBDIRS])
+else
+ echo 'tldbg:[$0] skipping subdir, no (executable) configure: '"$srcdir"'/$4Kpse_Pkg/configure' >&AS_MESSAGE_LOG_FD
fi
])[]dnl m4_ifdef
])
diff --git a/Build/source/m4/kpse-xpdf-flags.m4 b/Build/source/m4/kpse-xpdf-flags.m4
index e2207b8ad5e..9e4f718f589 100644
--- a/Build/source/m4/kpse-xpdf-flags.m4
+++ b/Build/source/m4/kpse-xpdf-flags.m4
@@ -1,9 +1,29 @@
+# $Id$
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
+# Copyright 2015-2020 Karl Berry <tex-live@tug.org>
+# Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+#
+# Support for our semi-homegrown libs/xpdf library. This is derived
+# from xpdf source code, but xpdf does not distribute it as a library.
+# It is used by pdftex (and nothing else) to read PDF images.
+# Other engines use the semi-homegrown pplib library (q.v.) for that.
+
+# The well-known poppler library is also originally derived from xpdf
+# source code, but has been greatly revised and extended. TL used to
+# (sort of) support poppler as the system xpdf, but after the TL 2020
+# release we dropped this, because we switched XeTeX to use pplib, and
+# nothing else used poppler. (No engines ever used poppler to generate
+# their PDF output).
+#
+# poppler is aggressively developed, with requirements for new compilers
+# and language versions. That's fine for them, but since we don't need
+# anything new, it has become too time-consuming and problematic to
+# continue to support it in the TL sources, when we don't have any
+# requirement for it.
# KPSE_XPDF_FLAGS
# ---------------
@@ -20,19 +40,25 @@ _KPSE_LIB_FLAGS([xpdf], [xpdf], [],
test "x$kpse_cv_have_win32" = xno || XPDF_LIBS="$XPDF_LIBS -lgdi32"
]) # KPSE_XPDF_FLAGS
-# KPSE_XPDF_OPTIONS([WITH-SYSTEM])
+# KPSE_XPDF_OPTIONS([WITH-SYSTEM]) -- as above, no more poppler.
+# Keep this macro's expansion as a valid shell command, though.
+# since it is used internally in the configure scripts.
# --------------------------------
-AC_DEFUN([KPSE_XPDF_OPTIONS],
-[m4_ifval([$1],
- [AC_ARG_WITH([system-xpdf],
- AS_HELP_STRING([--with-system-xpdf],
- [use installed poppler headers and library instead of xpdf library from TL (requires pkg-config)]))])[]dnl
+AC_DEFUN([KPSE_XPDF_OPTIONS], [dnl
+: "kpse_xpdf_options - no-op"
]) # KPSE_XPDF_OPTIONS
+dnl [m4_ifval([$1],
+dnl [AC_ARG_WITH([system-xpdf],
+dnl AS_HELP_STRING([--with-system-xpdf],
+dnl [use installed poppler headers and library instead of xpdf library from TL (requires pkg-config)]))])[]dnl
+dnl ]) # KPSE_XPDF_OPTIONS
-# KPSE_XPDF_SYSTEM_FLAGS
+# KPSE_XPDF_SYSTEM_FLAGS -- as above, no more poppler.
# ----------------------
AC_DEFUN([KPSE_XPDF_SYSTEM_FLAGS], [dnl
-_KPSE_PKG_CONFIG_FLAGS([xpdf], [poppler], [0.12])
-POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES"
+: "kpse_xpdf_system_flags - no-op"
]) # KPSE_XPDF_SYSTEM_FLAGS
+dnl _KPSE_PKG_CONFIG_FLAGS([xpdf], [poppler], [0.12])
+dnl POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
+dnl XPDF_INCLUDES="$POPPLER_VERSION $XPDF_INCLUDES"
+dnl ]) # KPSE_XPDF_SYSTEM_FLAGS
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 07:55:22 +0000