libs/luajit: Further simplify the build system

git-svn-id: svn://tug.org/texlive/trunk@32966 c570f23f-e606-0410-a88d-b1316a301751

19 files changed, 330 insertions, 188 deletions

diff --git a/Build/source/libs/luajit/ChangeLog b/Build/source/libs/luajit/ChangeLog
index a963ac4a803..2baca0487d9 100644
--- a/Build/source/libs/luajit/ChangeLog
+++ b/Build/source/libs/luajit/ChangeLog
@@ -1,6 +1,6 @@
 2014-02-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
-	* Makefile.am, native/Makefile.am: Simplify.
+	* Makefile.am, m4/lj-system.m4, native/Makefile.am: Simplify.
 
 2014-02-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/libs/luajit/Makefile.am b/Build/source/libs/luajit/Makefile.am
index 27eefc64d87..d44b9d3185e 100644
--- a/Build/source/libs/luajit/Makefile.am
+++ b/Build/source/libs/luajit/Makefile.am
@@ -16,36 +16,11 @@ EXTRA_DIST += $(LUAJIT_TREE)-PATCHES
 dist-hook:
 	rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
 
-AM_CFLAGS = # $(WARNING_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES)
+AM_CFLAGS = -Wall
 
 SUBDIRS = native . include
 
-## host_flags = BUILDMODE=static CROSS=$(CROSS)
-## if WIN32
-## host_flags += TARGET_SYS=Windows
-## endif WIN32
-
-## noinst_DATA = luajit-build/src/libluajit.a
-
-## luajit-build/src/Makefile:
-## 	rm -rf luajit-build
-## 	$(MKDIR_P) luajit-build
-## 	cd luajit-build && cp -r $(abs_srcdir)/$(LUAJIT_TREE)/src src \
-## 	&& cp -r $(abs_srcdir)/$(LUAJIT_TREE)/dynasm dynasm \
-## 	&& chmod -R u+w src dynasm
-
-## native/build-flags: luajit-build/src/Makefile
-## 	cd native && $(MAKE) $(AM_MAKEFLAGS) build-flags
-
-## luajit-build/src/libluajit.a: native/build-flags
-## 	cat native/build-flags
-## 	cd luajit-build/src && \
-## 	  $(MAKE) $(AM_MAKEFLAGS) `if $(AM_V_P); then echo 'E=@: Q='; fi` \
-## 	  $(host_flags) $$build_flags
-
-## clean-local:
-## 	rm -rf luajit-build
-
 noinst_LIBRARIES = libluajit.a
 
 nodist_libluajit_a_SOURCES = \
@@ -151,7 +126,7 @@ lj_vm_obj.o lj_vm_asm.s: native/buildvm-stamp
 $(ljlib_sources):
 	@test -f $@ || { rm -f $@; \
 	  if $(AM_V_P); then echo "$(LN_S) $(srcdir)/$(LUAJIT_TREE)/src/$@ $@"; \
-	    else echo "  INST     $@"; fi; \
+	    else echo "  LINK     $@"; fi; \
 	  $(LN_S) $(srcdir)/$(LUAJIT_TREE)/src/$@ $@; } || exit 1
 
 CLEANFILES = $(HDRGEN) $(ljlib_sources) lj_vm_asm.s
diff --git a/Build/source/libs/luajit/Makefile.in b/Build/source/libs/luajit/Makefile.in
index 28bdc71d53e..a57665315c8 100644
--- a/Build/source/libs/luajit/Makefile.in
+++ b/Build/source/libs/luajit/Makefile.in
@@ -100,9 +100,10 @@ subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/lj-system.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-largefile.m4 \
+	$(top_srcdir)/../../m4/kpse-luajit-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -509,7 +510,6 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -545,6 +545,7 @@ LJHOST = @LJHOST@
 LJVM_MODE = @LJVM_MODE@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LUAJIT_DEFINES = @LUAJIT_DEFINES@
 LUAJIT_TREE = @LUAJIT_TREE@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -616,7 +617,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = $(LUAJIT_TREE) $(LUAJIT_TREE)-PATCHES
