quickjs-tart

commit c23dc56b2ac0dc3445797d2e83e8fac6497ebbc0
parent dbcb3a7dbd5fcdbf9d2b653ed285227f87ff4e46
Author: Florian Dold <florian@dold.me>
Date:   Fri, 19 Jan 2024 11:39:25 +0100

configure curl

Diffstat:
A
subprojects/c-ares/include/meson.build
 | 
14
++++++++++++++
M
subprojects/c-ares/meson.build
 | 
22
+++++++---------------
M
subprojects/curl/meson.build
 | 
9
+++++++--

3 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/subprojects/c-ares/include/meson.build b/subprojects/c-ares/include/meson.build
@@ -0,0 +1,14 @@
+# Build configuration file, gets shipped as a public header.
+ares_build_conf_data = configuration_data()
+
+ares_build_conf_data.set('CARES_TYPEOF_ARES_SOCKLEN_T', 'socklen_t')
+ares_build_conf_data.set('CARES_TYPEOF_ARES_SSIZE_T', 'ssize_t')
+ares_build_conf_data.set('CARES_HAVE_SYS_TYPES_H', true)
+ares_build_conf_data.set('CARES_HAVE_SYS_RANDOM_H', true)
+ares_build_conf_data.set('CARES_HAVE_SYS_SOCKET_H', true)
+ares_build_conf_data.set('CARES_HAVE_ARPA_NAMESER_H', c_compiler.has_header('arpa/nameser.h'))
+ares_build_conf_data.set('CARES_HAVE_ARPA_NAMESER_COMPA_H', c_compiler.has_header('arpa/nameser_compa.h'))
+
+configure_file(input : 'ares_build.h.mesonin',
+               output : 'ares_build.h',
+               configuration : ares_build_conf_data)
diff --git a/subprojects/c-ares/meson.build b/subprojects/c-ares/meson.build
@@ -7,21 +7,7 @@ cares_inc = include_directories(['include/'])
 add_project_arguments('-DHAVE_CONFIG_H', language : 'c')
 add_project_arguments('-DCARES_BUILDING_LIBRARY', language : 'c')
 
-# Build configuration file (separate from the internal configuration file
-# that does not get shipped as a public header).
-ares_build_conf_data = configuration_data()
-
-ares_build_conf_data.set('CARES_TYPEOF_ARES_SOCKLEN_T', 'socklen_t')
-ares_build_conf_data.set('CARES_TYPEOF_ARES_SSIZE_T', 'ssize_t')
-ares_build_conf_data.set('CARES_HAVE_SYS_TYPES_H', true)
-ares_build_conf_data.set('CARES_HAVE_SYS_RANDOM_H', true)
-ares_build_conf_data.set('CARES_HAVE_SYS_SOCKET_H', true)
-ares_build_conf_data.set('CARES_HAVE_ARPA_NAMESER_H', c_compiler.has_header('arpa/nameser.h'))
-ares_build_conf_data.set('CARES_HAVE_ARPA_NAMESER_COMPA_H', c_compiler.has_header('arpa/nameser_compa.h'))
-
-configure_file(input : 'include/ares_build.h.mesonin',
-               output : 'ares_build.h',
-               configuration : ares_build_conf_data)
+subdir('include')
 
 # Internal configuration in src/lib
 ares_internal_conf_data = configuration_data()
@@ -499,3 +485,9 @@ lib_c_src = [
 libcares = static_library('libcares', [lib_c_src],
   include_directories : ['include'],
   dependencies : [])
+
+
+cares_dep = declare_dependency(
+  include_directories : ['include/'],
+  link_with : [libcares],
+)
diff --git a/subprojects/curl/meson.build b/subprojects/curl/meson.build
@@ -95,6 +95,9 @@ add_project_arguments(f'-DOS="@os@"', language : 'c')
 add_project_arguments('-DUSE_MBEDTLS', language : 'c')
 add_project_arguments('-DCURL_DEFAULT_SSL_BACKEND="mbedtls"', language : 'c')
 
+# DNS resolver conf
+add_project_arguments('-DUSE_ARES', language : 'c')
+
 lib_c_src = [
   'lib/altsvc.c',
   'lib/amigaos.c',
@@ -260,11 +263,13 @@ mbedcrypto_dep = mbedtls_proj.get_variable('mbedcrypto_dep')
 mbedtls_dep = mbedtls_proj.get_variable('mbedtls_dep')
 mbedx509_dep = mbedtls_proj.get_variable('mbedx509_dep')
 
+cares_proj = subproject('c-ares', required : true)
+cares_dep = cares_proj.get_variable('cares_dep')
+
 libcurl = static_library('curl', [lib_c_src, lib_vtls_src, lib_vauth_src],
   include_directories : ['include', 'lib'],
   c_args : ['-DBUILDING_LIBCURL'],
-  dependencies : [mbedtls_dep, mbedcrypto_dep, mbedx509_dep])
-
+  dependencies : [mbedtls_dep, mbedcrypto_dep, mbedx509_dep, cares_dep])
 
 curl_dep = declare_dependency(
   include_directories : ['include/'],