[glibmm/mkolny/meson-build] restore change in resolver

[Marcin Kolny <mkolny src gnome org>]

commit 70ed64d0058cd2710dc63f7231e1fdaad693c809
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Wed Aug 2 20:47:07 2017 +0100

    restore change in resolver

 examples/network/meson.build |    7 ++++++-
 examples/network/resolver.cc |    3 +++
 meson.build                  |   12 ++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/examples/network/meson.build b/examples/network/meson.build
index 332d917..7e299f8 100644
--- a/examples/network/meson.build
+++ b/examples/network/meson.build
@@ -1,3 +1,8 @@
 executable('network-client-example', 'socket-client.cc', dependencies : giomm_dep)
+
 executable('network-server-example', 'socket-server.cc', dependencies : giomm_dep)
-executable('network-resolver-example', 'resolver.cc', dependencies : giomm_dep)
+
+executable('network-resolver-example',
+           'resolver.cc',
+           dependencies : giomm_dep,
+           include_directories: config_inc_dir)
diff --git a/examples/network/resolver.cc b/examples/network/resolver.cc
index 4cf487e..d838213 100644
--- a/examples/network/resolver.cc
+++ b/examples/network/resolver.cc
@@ -19,6 +19,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifndef _WIN32
+#include <config.h>
+#endif
 #include <giomm.h>
 #include <iostream>
 #include <mutex>
diff --git a/meson.build b/meson.build
index 7f2447e..5665728 100644
--- a/meson.build
+++ b/meson.build
@@ -41,7 +41,7 @@ conf.set('GIOMM_DISABLE_DEPRECATED', get_option('disable-deprecated-api'))
 
 conf.set('SIZEOF_WCHAR_T', compiler.sizeof('wchar_t'))
 
-tstcompiler = '''struct foo
+member_function_member_template_src = '''struct foo
 {
   template <class C> inline void doit();
   void thebug();
@@ -77,11 +77,11 @@ int main() {
 }
 '''
 
-if compiler.compiles(tstcompiler)
+if compiler.compiles(member_function_member_template_src)
   conf.set('GLIBMM_MEMBER_FUNCTIONS_MEMBER_TEMPLATES', 1)
 endif
 
-compilertest = '''
+have_disambiguous_const_template_specializations_src = '''
 template <class T> class Foo {};
 
 template <class T> class Traits
@@ -114,11 +114,11 @@ int main() {
   return 0;
 }
 '''
-if compiler.compiles(compilertest)
+if compiler.compiles(have_disambiguous_const_template_specializations_src)
   conf.set('GLIBMM_HAVE_DISAMBIGUOUS_CONST_TEMPLATE_SPECIALIZATIONS', 1)
 endif
 
-compilertest = '''
+can_use_dynamic_cast_in_unused_template_without_definition_src = '''
 class SomeClass;
 
 SomeClass* some_function();
@@ -134,7 +134,7 @@ class SomeTemplate
   }
 };
 '''
-if compiler.compiles(compilertest)
+if compiler.compiles(can_use_dynamic_cast_in_unused_template_without_definition_src)
   conf.set('GLIBMM_CAN_USE_DYNAMIC_CAST_IN_UNUSED_TEMPLATE_WITHOUT_DEFINITION', 1)
 endif