texlive[73472] Build/source: reautoconf
commits+karl at tug.org
commits+karl at tug.org
Wed Jan 15 23:51:19 CET 2025
Revision: 73472
https://tug.org/svn/texlive?view=revision&revision=73472
Author: karl
Date: 2025-01-15 23:51:19 +0100 (Wed, 15 Jan 2025)
Log Message:
-----------
reautoconf
Modified Paths:
--------------
trunk/Build/source/Makefile.in
trunk/Build/source/aclocal.m4
trunk/Build/source/configure
trunk/Build/source/doc/Makefile.in
trunk/Build/source/libs/Makefile.in
trunk/Build/source/libs/aclocal.m4
trunk/Build/source/libs/configure
trunk/Build/source/reautoconf
trunk/Build/source/texk/Makefile.in
trunk/Build/source/texk/aclocal.m4
trunk/Build/source/texk/configure
trunk/Build/source/texk/web2c/configure
trunk/Build/source/utils/Makefile.in
trunk/Build/source/utils/aclocal.m4
trunk/Build/source/utils/configure
Modified: trunk/Build/source/Makefile.in
===================================================================
--- trunk/Build/source/Makefile.in 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/Makefile.in 2025-01-15 22:51:19 UTC (rev 73472)
@@ -104,6 +104,7 @@
$(top_srcdir)/m4/kpse-libpaper-flags.m4 \
$(top_srcdir)/m4/kpse-libpng-flags.m4 \
$(top_srcdir)/m4/kpse-lt-hack.m4 \
+ $(top_srcdir)/m4/kpse-luajit-flags.m4 \
$(top_srcdir)/m4/kpse-mktex.m4 \
$(top_srcdir)/m4/kpse-mpfi-flags.m4 \
$(top_srcdir)/m4/kpse-mpfr-flags.m4 \
@@ -204,6 +205,7 @@
$(top_srcdir)/texk/kpathsea/ac/kpathsea.ac \
$(top_srcdir)/texk/ptexenc/ac/ptexenc.ac \
$(top_srcdir)/libs/zlib/ac/zlib.ac \
+ $(top_srcdir)/libs/luajit/ac/luajit.ac \
$(top_srcdir)/libs/libpaper/ac/libpaper.ac \
$(top_srcdir)/libs/libpng/ac/libpng.ac \
$(top_srcdir)/libs/freetype2/ac/freetype2.ac \
Modified: trunk/Build/source/aclocal.m4
===================================================================
--- trunk/Build/source/aclocal.m4 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/aclocal.m4 2025-01-15 22:51:19 UTC (rev 73472)
@@ -1416,6 +1416,7 @@
m4_include([m4/kpse-libpaper-flags.m4])
m4_include([m4/kpse-libpng-flags.m4])
m4_include([m4/kpse-lt-hack.m4])
+m4_include([m4/kpse-luajit-flags.m4])
m4_include([m4/kpse-mktex.m4])
m4_include([m4/kpse-mpfi-flags.m4])
m4_include([m4/kpse-mpfr-flags.m4])
Modified: trunk/Build/source/configure
===================================================================
--- trunk/Build/source/configure 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/configure 2025-01-15 22:51:19 UTC (rev 73472)
@@ -954,6 +954,7 @@
with_system_libpaper
with_libpaper_includes
with_libpaper_libdir
+with_system_luajit
with_system_zlib
with_zlib_includes
with_zlib_libdir
@@ -1845,6 +1846,8 @@
libpaper headers installed in DIR
--with-libpaper-libdir=DIR
libpaper library installed in DIR
+ --with-system-luajit use installed luajit headers and library (requires
+ pkg-config)
--with-system-zlib use installed zlib headers and library
--with-zlib-includes=DIR
zlib headers installed in DIR
@@ -7702,6 +7705,34 @@
## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
## configure options and TL libraries required for luajit
+# Check whether --with-system-luajit was given.
+if test ${with_system_luajit+y}
+then :
+ withval=$with_system_luajit;
+fi
+if test "x$with_system_luajit" = x; then
+ if test -f $srcdir/libs/luajit/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`luajit' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`luajit' headers and library from TL tree" >&6;}
+ with_system_luajit=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`luajit' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`luajit' headers and library" >&6;}
+ with_system_luajit=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-luajit=$with_system_luajit'"
+elif test "x$with_system_luajit" = xyes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using installed \`luajit' headers and library" >&5
+printf "%s\n" "$as_me: Using installed \`luajit' headers and library" >&6;}
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Using \`luajit' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Using \`luajit' headers and library from TL tree" >&6;}
+ if test "x$with_system_luajit" != xno; then
+ with_system_luajit=no
+ ac_configure_args="$ac_configure_args '--without-system-luajit'"
+ fi
+fi
+
## libs/lua53/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua53/
## configure options and TL libraries required for lua53
@@ -25426,11 +25457,18 @@
as_fn_error $? "did not find harfbuzz" "$LINENO" 5
fi
+if $PKG_CONFIG luajit; then
+ LUAJIT_INCLUDES=`$PKG_CONFIG luajit --cflags`
+ LUAJIT_LIBS=`$PKG_CONFIG luajit --libs`
+elif test "x$need_luajit:$with_system_luajit" = xyes:yes; then
+ as_fn_error $? "did not find luajit" "$LINENO" 5
+fi
+
## texk/kpathsea/ac/kpathsea.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
## basic check of system kpathsea
if test "x$need_kpathsea:$with_system_kpathsea" = xyes:yes; then
@@ -25529,6 +25567,37 @@
printf "%s\n" "$kpse_res" >&6; }
fi
+## libs/luajit/ac/luajit.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
+## basic check of system luajit
+if test "x$need_luajit:$with_system_luajit" = xyes:yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking requested system \`luajit' library" >&5
+printf %s "checking requested system \`luajit' library... " >&6; }
+ CPPFLAGS="$LUAJIT_INCLUDES $CPPFLAGS"
+ LIBS="$LUAJIT_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <luajit.h>
+int
+main (void)
+{
+const char *v = LUAJIT_VERSION;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ syslib_used=yes kpse_res=ok
+else case e in #(
+ e) syslib_status=no kpse_res=failed ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+printf "%s\n" "$kpse_res" >&6; }
+fi
+
## libs/libpaper/ac/libpaper.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/
## basic check of system libpaper
if test "x$need_libpaper:$with_system_libpaper" = xyes:yes; then
Modified: trunk/Build/source/doc/Makefile.in
===================================================================
--- trunk/Build/source/doc/Makefile.in 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/doc/Makefile.in 2025-01-15 22:51:19 UTC (rev 73472)
@@ -104,6 +104,7 @@
$(top_srcdir)/m4/kpse-libpaper-flags.m4 \
$(top_srcdir)/m4/kpse-libpng-flags.m4 \
$(top_srcdir)/m4/kpse-lt-hack.m4 \
+ $(top_srcdir)/m4/kpse-luajit-flags.m4 \
$(top_srcdir)/m4/kpse-mktex.m4 \
$(top_srcdir)/m4/kpse-mpfi-flags.m4 \
$(top_srcdir)/m4/kpse-mpfr-flags.m4 \
@@ -204,6 +205,7 @@
$(top_srcdir)/texk/kpathsea/ac/kpathsea.ac \
$(top_srcdir)/texk/ptexenc/ac/ptexenc.ac \
$(top_srcdir)/libs/zlib/ac/zlib.ac \
+ $(top_srcdir)/libs/luajit/ac/luajit.ac \
$(top_srcdir)/libs/libpaper/ac/libpaper.ac \
$(top_srcdir)/libs/libpng/ac/libpng.ac \
$(top_srcdir)/libs/freetype2/ac/freetype2.ac \
Modified: trunk/Build/source/libs/Makefile.in
===================================================================
--- trunk/Build/source/libs/Makefile.in 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/libs/Makefile.in 2025-01-15 22:51:19 UTC (rev 73472)
@@ -104,6 +104,7 @@
$(top_srcdir)/../m4/kpse-libpaper-flags.m4 \
$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../m4/kpse-lt-hack.m4 \
+ $(top_srcdir)/../m4/kpse-luajit-flags.m4 \
$(top_srcdir)/../m4/kpse-mktex.m4 \
$(top_srcdir)/../m4/kpse-mpfi-flags.m4 \
$(top_srcdir)/../m4/kpse-mpfr-flags.m4 \
Modified: trunk/Build/source/libs/aclocal.m4
===================================================================
--- trunk/Build/source/libs/aclocal.m4 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/libs/aclocal.m4 2025-01-15 22:51:19 UTC (rev 73472)
@@ -1354,6 +1354,7 @@
m4_include([../m4/kpse-libpaper-flags.m4])
m4_include([../m4/kpse-libpng-flags.m4])
m4_include([../m4/kpse-lt-hack.m4])
+m4_include([../m4/kpse-luajit-flags.m4])
m4_include([../m4/kpse-mktex.m4])
m4_include([../m4/kpse-mpfi-flags.m4])
m4_include([../m4/kpse-mpfr-flags.m4])
Modified: trunk/Build/source/libs/configure
===================================================================
--- trunk/Build/source/libs/configure 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/libs/configure 2025-01-15 22:51:19 UTC (rev 73472)
@@ -897,6 +897,7 @@
with_system_libpaper
with_libpaper_includes
with_libpaper_libdir
+with_system_luajit
with_system_zlib
with_zlib_includes
with_zlib_libdir
@@ -1751,6 +1752,8 @@
libpaper headers installed in DIR
--with-libpaper-libdir=DIR
libpaper library installed in DIR
+ --with-system-luajit use installed luajit headers and library (requires
+ pkg-config)
--with-system-zlib use installed zlib headers and library
--with-zlib-includes=DIR
zlib headers installed in DIR
@@ -6664,6 +6667,24 @@
## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
## configure options and TL libraries required for luajit
+# Check whether --with-system-luajit was given.
+if test ${with_system_luajit+y}
+then :
+ withval=$with_system_luajit;
+fi
+if test "x$with_system_luajit" = x; then
+ if test -f $srcdir/../libs/luajit/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`luajit' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`luajit' headers and library from TL tree" >&6;}
+ with_system_luajit=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`luajit' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`luajit' headers and library" >&6;}
+ with_system_luajit=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-luajit=$with_system_luajit'"
+fi
+
## libs/lua53/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua53/
## configure options and TL libraries required for lua53
Modified: trunk/Build/source/reautoconf
===================================================================
--- trunk/Build/source/reautoconf 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/reautoconf 2025-01-15 22:51:19 UTC (rev 73472)
@@ -3,7 +3,7 @@
# This "reautoconf" script at the root of the TeX Live source tree
# runs autoreconf (from PATH) in all relevant TL directories.
#
-# Copyright 2008-2023 Karl Berry.
+# Copyright 2008-2025 Karl Berry.
# Copyright 2004-2009 Peter Breitenlohner.
# Copyright 2005 Olaf Weber.
#
@@ -85,6 +85,7 @@
echo "$0: using `autom4te --version | sed 1q`"
echo "$0: using `automake --version | sed 1q`"
echo "$0: using `aclocal --version | sed 1q`"
+echo "$0: using `libtool --version | sed 1q`"
echo "$0: if you want to use different versions, set PATH."
# Give users a chance to quit here.
Modified: trunk/Build/source/texk/Makefile.in
===================================================================
--- trunk/Build/source/texk/Makefile.in 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/texk/Makefile.in 2025-01-15 22:51:19 UTC (rev 73472)
@@ -104,6 +104,7 @@
$(top_srcdir)/../m4/kpse-libpaper-flags.m4 \
$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../m4/kpse-lt-hack.m4 \
+ $(top_srcdir)/../m4/kpse-luajit-flags.m4 \
$(top_srcdir)/../m4/kpse-mktex.m4 \
$(top_srcdir)/../m4/kpse-mpfi-flags.m4 \
$(top_srcdir)/../m4/kpse-mpfr-flags.m4 \
Modified: trunk/Build/source/texk/aclocal.m4
===================================================================
--- trunk/Build/source/texk/aclocal.m4 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/texk/aclocal.m4 2025-01-15 22:51:19 UTC (rev 73472)
@@ -1354,6 +1354,7 @@
m4_include([../m4/kpse-libpaper-flags.m4])
m4_include([../m4/kpse-libpng-flags.m4])
m4_include([../m4/kpse-lt-hack.m4])
+m4_include([../m4/kpse-luajit-flags.m4])
m4_include([../m4/kpse-mktex.m4])
m4_include([../m4/kpse-mpfi-flags.m4])
m4_include([../m4/kpse-mpfr-flags.m4])
Modified: trunk/Build/source/texk/configure
===================================================================
--- trunk/Build/source/texk/configure 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/texk/configure 2025-01-15 22:51:19 UTC (rev 73472)
@@ -897,6 +897,7 @@
with_system_libpaper
with_libpaper_includes
with_libpaper_libdir
+with_system_luajit
with_system_zlib
with_zlib_includes
with_zlib_libdir
@@ -1751,6 +1752,8 @@
libpaper headers installed in DIR
--with-libpaper-libdir=DIR
libpaper library installed in DIR
+ --with-system-luajit use installed luajit headers and library (requires
+ pkg-config)
--with-system-zlib use installed zlib headers and library
--with-zlib-includes=DIR
zlib headers installed in DIR
@@ -6664,6 +6667,24 @@
## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
## configure options and TL libraries required for luajit
+# Check whether --with-system-luajit was given.
+if test ${with_system_luajit+y}
+then :
+ withval=$with_system_luajit;
+fi
+if test "x$with_system_luajit" = x; then
+ if test -f $srcdir/../libs/luajit/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`luajit' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`luajit' headers and library from TL tree" >&6;}
+ with_system_luajit=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`luajit' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`luajit' headers and library" >&6;}
+ with_system_luajit=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-luajit=$with_system_luajit'"
+fi
+
## libs/lua53/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua53/
## configure options and TL libraries required for lua53
Modified: trunk/Build/source/texk/web2c/configure
===================================================================
--- trunk/Build/source/texk/web2c/configure 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/texk/web2c/configure 2025-01-15 22:51:19 UTC (rev 73472)
@@ -1081,6 +1081,7 @@
with_system_zlib
with_zlib_includes
with_zlib_libdir
+with_system_luajit
with_system_libpng
with_system_freetype2
with_system_pixman
@@ -1850,6 +1851,8 @@
--with-zlib-includes=DIR
zlib headers installed in DIR
--with-zlib-libdir=DIR zlib library installed in DIR
+ --with-system-luajit use installed luajit headers and library (requires
+ pkg-config)
--with-system-libpng use installed libpng headers and library (requires
pkg-config)
--with-system-freetype2 use installed freetype2 headers and library
@@ -29053,8 +29056,22 @@
echo 'tldbg:KPSE_LUAJIT_FLAGS called.' >&5
##tldbg _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags.
-echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=luajit, libname=texluajit, options=lt tree, tlincl=-IBLD/libs/luajit/include, tllib=BLD/libs/luajit/libtexluajit.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/luajit/include/luajit.h.' >&5
-##tldbg _KPSE_LIB_FLAGS_TL: luajit (texluajit) lt tree.
+echo 'tldbg:_KPSE_LIB_FLAGS called: libdir=luajit, libname=texluajit, options=lt, tlincl=-IBLD/libs/luajit/include, tllib=BLD/libs/luajit/libtexluajit.la, tlextra=, rebuildsrcdeps=, rebuildblddeps=${top_builddir}/../../libs/luajit/include/luajit.h.' >&5
+##tldbg _KPSE_LIB_FLAGS_TL: luajit (texluajit) lt.
+
+# Check whether --with-system-luajit was given.
+if test ${with_system_luajit+y}
+then :
+ withval=$with_system_luajit;
+fi
+if test "x$with_system_luajit" = xyes; then
+ if $PKG_CONFIG luajit; then
+ LUAJIT_INCLUDES=`$PKG_CONFIG luajit --cflags`
+ LUAJIT_LIBS=`$PKG_CONFIG luajit --libs`
+elif test "x$need_luajit:$with_system_luajit" = xyes:yes; then
+ as_fn_error $? "did not find luajit" "$LINENO" 5
+fi
+else
LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include"
LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la"
LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la'
@@ -29063,6 +29080,7 @@
cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild
${top_builddir}/../../libs/luajit/include/luajit.h:
cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
#
# checking for openbsd for additional jit libraries needed, which is the
# case for clang; no point in going to the trouble elsewhere since no
Modified: trunk/Build/source/utils/Makefile.in
===================================================================
--- trunk/Build/source/utils/Makefile.in 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/utils/Makefile.in 2025-01-15 22:51:19 UTC (rev 73472)
@@ -104,6 +104,7 @@
$(top_srcdir)/../m4/kpse-libpaper-flags.m4 \
$(top_srcdir)/../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../m4/kpse-lt-hack.m4 \
+ $(top_srcdir)/../m4/kpse-luajit-flags.m4 \
$(top_srcdir)/../m4/kpse-mktex.m4 \
$(top_srcdir)/../m4/kpse-mpfi-flags.m4 \
$(top_srcdir)/../m4/kpse-mpfr-flags.m4 \
Modified: trunk/Build/source/utils/aclocal.m4
===================================================================
--- trunk/Build/source/utils/aclocal.m4 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/utils/aclocal.m4 2025-01-15 22:51:19 UTC (rev 73472)
@@ -1354,6 +1354,7 @@
m4_include([../m4/kpse-libpaper-flags.m4])
m4_include([../m4/kpse-libpng-flags.m4])
m4_include([../m4/kpse-lt-hack.m4])
+m4_include([../m4/kpse-luajit-flags.m4])
m4_include([../m4/kpse-mktex.m4])
m4_include([../m4/kpse-mpfi-flags.m4])
m4_include([../m4/kpse-mpfr-flags.m4])
Modified: trunk/Build/source/utils/configure
===================================================================
--- trunk/Build/source/utils/configure 2025-01-15 22:51:07 UTC (rev 73471)
+++ trunk/Build/source/utils/configure 2025-01-15 22:51:19 UTC (rev 73472)
@@ -897,6 +897,7 @@
with_system_libpaper
with_libpaper_includes
with_libpaper_libdir
+with_system_luajit
with_system_zlib
with_zlib_includes
with_zlib_libdir
@@ -1751,6 +1752,8 @@
libpaper headers installed in DIR
--with-libpaper-libdir=DIR
libpaper library installed in DIR
+ --with-system-luajit use installed luajit headers and library (requires
+ pkg-config)
--with-system-zlib use installed zlib headers and library
--with-zlib-includes=DIR
zlib headers installed in DIR
@@ -6664,6 +6667,24 @@
## libs/luajit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/luajit/
## configure options and TL libraries required for luajit
+# Check whether --with-system-luajit was given.
+if test ${with_system_luajit+y}
+then :
+ withval=$with_system_luajit;
+fi
+if test "x$with_system_luajit" = x; then
+ if test -f $srcdir/../libs/luajit/configure; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`luajit' headers and library from TL tree" >&5
+printf "%s\n" "$as_me: Assuming \`luajit' headers and library from TL tree" >&6;}
+ with_system_luajit=no
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming installed \`luajit' headers and library" >&5
+printf "%s\n" "$as_me: Assuming installed \`luajit' headers and library" >&6;}
+ with_system_luajit=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-luajit=$with_system_luajit'"
+fi
+
## libs/lua53/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua53/
## configure options and TL libraries required for lua53
More information about the tex-live-commits
mailing list.