-AM_CFLAGS = # $(WARNING_CFLAGS)
+AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES)
+AM_CFLAGS = -Wall
 SUBDIRS = native . include
 noinst_LIBRARIES = libluajit.a
 nodist_libluajit_a_SOURCES = $(ljlib_sources) \
@@ -1618,7 +1620,7 @@ lj_vm_obj.o lj_vm_asm.s: native/buildvm-stamp
 $(ljlib_sources):
 	@test -f $@ || { rm -f $@; \
 	  if $(AM_V_P); then echo "$(LN_S) $(srcdir)/$(LUAJIT_TREE)/src/$@ $@"; \
-	    else echo "  INST     $@"; fi; \
+	    else echo "  LINK     $@"; fi; \
 	  $(LN_S) $(srcdir)/$(LUAJIT_TREE)/src/$@ $@; } || exit 1
 rebuild.stamp: $(rebuild_target)
 	echo timestamp >$@
diff --git a/Build/source/libs/luajit/aclocal.m4 b/Build/source/libs/luajit/aclocal.m4
index dc764432863..a49d8ace71e 100644
--- a/Build/source/libs/luajit/aclocal.m4
+++ b/Build/source/libs/luajit/aclocal.m4
@@ -1205,5 +1205,6 @@ AC_SUBST([am__untar])
 
 m4_include([m4/lj-system.m4])
 m4_include([../../m4/kpse-common.m4])
+m4_include([../../m4/kpse-largefile.m4])
+m4_include([../../m4/kpse-luajit-flags.m4])
 m4_include([../../m4/kpse-warnings.m4])
-m4_include([../../m4/kpse-win32.m4])
diff --git a/Build/source/libs/luajit/config.h.in b/Build/source/libs/luajit/config.h.in
index dd3b02c5fcf..d984cf0b150 100644
--- a/Build/source/libs/luajit/config.h.in
+++ b/Build/source/libs/luajit/config.h.in
@@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#undef HAVE_FSEEKO
+
 /* Name of package */
 #undef PACKAGE
 
@@ -23,3 +26,17 @@
 
 /* Version number of package */
 #undef VERSION
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+#undef _LARGEFILE_SOURCE
+
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
diff --git a/Build/source/libs/luajit/configure b/Build/source/libs/luajit/configure
index 2a00b62e158..6c02063186b 100755
--- a/Build/source/libs/luajit/configure
+++ b/Build/source/libs/luajit/configure
@@ -595,7 +595,6 @@ subdirs
 LUAJIT_TREE
 build_FALSE
 build_TRUE
-AM_CPPFLAGS
 LJVM_MODE
 PEOBJ_FALSE
 PEOBJ_TRUE
@@ -603,8 +602,7 @@ DASM_ARCH
 LJARCH
 LJHOST
 CPP
-WIN32_FALSE
-WIN32_TRUE
+LUAJIT_DEFINES
 LN_S
 RANLIB
 am__fastdepCCAS_FALSE
@@ -713,6 +711,7 @@ enable_silent_rules
 enable_maintainer_mode
 enable_dependency_tracking
 enable_compiler_warnings
+enable_largefile
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1356,6 +1355,7 @@ Optional Features:
   --enable-compiler-warnings=[no|min|yes|max|all]
                           Turn on compiler warnings [default: yes if
                           maintainer-mode, min otherwise]
+  --disable-largefile     omit support for large files
 
 Some influential environment variables:
   CC          C compiler command
