Skip to content

Commit 7a8ef98

Browse files
committed
Merge pull request #32 from ocsigen/opt-camlp4
Make camlp4 an optionnal dependency.
2 parents 90d7524 + 6168f3b commit 7a8ef98

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

_oasis

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ Description:
2828
elt = XML.elt and type 'a attrib = XML.attrib with 'a set to
2929
appropriate polymorphic variants.
3030

31+
Flag syntax
32+
Description: Build the camlp4 syntax extension.
33+
Default: true
34+
3135
Library tyxml
3236
FindlibName: tyxml
3337
Path: lib
@@ -67,6 +71,7 @@ Library tyxml_f
6771
Html5_f
6872

6973
Library pa_tyxml
74+
Build$: flag(syntax)
7075
FindlibName: syntax
7176
FindlibParent: tyxml
7277
XMETAType: syntax
@@ -85,6 +90,7 @@ Library pa_tyxml
8590
Pack: true
8691

8792
Library tymlx_p
93+
Build$: flag(syntax)
8894
FindlibName: parser
8995
FindlibParent: tyxml
9096
XMETADescription:

opam/opam

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
opam-version: "1"
22
maintainer: "[email protected]"
33
build: [
4-
["%{make}%"]
5-
["%{make}%" "install"]
4+
["./configure"
5+
"--%{camlp4:enable}%-syntax"
6+
"--prefix" prefix]
7+
[make]
8+
[make "install"]
69
]
710
remove: [
811
["ocamlfind" "remove" "tyxml"]
912
]
1013
depends: [
1114
"ocamlfind"
1215
]
16+
depopts: [
17+
"camlp4"
18+
]

0 commit comments

Comments
 (0)