[gvfs] Revert "build: Define meson information early"



commit d1974938a5acaaed2cfee8da6dc254c74c0d4fb6
Author: Ondrej Holy <oholy redhat com>
Date:   Mon Jan 7 17:44:09 2019 +0100

    Revert "build: Define meson information early"
    
    This reverts commit 28dfdbf9c759a4681c6b43b179079cba09e571b4.

 meson.build | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/meson.build b/meson.build
index d5916082..d224cdee 100644
--- a/meson.build
+++ b/meson.build
@@ -29,17 +29,6 @@ gvfs_namespace = 'org.gtk.vfs'
 
 gvfs_debug = get_option('buildtype').contains('debug')
 
-gnome = import('gnome')
-i18n = import('i18n')
-pkg = import('pkgconfig')
-
-po_dir = meson.current_source_dir() / 'po'
-
-top_inc = include_directories('.')
-
-service_conf = configuration_data()
-service_conf.set('libexecdir', gvfs_prefix / gvfs_libexecdir)
-
 cc = meson.get_compiler('c')
 
 config_h = configuration_data()
@@ -464,6 +453,17 @@ endif
 enable_devel_utils = get_option('devel_utils')
 enable_installed_tests = get_option('installed_tests')
 
+gnome = import('gnome')
+i18n = import('i18n')
+pkg = import('pkgconfig')
+
+service_conf = configuration_data()
+service_conf.set('libexecdir', gvfs_prefix / gvfs_libexecdir)
+
+po_dir = meson.source_root() / 'po'
+
+top_inc = include_directories('.')
+
 subdir('common')
 subdir('metadata')
 subdir('client')


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