For GNOME (Continuous), we are unlikely to require or want
systemd-networkd in the near term future; all of the tools and code
are targeting NetworkManager.

The long term story is still an open question of course, but for now,
there's no reason for gnome-continuous to build or ship this.
---
 Makefile.am  |    2 ++
 configure.ac |    8 ++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)


>From f2d9637bc8ec7543b9a0ced18b35d5911e41be86 Mon Sep 17 00:00:00 2001
From: Colin Walters <[email protected]>
Date: Tue, 12 Nov 2013 15:43:17 -0500
Subject: [PATCH] build-sys: Add --disable-networkd option

For GNOME (Continuous), we are unlikely to require or want
systemd-networkd in the near term future; all of the tools and code
are targeting NetworkManager.

The long term story is still an open question of course, but for now,
there's no reason for gnome-continuous to build or ship this.
---
 Makefile.am  |    2 ++
 configure.ac |    8 ++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8710462..ce47171 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3812,6 +3812,7 @@ EXTRA_DIST += \
 endif
 
 # ------------------------------------------------------------------------------
+if ENABLE_NETWORKD
 rootlibexec_PROGRAMS += \
 	systemd-networkd
 
@@ -3863,6 +3864,7 @@ EXTRA_DIST += \
 
 CLEANFILES += \
 	src/network/networkd-gperf.c
+endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
diff --git a/configure.ac b/configure.ac
index bb08407..d0bfcb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -773,6 +773,14 @@ fi
 AM_CONDITIONAL(ENABLE_POLKIT, [test "x$have_polkit" = "xyes"])
 
 # ------------------------------------------------------------------------------
+AC_ARG_ENABLE(networkd, AS_HELP_STRING([--disable-networkd], [disable networkd]))
+if test "x$enable_networkd" != "xno"; then
+        AC_DEFINE(ENABLE_NETWORKD, 1, [Define if networkd support is to be enabled])
+        have_networkd=yes
+fi
+AM_CONDITIONAL(ENABLE_NETWORKD, [test "x$have_networkd" = "xyes"])
+
+# ------------------------------------------------------------------------------
 have_efi=no
 AC_ARG_ENABLE(efi, AS_HELP_STRING([--disable-efi], [disable EFI support]))
 if test "x$enable_efi" != "xno"; then
-- 
1.7.1

_______________________________________________
systemd-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/systemd-devel

Reply via email to