[systemd-commits] Makefile.am configure.ac

[Lennart Poettering]

 Makefile.am  |   13 +++++++++++++
 configure.ac |    8 ++++++++
 2 files changed, 21 insertions(+)

New commits:
commit 75db9a77605b33a1b9355eae957f26380441fce6
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Feb 10 21:44:14 2012 +0100

    man: make building of man pages optional

diff --git a/Makefile.am b/Makefile.am
index 122acfa..0610451 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -651,6 +651,7 @@ EXTRA_DIST += \
 	src/acl-util.h \
 	src/logs-show.h
 
+if ENABLE_MANPAGES
 MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
@@ -724,6 +725,8 @@ EXTRA_DIST += \
 	${nodist_man_MANS:=.in} \
 	${XML_IN_FILES:.xml.in=.html.in}
 
+endif
+
 systemd_SOURCES = \
 	src/main.c
 
@@ -1132,6 +1135,7 @@ lib_LTLIBRARIES += \
 pkgconfiglib_DATA += \
 	src/libsystemd-daemon.pc
 
+if ENABLE_MANPAGES
 MANPAGES += \
 	man/sd-daemon.7 \
 	man/sd_notify.3 \
@@ -1151,6 +1155,7 @@ man/sd_is_socket_unix.3: man/sd_is_fifo.3
 man/sd_is_socket_inet.3: man/sd_is_fifo.3
 man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
+endif
 
 EXTRA_DIST += \
 	src/libsystemd-daemon.pc.in \
@@ -1466,8 +1471,10 @@ binfmt-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	binfmt-install-data-hook
 
+if ENABLE_MANPAGES
 MANPAGES += \
 	man/binfmt.d.5
+endif
 
 EXTRA_DIST += \
 	units/systemd-binfmt.service.in
@@ -1497,8 +1504,10 @@ vconsole-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	vconsole-install-data-hook
 
+if ENABLE_MANPAGES
 MANPAGES += \
 	man/vconsole.conf.5
+endif
 
 EXTRA_DIST += \
 	units/systemd-vconsole-setup.service.in
@@ -1551,10 +1560,12 @@ EXTRA_DIST += \
 	units/systemd-readahead-replay.service.in \
 	units/systemd-readahead-done.service.in
 
+if ENABLE_MANPAGES
 MANPAGES += \
 	man/sd_readahead.3 \
 	man/sd-readahead.7
 endif
+endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_QUOTACHECK
@@ -2045,6 +2056,7 @@ dist_udevrules_DATA += \
 nodist_udevrules_DATA += \
 	src/login/73-seat-late.rules
 
+if ENABLE_MANPAGES
 MANPAGES += \
 	man/systemd-logind.conf.5 \
 	man/sd-login.7 \
@@ -2086,6 +2098,7 @@ man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
 man/sd_get_sessions.3: man/sd_get_seats.3
 man/sd_get_uids.3: man/sd_get_seats.3
+endif
 
 EXTRA_DIST += \
 	src/login/logind-gperf.gperf \
diff --git a/configure.ac b/configure.ac
index 0ad2b6a..af48f1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -363,6 +363,13 @@ if test "x$enable_coredump" != "xno"; then
 fi
 AM_CONDITIONAL(ENABLE_COREDUMP, [test "$have_coredump" = "yes"])
 
+have_manpages=no
+AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpage], [disable manpages]))
+if test "x$enable_manpages" != "xno"; then
+	have_manpages=yes
+fi
+AM_CONDITIONAL(ENABLE_MANPAGES, [test "$have_manpages" = "yes"])
+
 have_gtk=no
 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
 if test "x$enable_gtk" != "xno"; then
@@ -653,4 +660,5 @@ AC_MSG_RESULT([
         D-Bus system dir:        ${with_dbussystemservicedir}
         D-Bus interfaces dir:    ${with_dbusinterfacedir}
         Split /usr:              ${have_split_usr}
+        Build man pages:         ${have_manpages}
 ])