build: fix not building docs w/o sphinx

Can't build manpages without sphinx-build, oops...

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/bfdd/subdir.am b/bfdd/subdir.am
index 7447519b213faa1aa202841a4d4bb83bcbeb294c..334e974b048a9eb1676666b4e63c8eaa65e3d97c 100644 (file)
--- a/bfdd/subdir.am
+++ b/bfdd/subdir.am
@@ -7,7 +7,7 @@ noinst_LIBRARIES += bfdd/libbfd.a
 sbin_PROGRAMS += bfdd/bfdd
 dist_examples_DATA += bfdd/bfdd.conf.sample
 vtysh_scan += $(top_srcdir)/bfdd/bfdd_vty.c
-rstman8_DATA += $(MANBUILD)/bfdd.8
+man8 += $(MANBUILD)/bfdd.8
 endif
 
 bfdd_libbfd_a_SOURCES = \

diff --git a/bgpd/subdir.am b/bgpd/subdir.am
index 6ab63abea5739e7fa586a0fd68b56d6ed07bbf55..42913885675f3fedd63a1b9d897f053a5d12684d 100644 (file)
--- a/bgpd/subdir.am
+++ b/bgpd/subdir.am
@@ -42,7 +42,7 @@ endif
 if RPKI
 module_LTLIBRARIES += bgpd/bgpd_rpki.la
 endif
-rstman8_DATA += $(MANBUILD)/bgpd.8
+man8 += $(MANBUILD)/bgpd.8
 endif
 
 bgpd_libbgp_a_SOURCES = \

diff --git a/configure.ac b/configure.ac
index 06c06baab05707b8a9723c90c0f0c683d328c7d0..f0523194e4e3a04e6dffe49670d4b81f3e112768 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1300,8 +1300,13 @@ FRR_INCLUDES
 ])dnl
 
 dnl disable doc check
-AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no])
-AM_CONDITIONAL(DOC, test "${enable_doc}" != "no")
+AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [/bin/false])
+if test "$SPHINXBUILD" = "/bin/false"; then
+  if test "${enable_doc}" = "yes"; then
+    AC_MSG_ERROR([Documentation was explicitly requested with --enable-doc but sphinx-build is not available. Please disable docs or install sphinx.])
+  fi
+fi
+AM_CONDITIONAL(DOC, test "${enable_doc}" != "no" -a "$SPHINXBUILD" != "/bin/false")
 AM_CONDITIONAL(DOC_HTML, test "${enable_doc_html}" = "yes")
 
 dnl --------------------
@@ -2025,6 +2030,6 @@ The above user and group must have read/write access to the state file
 directory and to the config files in the config file directory."
 
 if test "${enable_doc}" != "no";then
