summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-14 13:25:59 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-14 13:25:59 +0000
commit48d6f6d3532593420a7e42cee26296b7d3e9aec8 (patch)
tree5aff94c31734f5eef393aa831bd043af157b8d2b /Build/source/texk
parentadd090f0faa938bd57bf9961726154f7ab06a3a3 (diff)
libs/luajit: Further simplify the build system
git-svn-id: svn://tug.org/texlive/trunk@32966 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/Makefile.in3
-rwxr-xr-xBuild/source/texk/web2c/configure68
-rw-r--r--Build/source/texk/web2c/luatexdir/am/libluatex.am2
3 files changed, 2 insertions, 71 deletions
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)