diff options
| author | Tomas Popela <tpopela@redhat.com> | 2018-04-11 12:09:47 +0200 |
|---|---|---|
| committer | Tomas Popela <tpopela@redhat.com> | 2018-04-11 12:39:20 +0200 |
| commit | 6d5923cf08a441961801f5ae081b621f68a08137 (patch) | |
| tree | 770b4ea36f7759f9cda6840872efc8204f310daf | |
| parent | 6e59438fb7c090828760d4544bacbe14d81ba858 (diff) | |
| download | libsoup-wip/meson.tar.gz | |
Add support for libpslwip/meson
https://bugzilla.gnome.org/show_bug.cgi?id=769650
| -rw-r--r-- | docs/reference/meson.build | 1 | ||||
| -rw-r--r-- | libsoup/meson.build | 10 | ||||
| -rw-r--r-- | meson.build | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 4b1acec5..1daf1e15 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -31,7 +31,6 @@ ignore_headers = [ 'soup-filter-input-stream.h', 'soup-cookie-jar-sqlite.h', 'soup-requester.h', - 'soup-tld-private.h', 'soup-misc-private.h', 'soup-proxy-uri-resolver.h', 'soup-proxy-resolver-wrapper.h', diff --git a/libsoup/meson.build b/libsoup/meson.build index 6a120fea..4ead22f5 100644 --- a/libsoup/meson.build +++ b/libsoup/meson.build @@ -175,13 +175,6 @@ soup_enums = gnome.mkenums('soup-enum-types', soupenum_h = soup_enums[1] soupenum_c = soup_enums[0] -tldparser = find_program(join_paths(meson.current_source_dir(), 'tld-parser.py')) -tlddata = custom_target('tlddata', - output : 'tld_data.inc', - input : join_paths(meson.source_root(), 'data', 'effective_tld_names.dat'), - install : false, - command : [tldparser, '@INPUT@', '@OUTPUT@']) - libsoup_c_args = [ '-DHAVE_CONFIG_H', '-DG_LOG_DOMAIN="@0@"'.format(meson.project_name()), @@ -192,11 +185,12 @@ deps = [ glib_dep, libxml_dep, sqlite_dep, + libpsl_dep, platform_deps ] libsoup = shared_library('soup-@0@'.format(apiversion), soup_sources, - soup_enums, tlddata, + soup_enums, version : libversion, soversion : soversion, c_args : libsoup_c_args, diff --git a/meson.build b/meson.build index 687e7273..ed9e0828 100644 --- a/meson.build +++ b/meson.build @@ -78,6 +78,9 @@ if host_machine.system() == 'windows' cdata.set('DLL_EXPORT', 1) endif +libpsl_required_version = '>= 0.20' +libpsl_dep = dependency('libpsl', version : libpsl_required_version) + ################### # GIO TLS support # ################### |