reautoconf

git-svn-id: svn://tug.org/texlive/trunk/Build/source@73472 c570f23f-e606-0410-a88d-b1316a301751
TeX-Live · Jan 15, 2025 · efed03a · efed03a
1 parent 605d32c
commit efed03a
Show file tree

Hide file tree

Showing 15 changed files with 165 additions and 3 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(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 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(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 \

diff --git a/aclocal.m4 b/aclocal.m4
@@ -1416,6 +1416,7 @@ m4_include([m4/kpse-kpathsea-flags.m4])
 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])

diff --git a/configure b/configure
@@ -954,6 +954,7 @@ with_system_libpng
 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 @@ Optional Packages:
                           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 @@ fi
 ## 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,6 +25457,13 @@ elif test "x$need_harfbuzz:$with_system_harfbuzz" = xyes:yes; then
   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
+
 
 
 
@@ -25529,6 +25567,37 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
 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

diff --git a/doc/Makefile.in b/doc/Makefile.in
@@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(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 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(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 \

diff --git a/libs/Makefile.in b/libs/Makefile.in
@@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(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 \

diff --git a/libs/aclocal.m4 b/libs/aclocal.m4
@@ -1354,6 +1354,7 @@ m4_include([../m4/kpse-kpathsea-flags.m4])
 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])

diff --git a/libs/configure b/libs/configure
@@ -897,6 +897,7 @@ with_system_libpng
 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 @@ Optional Packages:
                           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 @@ fi
 ## 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
 

diff --git a/reautoconf b/reautoconf
@@ -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 `autoheader --version | sed 1q`"
 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.

diff --git a/texk/Makefile.in b/texk/Makefile.in
@@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(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 \

diff --git a/texk/aclocal.m4 b/texk/aclocal.m4
@@ -1354,6 +1354,7 @@ m4_include([../m4/kpse-kpathsea-flags.m4])
 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])

diff --git a/texk/configure b/texk/configure
@@ -897,6 +897,7 @@ with_system_libpng
 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 @@ Optional Packages:
                           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 @@ fi
 ## 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
 

diff --git a/texk/web2c/configure b/texk/web2c/configure
@@ -1081,6 +1081,7 @@ with_system_ptexenc
 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 @@ Optional Packages:
   --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 @@ ${top_builddir}/../../libs/lua52/include/lua.h:
 
 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 @@ $(LUAJIT_DEPEND): ${top_builddir}/../../libs/luajit/include/luajit.h
 	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

diff --git a/utils/Makefile.in b/utils/Makefile.in
@@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(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 \

diff --git a/utils/aclocal.m4 b/utils/aclocal.m4
@@ -1354,6 +1354,7 @@ m4_include([../m4/kpse-kpathsea-flags.m4])
 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])

diff --git a/utils/configure b/utils/configure
@@ -897,6 +897,7 @@ with_system_libpng
 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 @@ Optional Packages:
                           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 @@ fi
 ## 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