Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add lua53 flag.

Browse source 
It is false by default.  If set to true, compile with hslua 2.1
and Lua 5.3, otherwise hslua 2.2 and Lua 5.4.
This commit is contained in:
John MacFarlane 2022-03-28 10:06:52 -07:00
parent 35350fac85
commit f5129666e7
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
INSTALL.md
View file

@ -310,8 +310,7 @@ You will need cabal version 2.0 or higher.
- `embed_data_files`: embed all data files into the binary (default no). - `embed_data_files`: embed all data files into the binary (default no).
This is helpful if you want to create a relocatable binary. This is helpful if you want to create a relocatable binary.
- `https`: enable support for downloading resources over https - `lua53`: embed support for Lua 5.3 instead of 5.4.
(using the `http-client` and `http-client-tls` libraries).
3. Build: 3. Build:

10
pandoc.cabal
View file

@ -420,6 +420,10 @@ flag embed_data_files
Description: Embed data files in binary for relocatable executable. Description: Embed data files in binary for relocatable executable.
Default: False Default: False
flag lua53
Description: Embed Lua 5.3 instead of 5.4.
Default: False
flag trypandoc flag trypandoc
Description: Build trypandoc cgi executable. Description: Build trypandoc cgi executable.
Default: False Default: False
@ -484,7 +488,6 @@ library
file-embed >= 0.0 && < 0.1, file-embed >= 0.0 && < 0.1,
filepath >= 1.1 && < 1.5, filepath >= 1.1 && < 1.5,
haddock-library >= 1.10 && < 1.11, haddock-library >= 1.10 && < 1.11,
hslua >= 2.1 && < 2.3,
hslua-marshalling >= 2.1 && < 2.3, hslua-marshalling >= 2.1 && < 2.3,
hslua-module-doclayout>= 1.0.2 && < 1.1, hslua-module-doclayout>= 1.0.2 && < 1.1,
hslua-module-path >= 1.0 && < 1.1, hslua-module-path >= 1.0 && < 1.1,
@ -529,6 +532,11 @@ library
zlib >= 0.5 && < 0.7 zlib >= 0.5 && < 0.7
if !os(windows) if !os(windows)
build-depends: unix >= 2.4 && < 2.8 build-depends: unix >= 2.4 && < 2.8
if flag(lua53)
build-depends: hslua >= 2.1 && < 2.2,
hslua-aeson >= 2.1 && < 2.3
else
build-depends: hslua >= 2.2 && < 2.3
if flag(embed_data_files) if flag(embed_data_files)
cpp-options: -DEMBED_DATA_FILES cpp-options: -DEMBED_DATA_FILES
other-modules: Text.Pandoc.Data other-modules: Text.Pandoc.Data