[dia: 20/105] #19: Minor cleanup of meson.build.



commit abb2f2792077feee9273a3076031e2c5c99b97be
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Thu Dec 20 00:56:05 2018 +0000

    #19: Minor cleanup of meson.build.

 meson.build | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index 31f5e03f..146659d2 100644
--- a/meson.build
+++ b/meson.build
@@ -9,18 +9,18 @@ project('dia',
 i18n = import('i18n')
 
 gettext_package = 'dia'
-subdir('po')
 
 cc = meson.get_compiler('c')
 
 #GTK_MODULES="gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.20.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0 gmodule-2.0"
 libgtk_dep  = dependency('gtk+-2.0', version : '>= 2.16.0')
 libglib_dep = dependency('glib-2.0', version : '>= 2.20.0')
-libxml_dep  = dependency('libxml-2.0')
+libxml_dep  = dependency('libxml-2.0', version : '>= 2.6.27')
+#TODO: what are the minimum versions?
 gmodule_dep = dependency('gmodule-2.0')
+libzlib_dep = dependency('zlib')
 libm_dep = cc.find_library('m', required : false)
 
-libzlib_dep = dependency('zlib')
 
 
 # Used in pixmap csource generation.
@@ -31,18 +31,17 @@ gdk_pixbuf_csource = find_program('gdk-pixbuf-csource')
 #AC_PROG_MAKE_SET
 #AC_ISC_POSIX
 
-# Specify a header configuration file
-conf = configuration_data()
 
 datadir = join_paths(get_option('prefix'),
                      get_option('datadir'))
-
 pkgdatadir = join_paths(datadir, 'dia')
 
 dialibdir = join_paths(get_option('prefix'),
                        get_option('libdir'),
                        'dia')
 
+# Specify a header configuration file
+conf = configuration_data()
 conf.set_quoted('VERSION', meson.project_version())
 conf.set_quoted('GETTEXT_PACKAGE', 'dia')
 conf.set_quoted('DATADIR', datadir)
@@ -67,6 +66,7 @@ configuration_inc = include_directories('.')
 # To fix we should remove #ifdef HAVE_CONFIG_H checks from all source files.
 add_project_arguments('-DHAVE_CONFIG_H', language : 'c')
 
+subdir('po')
 subdir('lib')
 subdir('objects')
 subdir('app')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]