diff --git a/.gitmodules b/.gitmodules index ca3c1c64f..53a902eeb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "subprojects/commonmark-legacy"] path = subprojects/commonmark-legacy url = https://github.com/urbit/commonmark-legacy.git -[submodule "subprojects/http-parser-legacy"] - path = subprojects/http-parser-legacy - url = https://github.com/urbit/http-parser-legacy.git [submodule "subprojects/ed25519"] path = subprojects/ed25519 url = https://github.com/urbit/ed25519.git @@ -19,3 +16,6 @@ [submodule "subprojects/libuv"] path = subprojects/libuv url = https://github.com/urbit/libuv.git +[submodule "subprojects/h2o"] + path = subprojects/libh2o + url = https://github.com/urbit/h2o.git diff --git a/meson.build b/meson.build index b26e29332..eff66da1c 100644 --- a/meson.build +++ b/meson.build @@ -302,9 +302,9 @@ urbitscrypt_dep = dependency('libscrypt', version: '>=0.1.21', fallback: ['libsc ed25519_dep = dependency('ed25519', version: '>=0.1.0', fallback: ['ed25519', 'ed25519_dep']) murmur3_dep = dependency('murmur3', version: '>=0.1.0', fallback: ['murmur3', 'murmur3_dep']) -http_parser_dep = dependency('http-parser', version: '0.1.0', fallback: ['http-parser-legacy', 'http_parser_dep']) softfloat3_dep = dependency('softfloat3', version: '>=3.0.0', fallback: ['softfloat3', 'softfloat3_dep']) libuv_dep = dependency('libuv', version: '>=1.8.0', fallback:['libuv', 'libuv_dep']) +libh2o_dep = dependency('libh2o', version: '>=0.13.3', fallback: ['libh2o', 'libh2o_dep']) opt_flags = [] if get_option('debug') @@ -321,12 +321,12 @@ link_args: os_link_flags, dependencies: [openssl_dep, curl_dep, libuv_dep, + libh2o_dep, cmark_dep, gmp_dep, sigsegv_dep, urbitscrypt_dep, ed25519_dep, murmur3_dep, - http_parser_dep, softfloat3_dep] + os_deps, install: true) diff --git a/subprojects/http-parser-legacy b/subprojects/http-parser-legacy deleted file mode 160000 index 90d2cd1a9..000000000 --- a/subprojects/http-parser-legacy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 90d2cd1a9049a93c291b604fc3c9c4c84cf9bfe2 diff --git a/subprojects/libh2o b/subprojects/libh2o new file mode 160000 index 000000000..fcf8df4af --- /dev/null +++ b/subprojects/libh2o @@ -0,0 +1 @@ +Subproject commit fcf8df4af0c31477e05c55c380c4d7324311368d