From 0387fcbab1b308d7304f2b05939d9f87f8f3fbc9 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 3 Jul 2015 11:44:36 +0000 Subject: MFLua(JIT): Use lkpselib.c (from Akira) git-svn-id: svn://tug.org/texlive/trunk@37743 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/Makefile.in | 51 +++++++++++++++++++--- Build/source/texk/web2c/luatexdir/ChangeLog | 4 ++ Build/source/texk/web2c/luatexdir/lua/lkpselib.c | 19 ++++++++ Build/source/texk/web2c/mfluadir/ChangeLog | 4 ++ Build/source/texk/web2c/mfluadir/am/mflua.am | 4 +- Build/source/texk/web2c/mfluadir/mfluac.c | 1 + Build/source/texk/web2c/mfluadir/mfluac.h | 8 ++++ Build/source/texk/web2c/mfluajitdir/ChangeLog | 4 ++ Build/source/texk/web2c/mfluajitdir/am/mfluajit.am | 4 +- 9 files changed, 89 insertions(+), 10 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index f17f1cee78e..ffcec0e2146 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -845,7 +845,8 @@ nodist_libmf_a_OBJECTS = $(am__objects_11) mf-pool.$(OBJEXT) libmf_a_OBJECTS = $(nodist_libmf_a_OBJECTS) libmflua_a_AR = $(AR) $(ARFLAGS) libmflua_a_LIBADD = -dist_libmflua_a_OBJECTS = mfluadir/libmflua_a-mfluac.$(OBJEXT) +dist_libmflua_a_OBJECTS = luatexdir/lua/libmflua_a-lkpselib.$(OBJEXT) \ + mfluadir/libmflua_a-mfluac.$(OBJEXT) am__objects_12 = libmflua_a-mfluaini.$(OBJEXT) \ libmflua_a-mflua0.$(OBJEXT) nodist_libmflua_a_OBJECTS = $(am__objects_12) \ @@ -854,7 +855,9 @@ libmflua_a_OBJECTS = $(dist_libmflua_a_OBJECTS) \ $(nodist_libmflua_a_OBJECTS) libmfluajit_a_AR = $(AR) $(ARFLAGS) libmfluajit_a_LIBADD = -dist_libmfluajit_a_OBJECTS = mfluadir/libmfluajit_a-mfluac.$(OBJEXT) +dist_libmfluajit_a_OBJECTS = \ + luatexdir/lua/libmfluajit_a-lkpselib.$(OBJEXT) \ + mfluadir/libmfluajit_a-mfluac.$(OBJEXT) am__objects_13 = libmfluajit_a-mfluajitini.$(OBJEXT) \ libmfluajit_a-mfluajit0.$(OBJEXT) nodist_libmfluajit_a_OBJECTS = $(am__objects_13) \ @@ -2767,9 +2770,9 @@ mflua_nowin_LDFLAGS = -export-dynamic # MFLua C sources mflua_c_h = mfluaini.c mflua0.c mfluacoerce.h mfluad.h -dist_libmflua_a_SOURCES = mfluadir/mfluac.c mfluadir/mfluac.h +dist_libmflua_a_SOURCES = luatexdir/lua/lkpselib.c mfluadir/mfluac.c mfluadir/mfluac.h nodist_libmflua_a_SOURCES = $(mflua_c_h) mflua-pool.c -libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) +libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) -DMF_LUA mflua_web_srcs = \ mf.web \ mfluadir/mf-lua.ch @@ -2797,9 +2800,9 @@ mfluajit_nowin_LDFLAGS = -export-dynamic $(LUAJIT_LDEXTRA) # MFLua C sources mfluajit_c_h = mfluajitini.c mfluajit0.c mfluajitcoerce.h mfluajitd.h -dist_libmfluajit_a_SOURCES = mfluadir/mfluac.c mfluadir/mfluac.h +dist_libmfluajit_a_SOURCES = luatexdir/lua/lkpselib.c mfluadir/mfluac.c mfluadir/mfluac.h nodist_libmfluajit_a_SOURCES = $(mfluajit_c_h) mfluajit-pool.c -libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DJIT +libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DMF_LUA -DJIT mfluajit_web_srcs = \ mf.web \ mfluadir/mf-lua.ch \ @@ -4691,6 +4694,9 @@ libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES $(AM_V_at)-rm -f libmf.a $(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD) $(AM_V_at)$(RANLIB) libmf.a +luatexdir/lua/libmflua_a-lkpselib.$(OBJEXT): \ + luatexdir/lua/$(am__dirstamp) \ + luatexdir/lua/$(DEPDIR)/$(am__dirstamp) mfluadir/$(am__dirstamp): @$(MKDIR_P) mfluadir @: > mfluadir/$(am__dirstamp) @@ -4704,6 +4710,9 @@ libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_ $(AM_V_at)-rm -f libmflua.a $(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD) $(AM_V_at)$(RANLIB) libmflua.a +luatexdir/lua/libmfluajit_a-lkpselib.$(OBJEXT): \ + luatexdir/lua/$(am__dirstamp) \ + luatexdir/lua/$(DEPDIR)/$(am__dirstamp) mfluadir/libmfluajit_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \ mfluadir/$(DEPDIR)/$(am__dirstamp) @@ -5838,6 +5847,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/lua/$(DEPDIR)/libluatex_a-ltexiolib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/lua/$(DEPDIR)/libluatex_a-ltexlib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/lua/$(DEPDIR)/libluatex_a-ltokenlib.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/luafilesystem/src/$(DEPDIR)/libluamisc_a-lfs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/libff_a-autohint.Po@am__quote@ @@ -11392,6 +11403,20 @@ libmd5/libmd5_a-md5.obj: libmd5/md5.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmd5_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmd5/libmd5_a-md5.obj `if test -f 'libmd5/md5.c'; then $(CYGPATH_W) 'libmd5/md5.c'; else $(CYGPATH_W) '$(srcdir)/libmd5/md5.c'; fi` +luatexdir/lua/libmflua_a-lkpselib.o: luatexdir/lua/lkpselib.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/lua/libmflua_a-lkpselib.o -MD -MP -MF luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Tpo -c -o luatexdir/lua/libmflua_a-lkpselib.o `test -f 'luatexdir/lua/lkpselib.c' || echo '$(srcdir)/'`luatexdir/lua/lkpselib.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Tpo luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/lua/lkpselib.c' object='luatexdir/lua/libmflua_a-lkpselib.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/lua/libmflua_a-lkpselib.o `test -f 'luatexdir/lua/lkpselib.c' || echo '$(srcdir)/'`luatexdir/lua/lkpselib.c + +luatexdir/lua/libmflua_a-lkpselib.obj: luatexdir/lua/lkpselib.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/lua/libmflua_a-lkpselib.obj -MD -MP -MF luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Tpo -c -o luatexdir/lua/libmflua_a-lkpselib.obj `if test -f 'luatexdir/lua/lkpselib.c'; then $(CYGPATH_W) 'luatexdir/lua/lkpselib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/lkpselib.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Tpo luatexdir/lua/$(DEPDIR)/libmflua_a-lkpselib.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/lua/lkpselib.c' object='luatexdir/lua/libmflua_a-lkpselib.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/lua/libmflua_a-lkpselib.obj `if test -f 'luatexdir/lua/lkpselib.c'; then $(CYGPATH_W) 'luatexdir/lua/lkpselib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/lkpselib.c'; fi` + mfluadir/libmflua_a-mfluac.o: mfluadir/mfluac.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluadir/libmflua_a-mfluac.o -MD -MP -MF mfluadir/$(DEPDIR)/libmflua_a-mfluac.Tpo -c -o mfluadir/libmflua_a-mfluac.o `test -f 'mfluadir/mfluac.c' || echo '$(srcdir)/'`mfluadir/mfluac.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/$(DEPDIR)/libmflua_a-mfluac.Tpo mfluadir/$(DEPDIR)/libmflua_a-mfluac.Po @@ -11448,6 +11473,20 @@ libmflua_a-mflua-pool.obj: mflua-pool.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmflua_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmflua_a-mflua-pool.obj `if test -f 'mflua-pool.c'; then $(CYGPATH_W) 'mflua-pool.c'; else $(CYGPATH_W) '$(srcdir)/mflua-pool.c'; fi` +luatexdir/lua/libmfluajit_a-lkpselib.o: luatexdir/lua/lkpselib.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/lua/libmfluajit_a-lkpselib.o -MD -MP -MF luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Tpo -c -o luatexdir/lua/libmfluajit_a-lkpselib.o `test -f 'luatexdir/lua/lkpselib.c' || echo '$(srcdir)/'`luatexdir/lua/lkpselib.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Tpo luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/lua/lkpselib.c' object='luatexdir/lua/libmfluajit_a-lkpselib.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/lua/libmfluajit_a-lkpselib.o `test -f 'luatexdir/lua/lkpselib.c' || echo '$(srcdir)/'`luatexdir/lua/lkpselib.c + +luatexdir/lua/libmfluajit_a-lkpselib.obj: luatexdir/lua/lkpselib.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT luatexdir/lua/libmfluajit_a-lkpselib.obj -MD -MP -MF luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Tpo -c -o luatexdir/lua/libmfluajit_a-lkpselib.obj `if test -f 'luatexdir/lua/lkpselib.c'; then $(CYGPATH_W) 'luatexdir/lua/lkpselib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/lkpselib.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Tpo luatexdir/lua/$(DEPDIR)/libmfluajit_a-lkpselib.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/lua/lkpselib.c' object='luatexdir/lua/libmfluajit_a-lkpselib.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatexdir/lua/libmfluajit_a-lkpselib.obj `if test -f 'luatexdir/lua/lkpselib.c'; then $(CYGPATH_W) 'luatexdir/lua/lkpselib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/lua/lkpselib.c'; fi` + mfluadir/libmfluajit_a-mfluac.o: mfluadir/mfluac.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmfluajit_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mfluadir/libmfluajit_a-mfluac.o -MD -MP -MF mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Tpo -c -o mfluadir/libmfluajit_a-mfluac.o `test -f 'mfluadir/mfluac.c' || echo '$(srcdir)/'`mfluadir/mfluac.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Tpo mfluadir/$(DEPDIR)/libmfluajit_a-mfluac.Po diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 6db573fe618..fa95d0f271e 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2015-07-03 Peter Breitenlohner + + * lua/lkpselib.c: Also used for MFLua and MFLuaJIT. + 2015-03-31 Peter Breitenlohner * luazip/src/luazip.c (zip_close): Sync with the upstream. diff --git a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c index c29dbd8586f..d53c50426e4 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lkpselib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lkpselib.c @@ -17,8 +17,19 @@ You should have received a copy of the GNU General Public License along with LuaTeX; if not, see . */ +#ifdef MF_LUA +#define EXTERN extern +#if defined(JIT) +#include "mfluajitd.h" +#else +#include "mfluad.h" +#endif +#include +#define xfree(p) do { if (p != NULL) free(p); p = NULL; } while (0) +#else #include "ptexlib.h" #include "lua/luatex-api.h" +#endif #include #include #include @@ -151,11 +162,19 @@ static const char *const filetypenames[] = { }; +#ifdef MF +#define KPATHSEA_METATABLE "mflua.kpathsea" +#else #define KPATHSEA_METATABLE "luatex.kpathsea" +#endif /* set to 1 by the |program_name| function */ +#ifdef MF +int program_name_set = 1; +#else int program_name_set = 0; +#endif #define TEST_PROGRAM_NAME_SET do { \ if (! program_name_set) { \ diff --git a/Build/source/texk/web2c/mfluadir/ChangeLog b/Build/source/texk/web2c/mfluadir/ChangeLog index 61fc5d1c586..07000a7f866 100644 --- a/Build/source/texk/web2c/mfluadir/ChangeLog +++ b/Build/source/texk/web2c/mfluadir/ChangeLog @@ -1,3 +1,7 @@ +2015-07-03 Peter Breitenlohner + + * am/mflua.am, mfluac.[ch]: Use lkpselib.c. + 2015-07-03 Peter Breitenlohner * am/mflua.am: Always create mflua-nowin, either as extra diff --git a/Build/source/texk/web2c/mfluadir/am/mflua.am b/Build/source/texk/web2c/mfluadir/am/mflua.am index 8b4546ae716..a241ec13ee0 100644 --- a/Build/source/texk/web2c/mfluadir/am/mflua.am +++ b/Build/source/texk/web2c/mfluadir/am/mflua.am @@ -61,9 +61,9 @@ EXTRA_LIBRARIES += libmflua.a # MFLua C sources mflua_c_h = mfluaini.c mflua0.c mfluacoerce.h mfluad.h -dist_libmflua_a_SOURCES = mfluadir/mfluac.c mfluadir/mfluac.h +dist_libmflua_a_SOURCES = luatexdir/lua/lkpselib.c mfluadir/mfluac.c mfluadir/mfluac.h nodist_libmflua_a_SOURCES = $(mflua_c_h) mflua-pool.c -libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) +libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) -DMF_LUA # We must create mfluad.h before building the libmflua_a_OBJECTS. $(libmflua_a_OBJECTS): mfluad.h diff --git a/Build/source/texk/web2c/mfluadir/mfluac.c b/Build/source/texk/web2c/mfluadir/mfluac.c index 044bd05633e..0495be820de 100644 --- a/Build/source/texk/web2c/mfluadir/mfluac.c +++ b/Build/source/texk/web2c/mfluadir/mfluac.c @@ -549,6 +549,7 @@ int mfluainitialize(void) char* file = kpse_find_file("mfluaini.lua", kpse_lua_format, 0); int res ; /* register lua functions */ + luaopen_kpse(L); lua_pushcfunction(L, priv_mfweb_link);lua_setglobal(L, "link"); lua_pushcfunction(L, priv_mfweb_info);lua_setglobal(L, "info"); lua_pushcfunction(L, priv_mfweb_x_coord);lua_setglobal(L, "x_coord"); diff --git a/Build/source/texk/web2c/mfluadir/mfluac.h b/Build/source/texk/web2c/mfluadir/mfluac.h index 4f870a46d78..80e2e7a0235 100644 --- a/Build/source/texk/web2c/mfluadir/mfluac.h +++ b/Build/source/texk/web2c/mfluadir/mfluac.h @@ -1,3 +1,6 @@ +#ifndef MFLUAC_H +#define MFLUAC_H + extern int mfluabeginprogram(void); extern int mfluaPREstartofMF(void); extern int mfluaPREmaincontrol(void); @@ -36,3 +39,8 @@ extern int mfluaprinttransitionlineto(integer, integer); extern int mfluaPREmakeellipse(integer, integer, integer, integer, integer, integer); extern int mfluaPOSTmakeellipse(integer, integer, integer, integer, integer, integer); + +#include +extern int luaopen_kpse(lua_State * L); + +#endif /* MFLUAC_H */ diff --git a/Build/source/texk/web2c/mfluajitdir/ChangeLog b/Build/source/texk/web2c/mfluajitdir/ChangeLog index 372e194fe55..675f6def274 100644 --- a/Build/source/texk/web2c/mfluajitdir/ChangeLog +++ b/Build/source/texk/web2c/mfluajitdir/ChangeLog @@ -1,3 +1,7 @@ +2015-07-03 Peter Breitenlohner + + * am/mfluajit.am, mfluac.[ch]: Use lkpselib.c. + 2015-07-03 Peter Breitenlohner * am/mfluajit.am: Always create mfluajit-nowin, either as extra diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am index bbf3cd52e79..38c16430ac0 100644 --- a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am +++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am @@ -61,9 +61,9 @@ EXTRA_LIBRARIES += libmfluajit.a # MFLua C sources mfluajit_c_h = mfluajitini.c mfluajit0.c mfluajitcoerce.h mfluajitd.h -dist_libmfluajit_a_SOURCES = mfluadir/mfluac.c mfluadir/mfluac.h +dist_libmfluajit_a_SOURCES = luatexdir/lua/lkpselib.c mfluadir/mfluac.c mfluadir/mfluac.h nodist_libmfluajit_a_SOURCES = $(mfluajit_c_h) mfluajit-pool.c -libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DJIT +libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DMF_LUA -DJIT # We must create mfluajitd.h before building the libmfluajit_a_OBJECTS. $(libmfluajit_a_OBJECTS): mfluajitd.h -- cgit v1.2.3