openssl: explicitly NULL initialize PKCS8_PRIV_KEY_INFO

[platform/upstream/glib-networking.git] / meson.build

diff --git a/meson.build b/meson.build
index 4e921da..3612415 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -22,6 +22,16 @@ config_h = configuration_data()
 
 config_h.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 
+# Update default CA file
+if get_option('default_ca_file') != ''
+  config_h.set_quoted('TIZEN_DEFAULT_CA_FILE', get_option('default_ca_file'))
+endif
+
+# TIZEN extension
+if get_option('tizen_ext')
+  config_h.set('TIZEN_EXT', get_option('tizen_ext'))
+endif
+
 # compiler flags
 common_flags = [
   '-DHAVE_CONFIG_H',
@@ -32,6 +42,12 @@ common_flags = [
   '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_70'
 ]
 
+# TIZEN dlog
+if get_option('tizen_debug')
+  debug_dep = dependency('dlog')
+  config_h.set('TIZEN_DEBUG', get_option('tizen_debug'))
+endif
+
 add_project_arguments(common_flags, language: 'c')
 
 cflags = cc.get_supported_arguments(['-Werror=declaration-after-statement',
@@ -92,7 +108,8 @@ if openssl_option.disabled()
   openssl_dep = []
 else
   # XXX: https://github.com/mesonbuild/meson/issues/2945
-  openssl_dep = dependency('openssl', version: '>= 1.0.2', required: false)
+
+  openssl_dep = dependency('openssl1.1', version: '>= 1.0.2', required: false)
   if openssl_dep.found()
     backends += ['openssl']
   else
@@ -199,7 +216,7 @@ if backends.contains('openssl')
   subdir('tls/openssl')
 endif
 
-subdir('tls/tests')
+#subdir('tls/tests')
 
 # Will automatically pick it up from the cross file if defined
 gio_querymodules = find_program('gio-querymodules', required : false)
@@ -212,4 +229,7 @@ output += '  gnutls support:      ' + backends.contains('gnutls').to_string() +
 output += '  openssl support:     ' + backends.contains('openssl').to_string() + '\n'
 output += '  libproxy support:    ' + libproxy_dep.found().to_string() + '\n'
 output += '  GNOME proxy support: ' + gsettings_desktop_schemas_dep.found().to_string() + '\n'
+output += '  TIZEN default CA file: ' + get_option('default_ca_file') + '\n'
+output += '  TIZEN extension:     ' + get_option('tizen_ext').to_string() + '\n'
+output += '  TIZEN debug:         ' + get_option('tizen_debug').to_string() + '\n'
 message(output)