diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-12-05 10:46:22 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-12-05 10:46:22 +0000 |
commit | 7a799b19e715358bd9ef31854d30555fd55df73f (patch) | |
tree | 64272e077f8d4cfbf903c0ed2b911e5ccff74b95 /Build/source/m4 | |
parent | cf7e21cca95784d0744759e2a05f2700fe45778d (diff) |
Build luajit as (possibly shared) Libtool library
git-svn-id: svn://tug.org/texlive/trunk@35750 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r-- | Build/source/m4/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/m4/kpse-luajit-flags.m4 | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog index 4dd0c4ce8b5..1c8a9e2450a 100644 --- a/Build/source/m4/ChangeLog +++ b/Build/source/m4/ChangeLog @@ -1,3 +1,7 @@ +2014-12-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kpse-luajit-flags.m4: LuaJIT is now a Libtool library. + 2014-12-02 Peter Breitenlohner <peb@mppmu.mpg.de> * kpse-visibility.m4: Also try -fvisibility-inlines-hidden. diff --git a/Build/source/m4/kpse-luajit-flags.m4 b/Build/source/m4/kpse-luajit-flags.m4 index 21e1e32b603..e846c3087f2 100644 --- a/Build/source/m4/kpse-luajit-flags.m4 +++ b/Build/source/m4/kpse-luajit-flags.m4 @@ -8,17 +8,17 @@ # KPSE_LUAJIT_FLAGS # ----------------- # Set the make variables LUAJIT_INCLUDES and LUAJIT_LIBS to the CPPFLAGS and -# LIBS required for the `-lluajit' library in libs/luajit/ of the TL tree. +# LIBS required for the `-ltexluajit' library in libs/luajit/ of the TL tree. AC_DEFUN([KPSE_LUAJIT_FLAGS], [dnl -_KPSE_LIB_FLAGS([luajit], [luajit], [tree], - [-IBLD/libs/luajit/include], [BLD/libs/luajit/libluajit.a], [], +_KPSE_LIB_FLAGS([luajit], [texluajit], [lt tree], + [-IBLD/libs/luajit/include], [BLD/libs/luajit/libtexluajit.la], [], [], [${top_builddir}/../../libs/luajit/include/luajit.h])[]dnl ]) # KPSE_LUAJIT_FLAGS # KPSE_LUAJIT_DEFINES # ------------------- # Set the make variable LUAJIT_DEFINES to the CPPFLAGS required when -# compiling or using the `-lluajit' library. +# compiling or using the `-ltexluajit' library. # Set the make variable LUAJIT_LDEXTRA to the LDFLAGS required when # linking with the `-lluajit' library. AC_DEFUN([KPSE_LUAJIT_DEFINES], [dnl |