summaryrefslogtreecommitdiff
path: root/Build/source/libs/luajit/configure.ac
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-18 11:23:43 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-06-18 11:23:43 +0000
commitc594597e3480253f361154c71491adf03bc896d3 (patch)
tree4f656c0861c6ccf00118df41fc5e224bfc4e31b9 /Build/source/libs/luajit/configure.ac
parent352dcc581b20e25d7cc394cf602b3617cd305369 (diff)
LuaTeX: Somewhat better handling of Lua52/LuaJIT
git-svn-id: svn://tug.org/texlive/trunk@34278 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/luajit/configure.ac')
-rw-r--r--Build/source/libs/luajit/configure.ac13
1 files changed, 3 insertions, 10 deletions
diff --git a/Build/source/libs/luajit/configure.ac b/Build/source/libs/luajit/configure.ac
index 38ba43f560e..9d3f891d75d 100644
--- a/Build/source/libs/luajit/configure.ac
+++ b/Build/source/libs/luajit/configure.ac
@@ -15,7 +15,7 @@ AC_CONFIG_MACRO_DIRS([../../m4 m4])
KPSE_BASIC([luajit])
-AC_CANONICAL_HOST
+KPSE_CANONICAL_HOST
AC_PROG_CC
AM_PROG_AS
@@ -62,16 +62,9 @@ AC_CONFIG_HEADERS([config.h])
AC_CONFIG_FILES([Makefile include/Makefile])
-AC_CONFIG_SUBDIRS([native])
-
dnl Pass DASM_ARCH to the subdirectory native,
dnl which must be configured for the build system.
-dnl When cross compiling, can not share the cache file with the subdirectory!
-AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args DASM_ARCH=$DASM_ARCH"
-AS_IF([test "x$cross_compiling" = xyes],
- [cache_file=/dev/null
- ac_configure_args="$ac_configure_args --host='$kpse_build_alias' \
- CC='$BUILDCC' CPPFLAGS='$BUILDCPPFLAGS'\
- CFLAGS='$BUILDCFLAGS' LDFLAGS='$BUILDLDFLAGS'"])])
+AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args DASM_ARCH=$DASM_ARCH"])
+KPSE_NATIVE_SUBDIRS([native])
AC_OUTPUT