@@ -4788,16 +4788,84 @@ if test "$ac_res" != no; then :
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
-$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
-if ${kpse_cv_have_win32+:} false; then :
+LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT
+
+
+# Check whether --enable-largefile was given.
+if test "${enable_largefile+set}" = set; then :
+  enableval=$enable_largefile;
+fi
+
+if test "$enable_largefile" != no; then
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
+  ac_cv_sys_largefile_CC=no
+     if test "$GCC" != yes; then
+       ac_save_CC=$CC
+       while :; do
+	 # IRIX 6.2 and later do not support large files by default,
+	 # so use the C compiler's -n32 option if that helps.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 CC="$CC -n32"
+	 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_largefile_CC=' -n32'; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+	 break
+       done
+       CC=$ac_save_CC
+       rm -f conftest.$ac_ext
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
+  if test "$ac_cv_sys_largefile_CC" != no; then
+    CC=$CC$ac_cv_sys_largefile_CC
+  fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+if ${ac_cv_sys_file_offset_bits+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  while :; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifndef WIN32
-  choke me
-#endif
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
 int
 main ()
 {
@@ -4807,11 +4875,21 @@ main ()
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_file_offset_bits=no; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#ifndef __MINGW32__
-  choke me
-#endif
+#define _FILE_OFFSET_BITS 64
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
 int
 main ()
 {
@@ -4821,30 +4899,189 @@ main ()
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  kpse_cv_have_win32=mingw32
-else
-  kpse_cv_have_win32=native
+  ac_cv_sys_file_offset_bits=64; break
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_file_offset_bits=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+case $ac_cv_sys_file_offset_bits in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  if test $ac_cv_sys_file_offset_bits = unknown; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+if ${ac_cv_sys_large_files+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  kpse_cv_have_win32=no
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=no; break
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGE_FILES 1
+#include <sys/types.h>
+ /* Check that off_t can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+    since some C++ compilers masquerading as C compilers
+    incorrectly reject 9223372036854775807.  */
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
+		       && LARGE_OFF_T % 2147483647 == 1)
+		      ? 1 : -1];
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_sys_large_files=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  ac_cv_sys_large_files=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
+$as_echo "$ac_cv_sys_large_files" >&6; }
+case $ac_cv_sys_large_files in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGE_FILES $ac_cv_sys_large_files
+_ACEOF
+;;
+esac
+rm -rf conftest*
+  fi
+
+
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
-$as_echo "$kpse_cv_have_win32" >&6; }
 
- if test "x$kpse_cv_have_win32" != xno; then
-  WIN32_TRUE=
-  WIN32_FALSE='#'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+if ${ac_cv_sys_largefile_source+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  WIN32_TRUE='#'
-  WIN32_FALSE=
+  while :; do
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_sys_largefile_source=no; break
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define _LARGEFILE_SOURCE 1
+#include <sys/types.h> /* for off_t */
+     #include <stdio.h>
+int
+main ()
+{
+int (*fp) (FILE *, off_t, int) = fseeko;
+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_sys_largefile_source=1; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  ac_cv_sys_largefile_source=unknown
+  break
+done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
+$as_echo "$ac_cv_sys_largefile_source" >&6; }
+case $ac_cv_sys_largefile_source in #(
+  no | unknown) ;;
+  *)
+cat >>confdefs.h <<_ACEOF
+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
+_ACEOF
+;;
+esac
+rm -rf conftest*
+
+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
+# in glibc 2.1.3, but that breaks too many other things.
+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+if test $ac_cv_sys_largefile_source != unknown; then
 
+$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
+
+fi
+
+if test "x$enable_largefile" != xno; then
+  case $ac_cv_sys_file_offset_bits in #(
+  no) :
+     ;; #(
+  unknown) :
+    case $ac_cv_sys_large_files in #(
+  no | unknown) :
+     ;; #(
+  *) :
+    LUAJIT_DEFINES="$LUAJIT_DEFINES -D_LARGE_FILES" ;;
+esac ;; #(
+  *) :
+    LUAJIT_DEFINES="$LUAJIT_DEFINES -D_FILE_OFFSET_BITS=64" ;;
+esac
+fi
+case $ac_cv_sys_largefile_source in #(
+  no | unknown) :
+     ;; #(
+  *) :
+    LUAJIT_DEFINES="$LUAJIT_DEFINES -D_LARGEFILE_SOURCE" ;;
+esac
 
 
-AM_CPPFLAGS='-I$(srcdir)/LuaJIT-2.0.2/src -DLUAJIT_ENABLE_LUA52COMPAT'
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4996,7 +5233,7 @@ case $host_os in #(
     LJHOST='Other' ;;
 esac
 lj_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS -I$srcdir/LuaJIT-2.0.2/src -DLUAJIT_ENABLE_LUA52COMPAT -dM"
