From 3c9317d2d93248f3f0b0feaaa113485aee415d8a Mon Sep 17 00:00:00 2001 From: Colin Walters 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(+) diff --git a/Makefile.am b/Makefile.am index 8710462aad..ce47171b7c 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 bb08407779..d0bfcb823b 100644 --- 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"]) +# ------------------------------------------------------------------------------ +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]))