summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-12 08:45:07 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-12 08:45:07 +0000
commit4403160cd26a0ba4eb014d69bfb9dcd568f64fc6 (patch)
tree0a036c9b3654e6e7b2e73753225598980d25c54f /Build/source/m4
parent1dde8ab4578f370c597332ff3421097d7cb39a1a (diff)
Integrate MFLua and MFLuaJIT
git-svn-id: svn://tug.org/texlive/trunk@37504 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog2
-rw-r--r--Build/source/m4/kpse-poppler-flags.m42
-rw-r--r--Build/source/m4/kpse-setup.m48
3 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index b342d4674e7..0dea449af99 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -3,6 +3,8 @@
* kpse-warnings.m4: Warning flags for gcc 5.x.
* kpse-web2c.m4: Better handling of --disable-mf-nowin.
* kpse-common.m4: Check if <ctype.h> declares isascii.
+ * kpse-setup.m4: MFLuaJIT requires LuaJIT.
+ * kpse-poppler-flags.m4: LuaTeX requires poppler 0.30 or better.
2015-03-30 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4
index 2883395cfdb..812d8c7d028 100644
--- a/Build/source/m4/kpse-poppler-flags.m4
+++ b/Build/source/m4/kpse-poppler-flags.m4
@@ -28,7 +28,7 @@ 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.18])
+_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-setup.m4 b/Build/source/m4/kpse-setup.m4
index b9c9bcce005..145ca0f4aca 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -81,12 +81,14 @@ AS_CASE([$with_x:$kpse_cv_have_win32],
[with_x=no
AC_MSG_NOTICE([WIN32 -> `--without-x'])
ac_configure_args="$ac_configure_args '--without-x'"])
-AS_CASE([$enable_luajittex],
+AC_FOREACH([Kpse_Pkg], [luajittex mfluajit], [dnl
+AS_CASE([$enable_]Kpse_Pkg,
[yes | no], [:],
[AS_CASE([$host],
[alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ],
- [AC_MSG_NOTICE([$host -> `--disable-luajittex'])
- ac_configure_args="$ac_configure_args '--disable-luajittex'"])])
+ [AC_MSG_NOTICE([$host -> `--disable-]Kpse_Pkg['])
+ ac_configure_args="$ac_configure_args '--disable-]Kpse_Pkg['"])])
+])
KPSE_FOR_PKGS([utils], [m4_sinclude(kpse_TL[utils/]Kpse_Pkg[/ac/withenable.ac])])
KPSE_FOR_PKGS([texk], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])])
KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])])