+CPPFLAGS="$CPPFLAGS -I$srcdir/LuaJIT-2.0.2/src $LUAJIT_DEFINES -dM"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <lj_arch.h>
@@ -5009,7 +5246,7 @@ if grep 'LJ_TARGET_X64 ' conftest.i >/dev/null 2>&1; then :
   LJARCH=x64
 elif grep 'LJ_TARGET_X86 ' conftest.i >/dev/null 2>&1; then :
   LJARCH=x86
-         AM_CPPFLAGS="$AM_CPPFLAGS -march=i686"
+         LUAJIT_DEFINES="$LUAJIT_DEFINES -march=i686"
 elif grep 'LJ_TARGET_ARM ' conftest.i >/dev/null 2>&1; then :
   LJARCH=arm
 elif grep 'LJ_TARGET_PPC ' conftest.i >/dev/null 2>&1; then :
@@ -5027,7 +5264,7 @@ fi
 if grep 'LJ_TARGET_PS3 1'conftest.i >/dev/null 2>&1; then :
   LJHOST='PS3'
          echo '-D__CELLOS_LV2__' >>native_flags
-         AM_CPPFLAGS="$AM_CPPFLAGS -DLUAJIT_USE_SYSMALLOC"
+         LUAJIT_DEFINES="$LUAJIT_DEFINES -DLUAJIT_USE_SYSMALLOC"
 fi
 if grep 'LJ_NO_UNWIND 1'conftest.i >/dev/null 2>&1; then :
   echo '-DLUAJIT_NO_UNWIND' >>native_flags
@@ -5036,7 +5273,7 @@ echo "-DLUAJIT_TARGET=LUAJIT_ARCH_$LJARCH" >>native_flags
 if grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1; then :
   echo '-D P64' >>dynasm_flags
          if test "x$LJHOST" = xLinux; then :
-  AM_CPPFLAGS="$AM_CPPFLAGS -DMAP_32BIT=0x40"
+  LUAJIT_DEFINES="$LUAJIT_DEFINES -DMAP_32BIT=0x40"
 fi
 fi
 if grep 'LJ_HASJIT 1' conftest.i >/dev/null 2>&1; then :
@@ -5111,7 +5348,7 @@ CPPFLAGS=$lj_save_CPPFLAGS
 case $LJHOST in #(
   Windows) :
     LJVM_MODE=peobj
-                    AM_CPPFLAGS="$AM_CPPFLAGS -malign-double" ;; #(
+                    LUAJIT_DEFINES="$LUAJIT_DEFINES -malign-double" ;; #(
   Darwin | iOS) :
     LJVM_MODE=machasm ;; #(
   *) :
@@ -5127,7 +5364,6 @@ fi
 
 
 
-
  if test "x$enable_build" != xno; then
   build_TRUE=
   build_FALSE='#'
@@ -5305,10 +5541,6 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
-  as_fn_error $? "conditional \"WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${PEOBJ_TRUE}" && test -z "${PEOBJ_FALSE}"; then
   as_fn_error $? "conditional \"PEOBJ\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/Build/source/libs/luajit/configure.ac b/Build/source/libs/luajit/configure.ac
index 40ab8581032..2b0bcda59bd 100644
--- a/Build/source/libs/luajit/configure.ac
+++ b/Build/source/libs/luajit/configure.ac
@@ -24,18 +24,17 @@ AC_PROG_LN_S
 
 AC_SEARCH_LIBS([sqrt], [m])
 
