From bfff3ecfb0ab918369a7f628b195fa1446edbd7b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 15 Jan 2018 15:35:36 +0100
Subject: build: don't install NetworkManager.pc when libnm-glib is disabled

---
 Makefile.am            |  2 ++
 libnm-glib/meson.build | 15 +++++++++++++++
 meson.build            | 15 ---------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5fd761f8e6..dd61b537f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,7 +141,9 @@ DISTCLEANFILES += intltool-extract intltool-merge intltool-update
 
 ###############################################################################
 
+if WITH_LEGACY_LIBRARIES
 pkgconfig_DATA += NetworkManager.pc
+endif
 
 ###############################################################################
 
diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build
index a236ec08bd..eddf983e49 100644
--- a/libnm-glib/meson.build
+++ b/libnm-glib/meson.build
@@ -276,3 +276,18 @@ run_target(
 if enable_tests
   subdir('tests')
 endif
+
+pkg.generate(
+  version: nm_version,
+  name: nm_name,
+  description: 'System for maintaining active network connection',
+  filebase: nm_name,
+  subdirs: nm_name,
+  requires: '',
+  variables: [
+    'exec_prefix=${prefix}',
+    'libgnome_serverdir=' + nm_libexecdir,
+    'plugindir=' + nm_pkglibdir,
+    'configdir=' + nm_pkgconfdir
+  ]
+)
diff --git a/meson.build b/meson.build
index e59be17f96..ab0fcbab25 100644
--- a/meson.build
+++ b/meson.build
@@ -853,21 +853,6 @@ if enable_docs
   subdir('docs')
 endif
 
-pkg.generate(
-  version: nm_version,
-  name: nm_name,
-  description: 'System for maintaining active network connection',
-  filebase: nm_name,
-  subdirs: nm_name,
-  requires: '',
-  variables: [
-    'exec_prefix=${prefix}',
-    'libgnome_serverdir=' + nm_libexecdir,
-    'plugindir=' + nm_pkglibdir,
-    'configdir=' + nm_pkgconfdir
-  ]
-)
-
 config = 'config.h'
 
 configure_file(
-- 
cgit v1.2.1