From ad714058c45d0dd9e1f1417d3af804229b93b6f9 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 6 Feb 2014 11:04:14 +0000 Subject: LuaJITTeX git-svn-id: svn://tug.org/texlive/trunk@32878 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/m4/ChangeLog | 5 +++++ Build/source/m4/kpse-lua52-flags.m4 | 4 ++-- Build/source/m4/kpse-luajit-flags.m4 | 35 +++++++++++++++++++++++++++++++++++ Build/source/m4/kpse-pkgs.m4 | 1 + 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 Build/source/m4/kpse-luajit-flags.m4 (limited to 'Build/source/m4') diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index 646d4dccb5d..87438aa6125 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,8 @@ +2014-02-05 Peter Breitenlohner + + * kpse-pkgs.m4 (kpse_libs_pkgs): Add luajit. + * kpse-luajit-flags.m4: New file. + 2014-01-13 Peter Breitenlohner * kpse-pkgs.m4: Renamed paper => libpaper. Removed songs. diff --git a/Build/source/m4/kpse-lua52-flags.m4 b/Build/source/m4/kpse-lua52-flags.m4 index 598191f353a..5e1d40466ff 100644 --- a/Build/source/m4/kpse-lua52-flags.m4 +++ b/Build/source/m4/kpse-lua52-flags.m4 @@ -1,5 +1,5 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2013 Peter Breitenlohner +# Copyright (C) 2013, 2014 Peter Breitenlohner # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ # ---------------- # Set the make variables LUA52_INCLUDES and LUA52_LIBS to # the CPPFLAGS and LIBS required for the `-llua52' library in -# libs/luz52/ of the TL tree. +# libs/lua52/ of the TL tree. AC_DEFUN([KPSE_LUA52_FLAGS], [dnl _KPSE_LIB_FLAGS([lua52], [lua52], [tree], [-IBLD/libs/lua52/include], [BLD/libs/lua52/liblua52.a], [], diff --git a/Build/source/m4/kpse-luajit-flags.m4 b/Build/source/m4/kpse-luajit-flags.m4 new file mode 100644 index 00000000000..a587ff29e02 --- /dev/null +++ b/Build/source/m4/kpse-luajit-flags.m4 @@ -0,0 +1,35 @@ +# Public macros for the TeX Live (TL) tree. +# Copyright (C) 2014 Peter Breitenlohner +# +# 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_LUAJIT_FLAGS +# ----------------- +# Set the make variables LUAJIT_INCLUDES and LUAJIT_LIBS to +# the CPPFLAGS and LIBS required for the `-lluajit' library in +# libs/luajit/ of the TL tree. +AC_DEFUN([KPSE_LUAJIT_FLAGS], [dnl +_KPSE_LIB_FLAGS([luajit], [luajit], [tree], + [-IBLD/libs/luajit/luajit-build/src], [BLD/libs/luajit/luajit-build/src/libluajit.a], [], + [], [${top_builddir}/../../libs/luajit/luajit-build/src/luajit.h])[]dnl +]) # KPSE_LUAJIT_FLAGS + +# KPSE_LUAJIT_DEFINES +# ------------------- +# Set the make variable LUAJIT_DEFINES to the CPPFLAGS required when +# compiling or using the `-lluajit' library. +AC_DEFUN([KPSE_LUAJIT_DEFINES], [dnl +AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl +AC_SUBST([LUAJIT_DEFINES], [-DLUAJIT_ENABLE_LUA52COMPAT]) +if test "x$kpse_cv_have_win32" = xno; then + LUAJIT_DEFINES="$LUAJIT_DEFINES -DLUA_USE_POSIX" + AC_SEARCH_LIBS([dlopen], [dl]) + if test "x$ac_cv_search_dlopen" != xno; then + AC_CHECK_HEADER([dlfcn.h], + [LUAJIT_DEFINES="$LUAJIT_DEFINES -DLUA_USE_DLOPEN"], + [], [AC_INCLUDES_DEFAULT]) + fi +fi +]) # KPSE_LUAJIT_DEFINES diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4 index 113cdedad54..9d36f208698 100644 --- a/Build/source/m4/kpse-pkgs.m4 +++ b/Build/source/m4/kpse-pkgs.m4 @@ -37,6 +37,7 @@ gd freetype2 libpng libpaper +luajit lua52 zlib ])[]dnl -- cgit v1.2.3