-KPSE_COND_WIN32
+KPSE_LUAJIT_DEFINES
+KPSE_LARGEFILE([LUAJIT_DEFINES])
 
-AM_CPPFLAGS=['-I$(srcdir)/LuaJIT-]luajit_version[/src -DLUAJIT_ENABLE_LUA52COMPAT']
 LJ_ARCH()
 AS_CASE([$LJHOST],
         [Windows], [LJVM_MODE=peobj
-                    AM_CPPFLAGS="$AM_CPPFLAGS -malign-double"],
+                    LUAJIT_DEFINES="$LUAJIT_DEFINES -malign-double"],
         [Darwin | iOS], [LJVM_MODE=machasm],
                         [LJVM_MODE=elfasm])
 AM_CONDITIONAL([PEOBJ], [test "x$LJVM_MODE" = xpeobj])
 AC_SUBST([LJVM_MODE])
-AC_SUBST([AM_CPPFLAGS])
 
 AM_CONDITIONAL([build], [test "x$enable_build" != xno])
 
diff --git a/Build/source/libs/luajit/include/Makefile.in b/Build/source/libs/luajit/include/Makefile.in
index b1e1cb4724e..8a3e8a42d92 100644
--- a/Build/source/libs/luajit/include/Makefile.in
+++ b/Build/source/libs/luajit/include/Makefile.in
@@ -83,9 +83,10 @@ subdir = include
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/lj-system.m4 \
 	$(top_srcdir)/../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../m4/kpse-largefile.m4 \
+	$(top_srcdir)/../../m4/kpse-luajit-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -115,7 +116,6 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -151,6 +151,7 @@ LJHOST = @LJHOST@
 LJVM_MODE = @LJVM_MODE@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LUAJIT_DEFINES = @LUAJIT_DEFINES@
 LUAJIT_TREE = @LUAJIT_TREE@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
diff --git a/Build/source/libs/luajit/m4/lj-system.m4 b/Build/source/libs/luajit/m4/lj-system.m4
index 3031012b7c6..3af3f5f4d86 100644
--- a/Build/source/libs/luajit/m4/lj-system.m4
+++ b/Build/source/libs/luajit/m4/lj-system.m4
@@ -16,7 +16,7 @@ AS_IF([grep 'LJ_TARGET_X64 ' conftest.i >/dev/null 2>&1],
         [LJARCH=x64],
       [grep 'LJ_TARGET_X86 ' conftest.i >/dev/null 2>&1],
         [LJARCH=x86
-         AM_CPPFLAGS="$AM_CPPFLAGS -march=i686"],
+         LUAJIT_DEFINES="$LUAJIT_DEFINES -march=i686"],
       [grep 'LJ_TARGET_ARM ' conftest.i >/dev/null 2>&1],
         [LJARCH=arm],
       [grep 'LJ_TARGET_PPC ' conftest.i >/dev/null 2>&1],
