[systemd-commits] 2 commits - configure.ac Makefile.am Makefile-man.am man/systemd-networkd.service.xml

[Tom Gundersen]

 Makefile-man.am                  |   17 +++++++++++------
 Makefile.am                      |    2 ++
 configure.ac                     |    8 ++++++++
 man/systemd-networkd.service.xml |    2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

New commits:
commit 2b70d172a7b2ba741df7d6ca89c915e17d6f3e84
Author: Tom Gundersen <teg at jklm.no>
Date:   Tue Nov 12 22:44:18 2013 +0100

    build-sys: make networkd man pages conditional

diff --git a/Makefile-man.am b/Makefile-man.am
index 6239651..1a24e6b 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -62,7 +62,6 @@ MANPAGES += \
 	man/systemd-initctl.service.8 \
 	man/systemd-journald.service.8 \
 	man/systemd-machine-id-setup.1 \
-	man/systemd-networkd.service.8 \
 	man/systemd-notify.1 \
 	man/systemd-nspawn.1 \
 	man/systemd-remount-fs.service.8 \
@@ -187,7 +186,6 @@ MANPAGES_ALIAS += \
 	man/systemd-journald.8 \
 	man/systemd-journald.socket.8 \
 	man/systemd-kexec.service.8 \
-	man/systemd-networkd.8 \
 	man/systemd-poweroff.service.8 \
 	man/systemd-reboot.service.8 \
 	man/systemd-remount-fs.8 \
@@ -289,7 +287,6 @@ man/systemd-initctl.socket.8: man/systemd-initctl.service.8
 man/systemd-journald.8: man/systemd-journald.service.8
 man/systemd-journald.socket.8: man/systemd-journald.service.8
 man/systemd-kexec.service.8: man/systemd-halt.service.8
-man/systemd-networkd.8: man/systemd-networkd.service.8
 man/systemd-poweroff.service.8: man/systemd-halt.service.8
 man/systemd-reboot.service.8: man/systemd-halt.service.8
 man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
@@ -557,9 +554,6 @@ man/systemd-journald.socket.html: man/systemd-journald.service.html
 man/systemd-kexec.service.html: man/systemd-halt.service.html
 	$(html-alias)
 
-man/systemd-networkd.html: man/systemd-networkd.service.html
-	$(html-alias)
-
 man/systemd-poweroff.service.html: man/systemd-halt.service.html
 	$(html-alias)
 
@@ -706,6 +700,17 @@ man/systemd-machined.html: man/systemd-machined.service.html
 
 endif
 
+if ENABLE_NETWORKD
+MANPAGES += \
+	man/systemd-networkd.service.8
+MANPAGES_ALIAS += \
+	man/systemd-networkd.8
+man/systemd-networkd.8: man/systemd-networkd.service.8
+man/systemd-networkd.html: man/systemd-networkd.service.html
+	$(html-alias)
+
+endif
+
 if ENABLE_QUOTACHECK
 MANPAGES += \
 	man/systemd-quotacheck.service.8
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 209e3be..41dc903 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -21,7 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="systemd-networkd.service">
+<refentry id="systemd-networkd.service" conditional='ENABLE_NETWORKD'>
 
         <refentryinfo>
                 <title>systemd-networkd.service</title>

commit 3c9317d2d93248f3f0b0feaaa113485aee415d8a
Author: Colin Walters <walters at verbum.org>
Date:   Tue Nov 12 15:43:17 2013 -0500

    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 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