[dia: 66/105] #19: Remove DATADIR from config.h.

[Zander <zbrown src gnome org>]

commit 15cecdb21c76db009d4da2bca85208deaeb15ea3
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Sun Jan 6 22:44:52 2019 +0000

    #19: Remove DATADIR from config.h.
    
      - Curiously this fixes the compilation issues for boundingbox and objects
        tests on Windows.  Therefore, enable them in tests/meson.build.

 meson.build       |  1 -
 tests/meson.build | 40 ++++++++++++++++++----------------------
 2 files changed, 18 insertions(+), 23 deletions(-)
---
diff --git a/meson.build b/meson.build
index 6b107b17..7d93ed50 100644
--- a/meson.build
+++ b/meson.build
@@ -52,7 +52,6 @@ dialibdir = join_paths(get_option('prefix'),
 conf.set_quoted('VERSION', meson.project_version())
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 conf.set_quoted('PREFIX', get_option('prefix'))
-conf.set_quoted('DATADIR', datadir)
 conf.set_quoted('PKGDATADIR', pkgdatadir)
 conf.set_quoted('DIALIBDIR',  dialibdir)
 conf.set_quoted('LOCALEDIR', get_option('localedir'))
diff --git a/tests/meson.build b/tests/meson.build
index dc0553e9..2ffc94de 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -10,24 +10,22 @@ run_env.set('DIA_PYTHON_PATH', join_paths(meson.source_root(), 'plug-ins', 'pyth
 run_env.set('DIA_SHEET_PATH',  join_paths(meson.build_root(), 'sheets'))
 
 # TODO: minimise code duplication.
-if host_machine.system() != 'windows'
-  bb = executable(
-      'boundingbox',
-      'test-boundingbox.c',
-      dependencies: [libgtk_dep, libxml_dep, libm_dep],
-      link_with: [libdia],
-      link_args: dia_link_args,
-      include_directories: [configuration_inc, libdia_inc],
-  )
-  objs = executable(
-      'objects',
-      'test-objects.c',
-      dependencies: [libgtk_dep, libxml_dep, libm_dep],
-      link_with: [libdia],
-      link_args: dia_link_args,
-      include_directories: [configuration_inc, libdia_inc],
-  )
-endif
+bb = executable(
+    'boundingbox',
+    'test-boundingbox.c',
+    dependencies: [libgtk_dep, libxml_dep, libm_dep],
+    link_with: [libdia],
+    link_args: dia_link_args,
+    include_directories: [configuration_inc, libdia_inc],
+)
+objs = executable(
+    'objects',
+    'test-objects.c',
+    dependencies: [libgtk_dep, libxml_dep, libm_dep],
+    link_with: [libdia],
+    link_args: dia_link_args,
+    include_directories: [configuration_inc, libdia_inc],
+)
 
 tsvg = executable(
     'testsvg',
@@ -49,10 +47,8 @@ sizeof = executable(
 # Not really a test, but just a helper program.
 run_target('sizeof', command: [sizeof])
 
-if host_machine.system() != 'windows'
-  test('boundingbox', bb)
-  test('objects', objs, args: [join_paths(meson.build_root(), 'objects')])
-endif
+test('boundingbox', bb)
+test('objects', objs, args: [join_paths(meson.build_root(), 'objects')])
 
 xmllint_test = find_program('xmllint_test.sh')
 render_test_dia = files(join_paths('..', 'samples', 'render-test.dia'))[0]