@@ -31,14 +31,14 @@ AS_IF([grep 'LJ_TARGET_X64 ' conftest.i >/dev/null 2>&1],
 AS_IF([grep 'LJ_TARGET_PS3 1'conftest.i >/dev/null 2>&1],
         [LJHOST='PS3'
          echo '-D__CELLOS_LV2__' >>native_flags
-         AM_CPPFLAGS="$AM_CPPFLAGS -DLUAJIT_USE_SYSMALLOC"])
+         LUAJIT_DEFINES="$LUAJIT_DEFINES -DLUAJIT_USE_SYSMALLOC"])
 AS_IF([grep 'LJ_NO_UNWIND 1'conftest.i >/dev/null 2>&1],
         [echo '-DLUAJIT_NO_UNWIND' >>native_flags])
 echo "-DLUAJIT_TARGET=LUAJIT_ARCH_$LJARCH" >>native_flags
 AS_IF([grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1],
         [echo '-D P64' >>dynasm_flags
          AS_IF([test "x$LJHOST" = xLinux],
-               [AM_CPPFLAGS="$AM_CPPFLAGS -DMAP_32BIT=0x40"])])
+               [LUAJIT_DEFINES="$LUAJIT_DEFINES -DMAP_32BIT=0x40"])])
 AS_IF([grep 'LJ_HASJIT 1' conftest.i >/dev/null 2>&1],
         [echo '-D JIT' >>dynasm_flags])
 AS_IF([grep 'LJ_HASFFI 1' conftest.i >/dev/null 2>&1],
@@ -88,7 +88,7 @@ AS_CASE([$host_os],
         [linux*], [LJHOST='Linux'],
                   [LJHOST='Other'])
 lj_save_CPPFLAGS=$CPPFLAGS
-CPPFLAGS="$CPPFLAGS -I$srcdir/LuaJIT-luajit_version/src -DLUAJIT_ENABLE_LUA52COMPAT -dM"
+CPPFLAGS="$CPPFLAGS -I$srcdir/LuaJIT-luajit_version/src $LUAJIT_DEFINES -dM"
 AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <lj_arch.h>]])],
                   [_LJ_ARCH],
                   [AC_MSG_ERROR([Sorry, can not preprocess <lj_arch.h>])])
diff --git a/Build/source/libs/luajit/native/Makefile.am b/Build/source/libs/luajit/native/Makefile.am
index 55e159a2adf..07fa7771cfe 100644
--- a/Build/source/libs/luajit/native/Makefile.am
+++ b/Build/source/libs/luajit/native/Makefile.am
@@ -4,17 +4,7 @@
 ## You may freely use, modify and/or distribute this file.
 ##
 AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src
-AM_CFLAGS = # $(WARNING_CFLAGS)
-
-noinst_DATA = build-flags
-
-build_flags = HOST_CC='$(CC)'
-build_flags += HOST_CFLAGS='$(CFLAGS)'
-build_flags += HOST_LDFLAGS='$(LDFLAGS)'
-build_flags += HOST_LIBS='$(LIBS)'
-
-build-flags: Makefile
-	$(AM_V_GEN)echo "$(build_flags)" >$@
+AM_CFLAGS = -Wall
 
 EXTRA_PROGRAMS = buildvm minilua
 
@@ -23,7 +13,7 @@ all-local: buildvm-stamp
 buildvm-stamp: buildvm$(EXEEXT)
 	$(AM_V_at)echo timestamp >$@
 
-buildvm_CPPFLAGS = $(AM_CPPFLAGS) -DLUAJIT_ENABLE_LUA52COMPAT `cat ../native_flags`
+buildvm_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_DEFINES) `cat ../native_flags`
 nodist_buildvm_SOURCES = \
 	@LUAJIT_TREE@/src/host/buildvm.c \
 	@LUAJIT_TREE@/src/host/buildvm.h \
@@ -31,7 +21,7 @@ nodist_buildvm_SOURCES = \
 	@LUAJIT_TREE@/src/host/buildvm_fold.c \
 	@LUAJIT_TREE@/src/host/buildvm_lib.c \
 	@LUAJIT_TREE@/src/host/buildvm_peobj.c
-$(buildvm_OBJECTS): $(nodist_buildvm_SOURCES) buildvm_arch.h
+$(buildvm_OBJECTS): buildvm_arch.h
 
 buildvm_arch.h: minilua$(EXEEXT) $(LUAJIT_TREE)/dynasm/dynasm.lua
 	$(AM_V_GEN)./minilua $(srcdir)/$(LUAJIT_TREE)/dynasm/dynasm.lua \
@@ -40,7 +30,6 @@ buildvm_arch.h: minilua$(EXEEXT) $(LUAJIT_TREE)/dynasm/dynasm.lua
 
 nodist_minilua_SOURCES = \
 	@LUAJIT_TREE@/src/host/minilua.c
