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.

diff --git a/Makefile.am b/Makefile.am
index 8710462aad9106aa5777881122f6ad93ee8a2bbf..ce47171b7c3fd4bf10250b4e1015207f220c2c63 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3812,6 +3812,7 @@ EXTRA_DIST += \
 endif
 
 # ------------------------------------------------------------------------------
 endif
 
 # ------------------------------------------------------------------------------

+if ENABLE_NETWORKD

 rootlibexec_PROGRAMS += \
        systemd-networkd
 
 rootlibexec_PROGRAMS += \
        systemd-networkd
 


@@ -3863,6 +3864,7 @@ EXTRA_DIST += \
 
 CLEANFILES += \
        src/network/networkd-gperf.c
 
 CLEANFILES += \
        src/network/networkd-gperf.c

+endif

 
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
 
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND

diff --git a/configure.ac b/configure.ac
index bb084077795a196bd667d5964e0c9d812e9de265..d0bfcb823b68026414a5869dcafb1bf6bc3228ac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -772,6 +772,14 @@ if test "x$enable_polkit" != "xno"; then
 fi
 AM_CONDITIONAL(ENABLE_POLKIT, [test "x$have_polkit" = "xyes"])
 
 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]))
 # ------------------------------------------------------------------------------
 have_efi=no
 AC_ARG_ENABLE(efi, AS_HELP_STRING([--disable-efi], [disable EFI support]))