[glib-networking] Revert "meson: Add missing libintl dep for Windows"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking] Revert "meson: Add missing libintl dep for Windows"
- Date: Mon, 14 May 2018 12:59:25 +0000 (UTC)
commit 407868f1e6ed4569a70bd7caab796530cf59583f
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Mon May 14 07:57:40 2018 -0500
Revert "meson: Add missing libintl dep for Windows"
This reverts commit 3c429ad4eef89604c7405040daaad83f76d224cc.
https://bugzilla.gnome.org/show_bug.cgi?id=795982
meson.build | 6 ------
tls/gnutls/meson.build | 3 +--
2 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index fcc6a4a..e5831e0 100644
--- a/meson.build
+++ b/meson.build
@@ -85,12 +85,6 @@ if enable_pkcs11_support
description: 'Building with PKCS#11 support')
endif
-libintl_dep = cc.find_library('intl', required : false)
-if not libintl_dep.found() and host_machine.system() == 'windows'
- # Used only when the gettext library is not available (MSVC, not MinGW)
- libintl_dep = subproject('proxy-libintl').get_variable('intl_dep')
-endif
-
configure_file(
output: 'config.h',
configuration: config_h
diff --git a/tls/gnutls/meson.build b/tls/gnutls/meson.build
index 045cc6d..1699d1b 100644
--- a/tls/gnutls/meson.build
+++ b/tls/gnutls/meson.build
@@ -18,8 +18,7 @@ deps = [
glib_dep,
gmodule_dep,
gobject_dep,
- gnutls_dep,
- libintl_dep,
+ gnutls_dep
]
if enable_pkcs11_support
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]