-$(minilua_OBJECTS): $(nodist_minilua_SOURCES)
 minilua_LDFLAGS = $(MATH_LIB)
 
 CLEANFILES = buildvm-stamp buildvm_arch.h
diff --git a/Build/source/libs/luajit/native/Makefile.in b/Build/source/libs/luajit/native/Makefile.in
index 8bf234128e3..4e90661f560 100644
--- a/Build/source/libs/luajit/native/Makefile.in
+++ b/Build/source/libs/luajit/native/Makefile.in
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -91,6 +90,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../../build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../../m4/kpse-common.m4 \
+	$(top_srcdir)/../../../m4/kpse-luajit-flags.m4 \
 	$(top_srcdir)/../../../m4/kpse-warnings.m4 \
 	$(top_srcdir)/../version.ac $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -154,7 +154,6 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-DATA = $(noinst_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -223,6 +222,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LUAJIT_DEFINES = @LUAJIT_DEFINES@
 LUAJIT_TREE = @LUAJIT_TREE@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -285,11 +285,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src
-AM_CFLAGS = # $(WARNING_CFLAGS)
-noinst_DATA = build-flags
-build_flags = HOST_CC='$(CC)' HOST_CFLAGS='$(CFLAGS)' \
-	HOST_LDFLAGS='$(LDFLAGS)' HOST_LIBS='$(LIBS)'
-buildvm_CPPFLAGS = $(AM_CPPFLAGS) -DLUAJIT_ENABLE_LUA52COMPAT `cat ../native_flags`
+AM_CFLAGS = -Wall
+buildvm_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_DEFINES) `cat ../native_flags`
 nodist_buildvm_SOURCES = \
 	@LUAJIT_TREE@/src/host/buildvm.c \
 	@LUAJIT_TREE@/src/host/buildvm.h \
@@ -714,7 +711,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(DATA) config.h all-local
+all-am: Makefile config.h all-local
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -840,20 +837,16 @@ uninstall-am:
 	uninstall-am
 
 
-build-flags: Makefile
-	$(AM_V_GEN)echo "$(build_flags)" >$@
-
 all-local: buildvm-stamp
 
 buildvm-stamp: buildvm$(EXEEXT)
 	$(AM_V_at)echo timestamp >$@
-$(buildvm_OBJECTS): $(nodist_buildvm_SOURCES) buildvm_arch.h
+$(buildvm_OBJECTS): buildvm_arch.h
 
 buildvm_arch.h: minilua$(EXEEXT) $(LUAJIT_TREE)/dynasm/dynasm.lua
 	$(AM_V_GEN)./minilua $(srcdir)/$(LUAJIT_TREE)/dynasm/dynasm.lua \
 	  `cat ../dynasm_flags` \
 	  -o $@ $(srcdir)/$(LUAJIT_TREE)/src/vm_$(DASM_ARCH).dasc
-$(minilua_OBJECTS): $(nodist_minilua_SOURCES)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/Build/source/libs/luajit/native/aclocal.m4 b/Build/source/libs/luajit/native/aclocal.m4
index b42450882df..62977e15511 100644
--- a/Build/source/libs/luajit/native/aclocal.m4
+++ b/Build/source/libs/luajit/native/aclocal.m4
@@ -1184,4 +1184,5 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([../../../m4/kpse-common.m4])
+m4_include([../../../m4/kpse-luajit-flags.m4])
 m4_include([../../../m4/kpse-warnings.m4])
diff --git a/Build/source/libs/luajit/native/configure b/Build/source/libs/luajit/native/configure
index 93a634118db..35f1d3b9b1a 100755
--- a/Build/source/libs/luajit/native/configure
+++ b/Build/source/libs/luajit/native/configure
@@ -592,6 +592,7 @@ LIBOBJS
 LUAJIT_TREE
 DASM_ARCH
 MATH_LIB
+LUAJIT_DEFINES
 LN_S
 WARNING_CFLAGS
 am__fastdepCC_FALSE