-  AS_IF([test "x$SPHINXBUILD" = xno],
+  AS_IF([test "$SPHINXBUILD" = /bin/false],
      AC_MSG_WARN(sphinx-build is missing but required to build documentation))
 fi

diff --git a/doc/manpages/subdir.am b/doc/manpages/subdir.am
index 74b5c83b5c5bb37f946a810a4655a801b3f1c7b3..75abbede80b151883e245e5a62347b9bde7d8259 100644 (file)
--- a/doc/manpages/subdir.am
+++ b/doc/manpages/subdir.am
@@ -46,10 +46,16 @@ rstman8dir = $(mandir)/man8
 rstman1_DATA =
 rstman8_DATA =
 
-rstman1_DATA += $(MANBUILD)/frr.1
+if DOC
+rstman1_DATA += $(man1)
+rstman8_DATA += $(man8)
+endif # DOC
+
+man1 = $(MANBUILD)/frr.1
+man8 =
 
 # dependency
-$(rstman8_DATA) $(rstman1_DATA): $(MANBUILD)/man.stamp
+$(man8) $(man1): $(MANBUILD)/man.stamp
 
 #
 # hook-ins for clean / doc

diff --git a/eigrpd/subdir.am b/eigrpd/subdir.am
index 75b77feee6a3ad1f6d0985b7a2043adb1adb1fde..bc48173bba11d9b593bf5bd16221eacd59db1443 100644 (file)
--- a/eigrpd/subdir.am
+++ b/eigrpd/subdir.am
@@ -11,7 +11,7 @@ vtysh_scan += \
        $(top_srcdir)/eigrpd/eigrp_vty.c \
        # end
 #      $(top_srcdir)/eigrpd/eigrp_routemap.c
-rstman8_DATA += $(MANBUILD)/eigrpd.8
+man8 += $(MANBUILD)/eigrpd.8
 endif
 
 eigrpd_libeigrp_a_SOURCES = \

diff --git a/isisd/subdir.am b/isisd/subdir.am
index 03889ba53745dc9af6a4c87554ae55d613f531ed..3175c21535428f68f1220187c3103ff8f181c7c8 100644 (file)
--- a/isisd/subdir.am
+++ b/isisd/subdir.am
@@ -13,7 +13,7 @@ vtysh_scan += \
        $(top_srcdir)/isisd/isis_vty.c \
        $(top_srcdir)/isisd/isisd.c \
        # end
-rstman8_DATA += $(MANBUILD)/isisd.8
+man8 += $(MANBUILD)/isisd.8
 endif
 
 isisd_libisis_a_SOURCES = \

diff --git a/ldpd/subdir.am b/ldpd/subdir.am
index b42f401f25f259153c021bf0d5c542c14ed2cec0..24e738d6227a0805c5861f40d98e3f65bf3ab7b0 100644 (file)
--- a/ldpd/subdir.am
+++ b/ldpd/subdir.am
@@ -7,7 +7,7 @@ noinst_LIBRARIES += ldpd/libldp.a
 sbin_PROGRAMS += ldpd/ldpd
 dist_examples_DATA += ldpd/ldpd.conf.sample
 vtysh_scan += $(top_srcdir)/ldpd/ldp_vty_cmds.c
-rstman8_DATA += $(MANBUILD)/ldpd.8
+man8 += $(MANBUILD)/ldpd.8
 endif
 
 ldpd_libldp_a_SOURCES = \

diff --git a/nhrpd/subdir.am b/nhrpd/subdir.am
index f7575971e94b4dfa660bbfc1bd4b29c112e6cefb..758c22e2be87d62a406082d1688416df8fb4ab07 100644 (file)
--- a/nhrpd/subdir.am
+++ b/nhrpd/subdir.am
@@ -5,7 +5,7 @@
 if NHRPD
 sbin_PROGRAMS += nhrpd/nhrpd
 vtysh_scan += $(top_srcdir)/nhrpd/nhrp_vty.c
-rstman8_DATA += $(MANBUILD)/nhrpd.8
+man8 += $(MANBUILD)/nhrpd.8
 endif
 
 nhrpd_nhrpd_LDADD = lib/libfrr.la @LIBCAP@ @CARES_LIBS@

diff --git a/ospf6d/subdir.am b/ospf6d/subdir.am
index 5338e1ea37cf8ef033b3eb25aef3ae14ec44644c..d9c29f2651b9e028996f72367ea2c1ff23386ef3 100644 (file)
--- a/ospf6d/subdir.am
+++ b/ospf6d/subdir.am
@@ -26,7 +26,7 @@ vtysh_scan += \
 if SNMP
 module_LTLIBRARIES += ospf6d/ospf6d_snmp.la
 endif
-rstman8_DATA += $(MANBUILD)/ospf6d.8
+man8 += $(MANBUILD)/ospf6d.8
 endif
 
 ospf6d_libospf6_a_SOURCES = \

diff --git a/ospfclient/subdir.am b/ospfclient/subdir.am
index d880f9fc70c7b8635aa3706b36f783e9e912e66a..df7d85a1f5d810ed637f425fa9d9bee6f0494f32 100644 (file)
--- a/ospfclient/subdir.am
+++ b/ospfclient/subdir.am
@@ -5,7 +5,7 @@
 if OSPFCLIENT
 lib_LTLIBRARIES += ospfclient/libfrrospfapiclient.la
 sbin_PROGRAMS += ospfclient/ospfclient
-rstman8_DATA += $(MANBUILD)/ospfclient.8
+man8 += $(MANBUILD)/ospfclient.8
 endif
 
 ospfclient_libfrrospfapiclient_la_LDFLAGS = -version-info 0:0:0

diff --git a/ospfd/subdir.am b/ospfd/subdir.am
index 2b42b5230b224b93d7ab0e06c6bea8055c0b21e0..83074b5ac018f8c8f2d6a0c152b3cde4e0671bdd 100644 (file)
--- a/ospfd/subdir.am
+++ b/ospfd/subdir.am
@@ -19,7 +19,7 @@ vtysh_scan += \
 if SNMP
 module_LTLIBRARIES += ospfd/ospfd_snmp.la
 endif
-rstman8_DATA += $(MANBUILD)/ospfd.8
+man8 += $(MANBUILD)/ospfd.8
 endif
 
 ospfd_libfrrospf_a_SOURCES = \

diff --git a/pbrd/subdir.am b/pbrd/subdir.am
index 49a07e1f6032dd2ce0a642de482f83f761d91809..79475590345dd8ac9d7e8476fb47e7e5eadca393 100644 (file)
--- a/pbrd/subdir.am
+++ b/pbrd/subdir.am
@@ -10,7 +10,7 @@ vtysh_scan += \
        $(top_srcdir)/pbrd/pbr_vty.c \
        $(top_srcdir)/pbrd/pbr_debug.c \
        # end
-rstman8_DATA += $(MANBUILD)/pbrd.8
+man8 += $(MANBUILD)/pbrd.8
 endif
 
 pbrd_libpbr_a_SOURCES = \

diff --git a/pimd/subdir.am b/pimd/subdir.am
index 00cabb99b04ed99ba7b1a076ee992744f34231e8..fef8e36577fe9f5116cafe43222d2d3b871a785f 100644 (file)
--- a/pimd/subdir.am
+++ b/pimd/subdir.am
@@ -9,8 +9,8 @@ bin_PROGRAMS += pimd/mtracebis
 noinst_PROGRAMS += pimd/test_igmpv3_join
 dist_examples_DATA += pimd/pimd.conf.sample
 vtysh_scan += $(top_srcdir)/pimd/pim_cmd.c
-rstman8_DATA += $(MANBUILD)/pimd.8
-rstman8_DATA += $(MANBUILD)/mtracebis.8
+man8 += $(MANBUILD)/pimd.8
+man8 += $(MANBUILD)/mtracebis.8
 endif
 
 pimd_libpim_a_SOURCES = \

diff --git a/ripd/subdir.am b/ripd/subdir.am
index f2c54c835e1778dff503e4c09d0a623185c3bc20..0d06e7e653c0f7d00db57b434000902cfcbde20f 100644 (file)
--- a/ripd/subdir.am
+++ b/ripd/subdir.am
@@ -17,7 +17,7 @@ vtysh_scan += \
 if SNMP
 module_LTLIBRARIES += ripd/ripd_snmp.la
 endif
-rstman8_DATA += $(MANBUILD)/ripd.8
+man8 += $(MANBUILD)/ripd.8
 endif
 
 ripd_librip_a_SOURCES = \

diff --git a/ripngd/subdir.am b/ripngd/subdir.am
index 0948b2334271db388bf50ac5bebc466ec4ea2115..8f834a1d297d5200fd4b711a90b7264d6fbf5bc2 100644 (file)
--- a/ripngd/subdir.am
+++ b/ripngd/subdir.am
@@ -12,7 +12,7 @@ vtysh_scan += \
        $(top_srcdir)/ripngd/ripng_zebra.c \
        $(top_srcdir)/ripngd/ripngd.c \
        # end
-rstman8_DATA += $(MANBUILD)/ripngd.8
+man8 += $(MANBUILD)/ripngd.8
 endif
 
 ripngd_libripng_a_SOURCES = \

diff --git a/sharpd/subdir.am b/sharpd/subdir.am
index ecc62af142fe0e86e183a8e55e6bdc51e82b6aa5..2a34aecfb3eff05f495b85f1222d594cb5cba3dc 100644 (file)
--- a/sharpd/subdir.am
+++ b/sharpd/subdir.am
@@ -7,7 +7,7 @@ noinst_LIBRARIES += sharpd/libsharp.a
 sbin_PROGRAMS += sharpd/sharpd
 dist_examples_DATA += sharpd/sharpd.conf.sample
 vtysh_scan += $(top_srcdir)/sharpd/sharp_vty.c
-rstman8_DATA += $(MANBUILD)/sharpd.8
+man8 += $(MANBUILD)/sharpd.8
 endif
 
 sharpd_libsharp_a_SOURCES = \

diff --git a/staticd/subdir.am b/staticd/subdir.am
index f1071545abe5d90686c51f800bd64ed5579a3a9e..33cc0e20505ea1d37b149595a3bcd034b294f27b 100644 (file)
--- a/staticd/subdir.am
+++ b/staticd/subdir.am
@@ -7,7 +7,7 @@ noinst_LIBRARIES += staticd/libstatic.a
 sbin_PROGRAMS += staticd/staticd
 dist_examples_DATA += staticd/staticd.conf.sample
 vtysh_scan += $(top_srcdir)/staticd/static_vty.c
-rstman8_DATA += $(MANBUILD)/staticd.8
+man8 += $(MANBUILD)/staticd.8
 endif
 
 staticd_libstatic_a_SOURCES = \

diff --git a/vtysh/subdir.am b/vtysh/subdir.am
index 3d40f37d22919981174b14a76d605c42bca5b94f..932429a87c8ebf3eb8ae98cfd1f66c152f07d606 100644 (file)
--- a/vtysh/subdir.am
+++ b/vtysh/subdir.am
@@ -5,7 +5,7 @@
 if VTYSH
 bin_PROGRAMS += vtysh/vtysh
 dist_examples_DATA += vtysh/vtysh.conf.sample
-rstman1_DATA += $(MANBUILD)/vtysh.1
+man1 += $(MANBUILD)/vtysh.1
 endif
 
 vtysh_vtysh_SOURCES = \

diff --git a/watchfrr/subdir.am b/watchfrr/subdir.am
index 96df81d4a617eebc96adc4ef6aa6ea14056253b2..f0b49c9a8482101ea6386329abf9ce756b122541 100644 (file)
--- a/watchfrr/subdir.am
+++ b/watchfrr/subdir.am
@@ -5,7 +5,7 @@
 if WATCHFRR
 sbin_PROGRAMS += watchfrr/watchfrr
 vtysh_scan += $(top_srcdir)/watchfrr/watchfrr_vty.c
-rstman8_DATA += $(MANBUILD)/watchfrr.8
+man8 += $(MANBUILD)/watchfrr.8
 endif
 
 noinst_HEADERS += \

diff --git a/zebra/subdir.am b/zebra/subdir.am
index ac0abe348eb97be796238b0df70fbad55b80db90..a87fcec41f0eda8200fd518d2fb63bc9de51a1c8 100644 (file)
--- a/zebra/subdir.am
+++ b/zebra/subdir.am
@@ -32,7 +32,7 @@ if FPM
 module_LTLIBRARIES += zebra/zebra_fpm.la
 endif
 
-rstman8_DATA += $(MANBUILD)/zebra.8
+man8 += $(MANBUILD)/zebra.8
 ## endif ZEBRA
 endif