summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/configure.ac
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-24 11:25:58 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-24 11:25:58 +0000
commitb3500af8f475211c508744d8685510d9780b8045 (patch)
tree71978074c0861a679c99805848e43b68bf471d8e /Build/source/texk/web2c/configure.ac
parenta2abec3329d1437cb6c7b309325d64f65ddb962f (diff)
LuaTeX and Mpost: Move texk/luatexdir/lua52 => libs/lua52
git-svn-id: svn://tug.org/texlive/trunk@30900 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/configure.ac')
-rw-r--r--Build/source/texk/web2c/configure.ac20
1 files changed, 9 insertions, 11 deletions
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index f6d2763c8c3..5a36dd1e1cb 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -91,28 +91,25 @@ if test "x$enable_ipc" = xyes; then
ipc_socketlibs=$socketlibs
AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.])
fi
+
# We may need additional libraries for luaTeX.
# On Solaris -lnsl for gethostbyname(), -lrt for nanosleep(),
# and maybe -lresolv for inet_aton().
lua_socketlibs=$socketlibs
+kpse_save_LIBS=$LIBS
+KPSE_LUA52_DEFINES
+LIBS=$kpse_save_LIBS
if test "x$kpse_cv_have_win32" = xno; then
- kpse_save_LIBS=$LIBS
AC_SEARCH_LIBS([gethostbyname], [nsl])
AC_SEARCH_LIBS([hstrerror], [resolv])
AC_SEARCH_LIBS([inet_aton], [resolv])
LIBS=$kpse_save_LIBS
AC_SEARCH_LIBS([nanosleep], [rt])
LIBS=$kpse_save_LIBS
- AC_SEARCH_LIBS([dlopen], [dl])
- if test "x$ac_cv_search_dlopen" != xno; then
- AC_CHECK_HEADERS([dlfcn.h])
- if test "x$ac_cv_header_dlfcn_h" = xyes; then
- if test "x$ac_cv_search_dlopen" != "xnone required"; then
- lua_socketlibs="$lua_socketlibs $ac_cv_search_dlopen"
- fi
- fi
- fi
- LIBS=$kpse_save_LIBS
+ AS_CASE([$ac_cv_header_dlfcn_h],
+ [yes], [AS_CASE([$ac_cv_search_dlopen],
+ [no*], [],
+ [lua_socketlibs="$lua_socketlibs $ac_cv_search_dlopen"])])
AS_CASE([$ac_cv_search_hstrerror],
["none required"], [],
[no], [WEB2C_DISABLE([luatex], [no hstrerror()])],
@@ -272,6 +269,7 @@ AC_TYPE_SIGNAL
KPSE_KPATHSEA_FLAGS
KPSE_PTEXENC_FLAGS
KPSE_ZLIB_FLAGS
+KPSE_LUA52_FLAGS
KPSE_LIBPNG_FLAGS
KPSE_FREETYPE2_FLAGS
KPSE_PIXMAN_FLAGS