@@ -4359,6 +4360,10 @@ $as_echo "no, using $LN_S" >&6; }
 fi
 
 
+LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT
+
+
+
 lj_save_LIBS=$LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pow" >&5
 $as_echo_n "checking for library containing pow... " >&6; }
diff --git a/Build/source/libs/luajit/native/configure.ac b/Build/source/libs/luajit/native/configure.ac
index 24c97b91ebf..f023c94b15e 100644
--- a/Build/source/libs/luajit/native/configure.ac
+++ b/Build/source/libs/luajit/native/configure.ac
@@ -18,6 +18,8 @@ KPSE_BASIC([luajit native])
 AC_PROG_CC
 AC_PROG_LN_S
 
+KPSE_LUAJIT_DEFINES
+
 lj_save_LIBS=$LIBS
 AC_SEARCH_LIBS([pow], [m])
 LIBS=$lj_save_LIBS
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index de782abd916..4fa0830eb63 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-luajit-flags.m4: Simplify.
+
 2014-02-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-luajit-flags.m4: Adapt to proxy build system.
diff --git a/Build/source/m4/kpse-luajit-flags.m4 b/Build/source/m4/kpse-luajit-flags.m4
index 8ab1a52bb57..5498d7158c3 100644
--- a/Build/source/m4/kpse-luajit-flags.m4
+++ b/Build/source/m4/kpse-luajit-flags.m4
@@ -21,15 +21,5 @@ _KPSE_LIB_FLAGS([luajit], [luajit], [tree],
 # 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/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 73b6d2151b1..203b1659ab6 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -3002,8 +3002,7 @@ libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) \
 libluatex_a_CPPFLAGS = $(libluatex_a_preflags) $(LUA_INCLUDES) \
 	-I$(srcdir)/luatexdir/fake
 libluajittex_a_CPPFLAGS = $(libluatex_a_preflags) $(LUAJIT_INCLUDES) \
-	$(LUAJIT_DEFINES) -DLuajitTeX -DLUAJIT_ENABLE_LUA52COMPAT \
-	-I$(srcdir)/luatexdir/fake
+	$(LUAJIT_DEFINES) -DLuajitTeX -I$(srcdir)/luatexdir/fake
 libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
 libluajittex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
 dist_libluatex_a_SOURCES = \
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index e68d4ffa486..3740595932a 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18661,74 +18661,6 @@ fi
 
 LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT
 
-if test "x$kpse_cv_have_win32" = xno; then
-  LUAJIT_DEFINES="$LUAJIT_DEFINES -DLUA_USE_POSIX"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
-$as_echo_n "checking for library containing dlopen... " >&6; }
-if ${ac_cv_search_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' dl; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_dlopen=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_dlopen+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_dlopen+:} false; then :
-
-else
-  ac_cv_search_dlopen=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5
-$as_echo "$ac_cv_search_dlopen" >&6; }
-ac_res=$ac_cv_search_dlopen
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-  if test "x$ac_cv_search_dlopen" != xno; then
-    ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  LUAJIT_DEFINES="$LUAJIT_DEFINES -DLUA_USE_DLOPEN"
-fi
-
-
-  fi
-fi
 
 LIBS=$kpse_save_LIBS
 if test "x$kpse_cv_have_win32" = xno; then
diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am
index b1c7876524c..1f48d8006f5 100644
--- a/Build/source/texk/web2c/luatexdir/am/libluatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am
@@ -23,7 +23,7 @@ libluatex_a_preflags += -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' -I$(srcdir)/sync
 
 libluatex_a_CPPFLAGS = $(libluatex_a_preflags) $(LUA_INCLUDES)
 libluajittex_a_CPPFLAGS = $(libluatex_a_preflags) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES)
-libluajittex_a_CPPFLAGS += -DLuajitTeX -DLUAJIT_ENABLE_LUA52COMPAT
+libluajittex_a_CPPFLAGS += -DLuajitTeX
 
 libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
 libluajittex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)